---

yaml
---
r: 90479
b: refs/heads/master
c: 69f4bf7
h: refs/heads/master
i:
  90477: 6bd1381
  90475: 1dbd2c3
  90471: 1a05dd8
  90463: db4859a
v: v3

Author: michaelwoerister

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 45e472aa4bdcec7a5bfd8cdaa10dd00435242162
+refs/heads/master: 69f4bf79b2cc30ac518218d05bccbc84157b0694
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/src/librustc/middle/trans/debuginfo.rs

@@ -651,7 +651,8 @@ pub fn create_function_debug_context(cx: &mut CrateContext,
         (function_name.clone(), file_metadata)
     };
 
-    let scope_line = get_scope_line(cx, top_level_block, loc.line);
+    // Clang sets this parameter to the opening brace of the function's block, so let's do this too.
+    let scope_line = span_start(cx, top_level_block.span).line;
 
     let fn_metadata = function_name.with_c_str(|function_name| {
                           linkage_name.with_c_str(|linkage_name| {
@@ -840,21 +841,6 @@ pub fn create_function_debug_context(cx: &mut CrateContext,
 
         return create_DIArray(DIB(cx), template_params);
     }
-
-    fn get_scope_line(cx: &CrateContext,
-                      top_level_block: &ast::Block,
-                      default: uint)
-                   -> uint {
-        match *top_level_block {
-            ast::Block { stmts: ref statements, .. } if statements.len() > 0 => {
-                span_start(cx, statements[0].span).line
-            }
-            ast::Block { expr: Some(@ref expr), .. } => {
-                span_start(cx, expr.span).line
-            }
-            _ => default
-        }
-    }
 }
 
 //=-------------------------------------------------------------------------------------------------