diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-10-14 09:53:40 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-10-14 12:50:56 +0530 |
| commit | 3636c8bb3ebb5c65a0c3a0b53bd47a2f1760b4f4 (patch) | |
| tree | dc140c51917c4f4d556abf94e98c52adfba15797 | |
| parent | 5dc2955f917c0ddecd539656e7eccaf020112be0 (diff) | |
| parent | 22dc40821770db567915250af3f8c2fdb0c1ab81 (diff) | |
| download | rust-3636c8bb3ebb5c65a0c3a0b53bd47a2f1760b4f4.tar.gz rust-3636c8bb3ebb5c65a0c3a0b53bd47a2f1760b4f4.zip | |
Rollup merge of #29016 - sanxiyn:data-layout, r=alexcrichton
| -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); |