diff options
| author | bors <bors@rust-lang.org> | 2018-12-03 02:27:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-03 02:27:15 +0000 |
| commit | a563ceb3b9471acbb827e27686c5cacadc49a032 (patch) | |
| tree | 18d02d7af14c9910eb9cf1fc1c10eafdcef51333 /src/librustc_codegen_llvm/llvm | |
| parent | b817d0b65156ab2b7c903ecce7ad16033961344e (diff) | |
| parent | 850d2f1af0224cf1d442a66c33470791a2597888 (diff) | |
| download | rust-a563ceb3b9471acbb827e27686c5cacadc49a032.tar.gz rust-a563ceb3b9471acbb827e27686c5cacadc49a032.zip | |
Auto merge of #56358 - nikic:mergefunc-aliases, r=rkruppe
Enable -mergefunc-use-aliases If the Rust LLVM fork is used, enable the -mergefunc-use-aliases flag, which will create aliases for merged functions, rather than inserting a call from one to the other. A number of codegen tests needed to be adjusted, because functions that previously fell below the thunk limit are now being merged. Merging is prevented in various ways now. I expect that this is going to break something, somewhere, because it isn't able to deal with aliases properly, but we won't find out until we try :) This fixes #52651. r? @rkruppe
Diffstat (limited to 'src/librustc_codegen_llvm/llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/llvm/ffi.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs index f1a966d7654..9eefeca70cf 100644 --- a/src/librustc_codegen_llvm/llvm/ffi.rs +++ b/src/librustc_codegen_llvm/llvm/ffi.rs @@ -1358,6 +1358,7 @@ extern "C" { pub fn LLVMRustDebugMetadataVersion() -> u32; pub fn LLVMRustVersionMajor() -> u32; pub fn LLVMRustVersionMinor() -> u32; + pub fn LLVMRustIsRustLLVM() -> bool; pub fn LLVMRustAddModuleFlag(M: &Module, name: *const c_char, value: u32); |