mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-02 16:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix latest LLVM 3.6 changes

Browse source
This commit is contained in:
kai 2014-09-19 06:49:34 +02:00
parent 5a89bf68a7
commit bef163f559
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
driver/toobj.cpp
View file

@ -65,10 +65,7 @@ static void codegenModule(llvm::TargetMachine &Target, llvm::Module& m,
PassManager Passes; PassManager Passes;
#if LDC_LLVM_VER >= 306 #if LDC_LLVM_VER >= 306
if (const DataLayout *DL = Target.getSubtargetImpl()->getDataLayout()) Passes.add(new DataLayoutPass());
Passes.add(new DataLayoutPass(*DL));
else
Passes.add(new DataLayoutPass(&m));
#elif LDC_LLVM_VER == 305 #elif LDC_LLVM_VER == 305
if (const DataLayout *DL = Target.getDataLayout()) if (const DataLayout *DL = Target.getDataLayout())
Passes.add(new DataLayoutPass(*DL)); Passes.add(new DataLayoutPass(*DL));

9
gen/optimizer.cpp
View file

@ -327,7 +327,9 @@ bool ldc_optimize_module(llvm::Module *M)
mpm.add(tli); mpm.add(tli);
// Add an appropriate DataLayout instance for this module. // Add an appropriate DataLayout instance for this module.
#if LDC_LLVM_VER >= 305 #if LDC_LLVM_VER >= 306
mpm.add(new DataLayoutPass());
#elif LDC_LLVM_VER == 305
const DataLayout *DL = M->getDataLayout(); const DataLayout *DL = M->getDataLayout();
assert(DL && "DataLayout not set at module"); assert(DL && "DataLayout not set at module");
mpm.add(new DataLayoutPass(*DL)); mpm.add(new DataLayoutPass(*DL));
@ -344,7 +346,10 @@ bool ldc_optimize_module(llvm::Module *M)
// Also set up a manager for the per-function passes. // Also set up a manager for the per-function passes.
FunctionPassManager fpm(M); FunctionPassManager fpm(M);
#if LDC_LLVM_VER >= 305 #if LDC_LLVM_VER >= 306
fpm.add(new DataLayoutPass());
gTargetMachine->addAnalysisPasses(fpm);
#elif LDC_LLVM_VER == 305
fpm.add(new DataLayoutPass(M)); fpm.add(new DataLayoutPass(M));
gTargetMachine->addAnalysisPasses(fpm); gTargetMachine->addAnalysisPasses(fpm);
#elif LDC_LLVM_VER >= 302 #elif LDC_LLVM_VER >= 302