OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move debug info check into create_function_debug_context

Browse Source
This commit is contained in:
Mark Simulacrum 2016-12-19 07:33:35 -07:00
parent a445199afb
commit 0256f60461
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/librustc_trans/debuginfo/mod.rs
View File

@ -195,15 +195,6 @@ pub fn finalize(cx: &CrateContext) {
};
}
/// Creates a function-specific debug context for a function w/o debuginfo.
pub fn empty_function_debug_context<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>) -> FunctionDebugContext {
if cx.sess().opts.debuginfo == NoDebugInfo {
FunctionDebugContext::DebugInfoDisabled
} else {
FunctionDebugContext::FunctionWithoutDebugInfo
}
}
/// Creates the function-specific debug context.
///
/// Returns the FunctionDebugContext for the function which holds state needed
@ -220,6 +211,12 @@ pub fn create_function_debug_context<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
return FunctionDebugContext::DebugInfoDisabled;
}
for attr in cx.tcx().get_attrs(instance.def).iter() {
if attr.check_name("no_debug") {
return FunctionDebugContext::FunctionWithoutDebugInfo;
}
}
let containing_scope = get_containing_scope(cx, instance);
let span = mir.span;

16
src/librustc_trans/mir/mod.rs
View File

@ -199,22 +199,10 @@ pub fn trans_mir<'a, 'tcx: 'a>(
sig: &ty::FnSig<'tcx>,
abi: Abi,
) {
let def_id = instance.def;
let local_id = fcx.ccx.tcx().map.as_local_node_id(def_id);
let no_debug = if let Some(id) = local_id {
fcx.ccx.tcx().map.attrs(id).iter().any(|item| item.check_name("no_debug"))
} else {
fcx.ccx.sess().cstore.item_attrs(def_id).iter().any(|item| item.check_name("no_debug"))
};
let debug_context = if !no_debug {
debuginfo::create_function_debug_context(fcx.ccx, instance, sig, abi, fcx.llfn, mir)
} else {
debuginfo::empty_function_debug_context(fcx.ccx)
};
let debug_context =
debuginfo::create_function_debug_context(fcx.ccx, instance, sig, abi, fcx.llfn, mir);
let bcx = fcx.get_entry_block();
// Analyze the temps to determine which must be lvalues
let cleanup_kinds = analyze::cleanup_kinds(&mir);
// Allocate a `Block` for every basic block