Skip to content

Commit 45e472a

Browse files
debuginfo: Get rid of redundant argument copying with debuginfo activated
1 parent 7eae649 commit 45e472a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/librustc/middle/trans/_match.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ use util::common::indenter;
220220
use util::ppaux::{Repr, vec_map_to_str};
221221

222222
use std::hashmap::HashMap;
223+
use std::ptr;
223224
use std::vec;
224225
use syntax::ast;
225226
use syntax::ast::Ident;
@@ -2046,7 +2047,10 @@ pub fn store_arg(mut bcx: @mut Block,
20462047
// Debug information (the llvm.dbg.declare intrinsic to be precise) always expects to get an
20472048
// alloca, which only is the case on the general path, so lets disable the optimized path when
20482049
// debug info is enabled.
2049-
let fast_path = !bcx.ccx().sess.opts.extra_debuginfo && simple_identifier(pat).is_some();
2050+
let arg_is_alloca = unsafe { llvm::LLVMIsAAllocaInst(llval) != ptr::null() };
2051+
2052+
let fast_path = (arg_is_alloca || !bcx.ccx().sess.opts.extra_debuginfo)
2053+
&& simple_identifier(pat).is_some();
20502054

20512055
if fast_path {
20522056
// Optimized path for `x: T` case. This just adopts

0 commit comments

Comments
 (0)