diff options
| author | bors <bors@rust-lang.org> | 2019-07-10 05:21:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-10 05:21:43 +0000 |
| commit | 0324a2b309cd66cb7bd4a156bd0b84cb136e254f (patch) | |
| tree | f85538e316a67aca8f749f5ebd1bb93754e6f206 /src/rustllvm/PassWrapper.cpp | |
| parent | 3f435f622e0c05a199eb89b71a11181133fdb74c (diff) | |
| parent | 6c0a406b1c9e4c518586ac3cc2fe96c21840a5dc (diff) | |
| download | rust-0324a2b309cd66cb7bd4a156bd0b84cb136e254f.tar.gz rust-0324a2b309cd66cb7bd4a156bd0b84cb136e254f.zip | |
Auto merge of #62555 - Centril:rollup-ti46adx, r=Centril
Rollup of 5 pull requests Successful merges: - #61853 (Emit warning when trying to use PGO in conjunction with unwinding on …) - #62278 (Add Iterator::partition_in_place() and is_partitioned()) - #62283 (Target::arch can take more than listed options) - #62393 (Fix pretty-printing of `$crate` (take 4)) - #62474 (Prepare for LLVM 9 update) Failed merges: r? @ghost
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index 0ebef82d376..cea88f14dcc 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -913,7 +913,10 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules, GlobalValue::LinkageTypes NewLinkage) { ResolvedODR[ModuleIdentifier][GUID] = NewLinkage; }; -#if LLVM_VERSION_GE(8, 0) +#if LLVM_VERSION_GE(9, 0) + thinLTOResolvePrevailingInIndex(Ret->Index, isPrevailing, recordNewLinkage, + Ret->GUIDPreservedSymbols); +#elif LLVM_VERSION_GE(8, 0) thinLTOResolvePrevailingInIndex(Ret->Index, isPrevailing, recordNewLinkage); #else thinLTOResolveWeakForLinkerInIndex(Ret->Index, isPrevailing, recordNewLinkage); |