---

michaelwoerister · michaelwoerister · commit 1dbd2c3ae72d · 2013-12-16T10:23:28.000+01:00
yaml --- r: 90475 b: refs/heads/master c: 08bc072 h: refs/heads/master i: 90473: 5b54ab6 90471: 1a05dd8 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ae6628573282855a9b93de266add64c69411b0b0
+refs/heads/master: 08bc0721415c54033dbd64934b2b3d10835fce36
 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
@@ -687,6 +687,9 @@ pub fn create_function_debug_context(cx: &mut CrateContext,
     let arg_pats = fn_decl.inputs.map(|arg_ref| arg_ref.pat);
     populate_scope_map(cx, arg_pats, top_level_block, fn_metadata, &mut fn_debug_context.scope_map);
 
+    // Clear the debug location so we don't assign them in the function prelude
+    set_debug_location(cx, UnknownLocation);
+
     return FunctionDebugContext(fn_debug_context);
 
     fn get_function_signature(cx: &mut CrateContext,
