From 0bff216aa6625e68fd2548edc5d073ff9c4a3811 Mon Sep 17 00:00:00 2001 From: Zhigang Gong Date: Fri, 5 Sep 2014 16:19:30 +0800 Subject: [PATCH] GBE: fix a bug with LLVM 3.3. Signed-off-by: Zhigang Gong Tested-by: Meng, Mengmeng --- backend/src/llvm/llvm_to_gen.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/llvm/llvm_to_gen.cpp b/backend/src/llvm/llvm_to_gen.cpp index 865d238..3677c7f 100644 --- a/backend/src/llvm/llvm_to_gen.cpp +++ b/backend/src/llvm/llvm_to_gen.cpp @@ -76,14 +76,14 @@ namespace gbe BVAR(OCL_OUTPUT_CFG_ONLY, false); using namespace llvm; - void runFuntionPass(Module &mod, TargetLibraryInfo *libraryInfo, DataLayout &DL) + void runFuntionPass(Module &mod, TargetLibraryInfo *libraryInfo, const DataLayout &DL) { FunctionPassManager FPM(&mod); #if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 5 FPM.add(new DataLayoutPass(DL)); #else - FPM.add(&DL); + FPM.add(new DataLayout(DL)); #endif #if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >=5 @@ -107,14 +107,14 @@ namespace gbe FPM.doFinalization(); } - void runModulePass(Module &mod, TargetLibraryInfo *libraryInfo, DataLayout &DL, int optLevel) + void runModulePass(Module &mod, TargetLibraryInfo *libraryInfo, const DataLayout &DL, int optLevel) { llvm::PassManager MPM; #if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 5 MPM.add(new DataLayoutPass(DL)); #else - MPM.add(&DL); + MPM.add(new DataLayout(DL)); #endif MPM.add(new TargetLibraryInfo(*libraryInfo)); MPM.add(createTypeBasedAliasAnalysisPass()); @@ -244,7 +244,7 @@ namespace gbe #if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 5 passes.add(new DataLayoutPass(DL)); #else - passes.add(&DL); + passes.add(new DataLayout(DL)); #endif // Print the code before further optimizations passes.add(createIntrinsicLoweringPass()); -- 2.7.4