---

michaelwoerister · michaelwoerister · commit 6bd138169673 · 2013-12-16T10:23:28.000+01:00
yaml --- r: 90477 b: refs/heads/master c: 7eae649 h: refs/heads/master i: 90475: 1dbd2c3 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 184d39414d779b620fec719cbd8308960634b277
+refs/heads/master: 7eae649a015cd2e4c5764b2955edb7542410f1f1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
diff --git a/trunk/src/librustc/middle/trans/debuginfo.rs b/trunk/src/librustc/middle/trans/debuginfo.rs
@@ -2248,7 +2248,14 @@ fn populate_scope_map(cx: &mut CrateContext,
         })
     }
 
-    walk_block(cx, fn_entry_block, &mut scope_stack, scope_map);
+    // Clang creates separate scope functions bodies, so let's do this too
+    with_new_scope(cx,
+                   fn_entry_block.span,
+                   &mut scope_stack,
+                   scope_map,
+                   |cx, scope_stack, scope_map| {
+        walk_block(cx, fn_entry_block, scope_stack, scope_map);
+    });
 
     // local helper functions for walking the AST.
     fn with_new_scope(cx: &mut CrateContext,
