Skip to content

Commit b0530cf

Browse files
---
yaml --- r: 92337 b: refs/heads/auto c: b0100c5 h: refs/heads/master i: 92335: c169ad6 v: v3
1 parent 174e5b8 commit b0530cf

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
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 69f4bf79b2cc30ac518218d05bccbc84157b0694
16+
refs/heads/auto: b0100c5a0f43b5a2fadf839d90b6174dbddd0547
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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/auto/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)