Remove internal mutability from source_locations_enabled

This commit is contained in:
bjorn3
2018-12-02 18:09:26 +01:00
parent f1fe9253e2
commit ab8f1527e4
4 changed files with 9 additions and 10 deletions

View File

@@ -32,7 +32,7 @@ use rustc_codegen_ssa::debuginfo::{FunctionDebugContext, MirDebugScope, Variable
VariableKind, FunctionDebugContextData};
use libc::c_uint;
use std::cell::{Cell, RefCell};
use std::cell::RefCell;
use std::ffi::CString;
use syntax_pos::{self, Span, Pos};
@@ -158,7 +158,7 @@ impl DebugInfoBuilderMethods<'tcx> for Builder<'a, 'll, 'tcx> {
variable_kind: VariableKind,
span: Span,
) {
assert!(!dbg_context.get_ref(span).source_locations_enabled.get());
assert!(!dbg_context.get_ref(span).source_locations_enabled);
let cx = self.cx();
let file = span_start(cx, span).file;
@@ -327,7 +327,7 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
// Initialize fn debug context (including scope map and namespace map)
let fn_debug_context = FunctionDebugContextData {
fn_metadata,
source_locations_enabled: Cell::new(false),
source_locations_enabled: false,
defining_crate: def_id.krate,
};

View File

@@ -30,7 +30,7 @@ pub fn set_source_location<D>(
FunctionDebugContext::RegularContext(ref data) => data
};
let dbg_loc = if function_debug_context.source_locations_enabled.get() {
let dbg_loc = if function_debug_context.source_locations_enabled {
debug!("set_source_location: {}", bx.sess().source_map().span_to_string(span));
let loc = span_start(bx.cx(), span);
InternalDebugLocation::new(scope.unwrap(), loc.line, loc.col.to_usize())