mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-06 10:57:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

LLVM 3.7: DataLayoutPass is gone.

Browse source 
DataLayout is now non-optional at the module. Therefore
there is no need for a separate DataLayoutPass.
This commit is contained in:
kai 2015-03-06 17:13:00 +01:00
parent 192583d336
commit 66bf03b96b
3 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gen/optimizer.cpp
View file

@ -356,7 +356,12 @@ bool ldc_optimize_module(llvm::Module *M)
#endif #endif
// Add an appropriate DataLayout instance for this module. // Add an appropriate DataLayout instance for this module.
#if LDC_LLVM_VER >= 306 #if LDC_LLVM_VER >= 307
// The DataLayout is already set at the module (in module.cpp,
// method Module::genLLVMModule())
// FIXME: Introduce new command line switch default-data-layout to
// override the module data layout
#elif LDC_LLVM_VER == 306
mpm.add(new DataLayoutPass()); mpm.add(new DataLayoutPass());
#elif LDC_LLVM_VER == 305 #elif LDC_LLVM_VER == 305
const DataLayout *DL = M->getDataLayout(); const DataLayout *DL = M->getDataLayout();

9
gen/passes/GarbageCollect2Stack.cpp
View file

@ -416,7 +416,9 @@ namespace {
virtual void getAnalysisUsage(AnalysisUsage &AU) const { virtual void getAnalysisUsage(AnalysisUsage &AU) const {
#if LDC_LLVM_VER >= 305 #if LDC_LLVM_VER >= 305
#if LDC_LLVM_VER < 307
AU.addRequired<DataLayoutPass>(); AU.addRequired<DataLayoutPass>();
#endif
AU.addRequired<DominatorTreeWrapperPass>(); AU.addRequired<DominatorTreeWrapperPass>();
AU.addPreserved<CallGraphWrapperPass>(); AU.addPreserved<CallGraphWrapperPass>();
#else #else
@ -480,7 +482,12 @@ static bool isSafeToStackAllocate(Instruction* Alloc, Value* V, DominatorTree& D
bool GarbageCollect2Stack::runOnFunction(Function &F) { bool GarbageCollect2Stack::runOnFunction(Function &F) {
DEBUG(errs() << "\nRunning -dgc2stack on function " << F.getName() << '\n'); DEBUG(errs() << "\nRunning -dgc2stack on function " << F.getName() << '\n');
#if LDC_LLVM_VER >= 305 #if LDC_LLVM_VER >= 307
const DataLayout &DL = F.getParent()->getDataLayout();
DominatorTree &DT = getAnalysis<DominatorTreeWrapperPass>().getDomTree();
CallGraphWrapperPass *CGPass = getAnalysisIfAvailable<CallGraphWrapperPass>();
CallGraph *CG = CGPass ? &CGPass->getCallGraph() : 0;
#elif LDC_LLVM_VER >= 305
DataLayoutPass *DLP = getAnalysisIfAvailable<DataLayoutPass>(); DataLayoutPass *DLP = getAnalysisIfAvailable<DataLayoutPass>();
assert(DLP && "required DataLayoutPass is null"); assert(DLP && "required DataLayoutPass is null");
const DataLayout &DL = DLP->getDataLayout(); const DataLayout &DL = DLP->getDataLayout();

11
gen/passes/SimplifyDRuntimeCalls.cpp
View file

@ -18,6 +18,9 @@
#include "Passes.h" #include "Passes.h"
#include "llvm/Pass.h" #include "llvm/Pass.h"
#if LDC_LLVM_VER >= 307
#include "llvm/IR/Module.h"
#endif
#if LDC_LLVM_VER >= 303 #if LDC_LLVM_VER >= 303
#include "llvm/IR/Function.h" #include "llvm/IR/Function.h"
#include "llvm/IR/Intrinsics.h" #include "llvm/IR/Intrinsics.h"
@ -303,7 +306,9 @@ namespace {
bool runOnce(Function &F, const DataLayout *DL, AliasAnalysis& AA); bool runOnce(Function &F, const DataLayout *DL, AliasAnalysis& AA);
virtual void getAnalysisUsage(AnalysisUsage &AU) const { virtual void getAnalysisUsage(AnalysisUsage &AU) const {
#if LDC_LLVM_VER >= 305 #if LDC_LLVM_VER >= 307
// The DataLayoutPass is removed.
#elif LDC_LLVM_VER >= 305
AU.addRequired<DataLayoutPass>(); AU.addRequired<DataLayoutPass>();
#else #else
AU.addRequired<DataLayout>(); AU.addRequired<DataLayout>();
@ -357,7 +362,9 @@ bool SimplifyDRuntimeCalls::runOnFunction(Function &F) {
if (Optimizations.empty()) if (Optimizations.empty())
InitOptimizations(); InitOptimizations();
#if LDC_LLVM_VER >= 305 #if LDC_LLVM_VER >= 307
const DataLayout *DL = &F.getParent()->getDataLayout();
#elif LDC_LLVM_VER >= 305
DataLayoutPass *DLP = getAnalysisIfAvailable<DataLayoutPass>(); DataLayoutPass *DLP = getAnalysisIfAvailable<DataLayoutPass>();
const DataLayout *DL = DLP ? &DLP->getDataLayout() : 0; const DataLayout *DL = DLP ? &DLP->getDataLayout() : 0;
#else #else