Skip to content

Commit 21de848

Browse files
---
yaml --- r: 147267 b: refs/heads/try2 c: b0100c5 h: refs/heads/master i: 147265: 2caa360 147263: b871e25 v: v3
1 parent e0b64e0 commit 21de848

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 69f4bf79b2cc30ac518218d05bccbc84157b0694
8+
refs/heads/try2: b0100c5a0f43b5a2fadf839d90b6174dbddd0547
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/debuginfo.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,7 @@ pub fn create_function_debug_context(cx: &mut CrateContext,
653653

654654
// Clang sets this parameter to the opening brace of the function's block, so let's do this too.
655655
let scope_line = span_start(cx, top_level_block.span).line;
656+
let is_local_to_unit = !cx.reachable.contains(&fn_ast_id);
656657

657658
let fn_metadata = function_name.with_c_str(|function_name| {
658659
linkage_name.with_c_str(|linkage_name| {
@@ -665,7 +666,7 @@ pub fn create_function_debug_context(cx: &mut CrateContext,
665666
file_metadata,
666667
loc.line as c_uint,
667668
function_type_metadata,
668-
false,
669+
is_local_to_unit,
669670
true,
670671
scope_line as c_uint,
671672
FlagPrototyped as c_uint,

branches/try2/src/test/debug-info/basic-types-metadata.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
// debugger:whatis f64
4646
// check:type = f64
4747
// debugger:info functions _yyy
48-
// check:[...]
49-
// check:![...]_yyy()();
48+
// check:[...]![...]_yyy()();
5049
// debugger:detach
5150
// debugger:quit
5251

0 commit comments

Comments
 (0)