diff options
| author | bors <bors@rust-lang.org> | 2015-10-14 07:24:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-14 07:24:36 +0000 |
| commit | 294ef5b158601b09e2a3ca49af124c63a9cf9528 (patch) | |
| tree | 953903e5f926818305cbd3558f119e9baee5d1db /src/rustllvm/PassWrapper.cpp | |
| parent | 293966694c3c8e0c7028e8f54340fbc328d85bff (diff) | |
| parent | 66b58d19bdeceba7aa3f4043fefd796f8c8b426c (diff) | |
| download | rust-294ef5b158601b09e2a3ca49af124c63a9cf9528.tar.gz rust-294ef5b158601b09e2a3ca49af124c63a9cf9528.zip | |
Auto merge of #29039 - Manishearth:rollup, r=Manishearth
- Successful merges: #28991, #29004, #29006, #29013, #29016, #29024, #29027, #29028, #29029, #29032, #29035 - Failed merges:
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index 4308023a9a5..16c35970bfe 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -335,8 +335,7 @@ LLVMRustSetDataLayoutFromTargetMachine(LLVMModuleRef Module, LLVMTargetMachineRef TMR) { TargetMachine *Target = unwrap(TMR); #if LLVM_VERSION_MINOR >= 7 - if (const DataLayout *DL = Target->getDataLayout()) - unwrap(Module)->setDataLayout(*DL); + unwrap(Module)->setDataLayout(Target->createDataLayout()); #elif LLVM_VERSION_MINOR >= 6 if (const DataLayout *DL = Target->getSubtargetImpl()->getDataLayout()) unwrap(Module)->setDataLayout(DL); |