Merge pull request #13349 from ArchRobison/adr/llvm37-vec

Fix issue #13106 by adding TargetTransformInfoWrapperPass to pass list.
JuliaLang · Sep 29, 2015 · bc1a8f5 · bc1a8f5
2 parents 1496035 + 8580e9d
commit bc1a8f5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -35,6 +35,7 @@
 #include <llvm/Analysis/Passes.h>
 #include <llvm/Bitcode/ReaderWriter.h>
 #ifdef LLVM37
+#include <llvm/Analysis/TargetTransformInfo.h>
 #include <llvm/Analysis/TargetLibraryInfo.h>
 #else
 #include <llvm/Target/TargetLibraryInfo.h>
@@ -5752,7 +5753,9 @@ static void init_julia_llvm_env(Module *m)
     FPM->add(llvm::createMemorySanitizerPass(true));
 #   endif
 #endif
-#ifndef LLVM37
+#ifdef LLVM37
+    FPM->add(createTargetTransformInfoWrapperPass(jl_TargetMachine->getTargetIRAnalysis()));
+#else
     jl_TargetMachine->addAnalysisPasses(*FPM);
 #endif
 #ifdef LLVM38