bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #15719 : michaelwoerister/rust/global_var_null_span_fix, r=alexcrichton

Browse source 
This should fix issue #15541. It would be good to have an test case for this would also be nice but I haven't had the time to write one. The change is very small though and it doesn't break anything in the existing test suite, so I guess we can add it without test for now.
This commit is contained in:
bors 2014-07-18 00:01:22 +00:00
commit f50e4ee559
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/librustc/middle/trans/debuginfo.rs
View file

@ -799,15 +799,16 @@ pub fn create_global_var_metadata(cx: &CrateContext,
var_item).as_slice()) var_item).as_slice())
}; };
let filename = span_start(cx, span).file.name.clone(); let (file_metadata, line_number) = if span != codemap::DUMMY_SP {
let file_metadata = file_metadata(cx, filename.as_slice()); let loc = span_start(cx, span);
(file_metadata(cx, loc.file.name.as_slice()), loc.line as c_uint)
} else {
(UNKNOWN_FILE_METADATA, UNKNOWN_LINE_NUMBER)
};
let is_local_to_unit = is_node_local_to_unit(cx, node_id); let is_local_to_unit = is_node_local_to_unit(cx, node_id);
let loc = span_start(cx, span);
let variable_type = ty::node_id_to_type(cx.tcx(), node_id); let variable_type = ty::node_id_to_type(cx.tcx(), node_id);
let type_metadata = type_metadata(cx, variable_type, span); let type_metadata = type_metadata(cx, variable_type, span);
let namespace_node = namespace_for_item(cx, ast_util::local_def(node_id)); let namespace_node = namespace_for_item(cx, ast_util::local_def(node_id));
let var_name = token::get_ident(ident).get().to_string(); let var_name = token::get_ident(ident).get().to_string();
let linkage_name = let linkage_name =
@ -822,7 +823,7 @@ pub fn create_global_var_metadata(cx: &CrateContext,
var_name, var_name,
linkage_name, linkage_name,
file_metadata, file_metadata,
loc.line as c_uint, line_number,
type_metadata, type_metadata,
is_local_to_unit, is_local_to_unit,
global, global,