[ltsmaster] Add support for LLVM 6

Adds the necessary changes to support LLVM 6.
ldc-developers · Feb 28, 2018 · d8cd7ad · d8cd7ad
1 parent 4d580ea
commit d8cd7ad
Show file tree

Hide file tree

Showing 10 changed files with 1,496 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ sudo: false
 
 matrix:
   include:
+    - os: linux
+      env: LLVM_VERSION=6.0.0-rc2
     - os: linux
       env: LLVM_VERSION=5.0.1
     - os: linux
@@ -16,20 +18,24 @@ matrix:
       env: LLVM_VERSION=3.7.1 OPTS="-DMULTILIB=ON"
     - os: linux
       env: LLVM_VERSION=3.6.2
+    - os: linux
+      env: LLVM_VERSION=3.5.2
     - os: osx
       env: LLVM_VERSION=4.0.0 OPTS="-DBUILD_SHARED_LIBS=OFF"
   allow_failures:
     #- env: LLVM_VERSION=3.9
 
 cache:
   directories:
+    - llvm-6.0.0-rc2
     - llvm-5.0.1
     - llvm-4.0.1
     - llvm-4.0.0
     - llvm-3.9.1
     - llvm-3.8.1
     - llvm-3.7.1
     - llvm-3.6.2
+    - llvm-3.5.2
 addons:
   apt:
     sources:
@@ -55,7 +61,11 @@ before_install:
       export LLVM_ARCH="x86_64-apple-darwin";
     fi;
     if [ -z "$(ls -A llvm-$LLVM_VERSION)" ]; then
-      wget -O llvm-$LLVM_VERSION.tar.xz http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-${LLVM_ARCH}.tar.xz;
+      if [ "${LLVM_VERSION}" = "6.0.0-rc2" ]; then
+        wget -O llvm-$LLVM_VERSION.tar.xz http://prereleases.llvm.org/6.0.0/rc2/clang+llvm-6.0.0-rc2-x86_64-linux-gnu-debian8.tar.xz;
+      else
+        wget -O llvm-$LLVM_VERSION.tar.xz http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-${LLVM_ARCH}.tar.xz;
+      fi;
       mkdir llvm-$LLVM_VERSION;
       tar -xf llvm-$LLVM_VERSION.tar.xz --strip 1 -C llvm-$LLVM_VERSION;
     fi;
@@ -64,7 +74,14 @@ before_install:
     export LLVM_CONFIG="llvm-$LLVM_VERSION/bin/llvm-config";
 
 install:
-  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export CC="gcc-4.9"; export CXX="g++-4.9"; fi
+  -
+    if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+      if [ "${LLVM_VERSION}" = "6.0.0-rc2" ]; then
+        export CC="$PWD/llvm-$LLVM_VERSION/bin/clang"; export CXX="$PWD/llvm-$LLVM_VERSION/bin/clang++";
+      else
+        export CC="gcc-4.9"; export CXX="g++-4.9";
+      fi
+    fi
   -
     if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
       brew update; brew install ninja libconfig;

diff --git a/cmake/Modules/FindLLVM.cmake b/cmake/Modules/FindLLVM.cmake
@@ -27,7 +27,8 @@
 # We also want an user-specified LLVM_ROOT_DIR to take precedence over the
 # system default locations such as /usr/local/bin. Executing find_program()
 # multiples times is the approach recommended in the docs.
-set(llvm_config_names llvm-config-5.0 llvm-config50
+set(llvm_config_names llvm-config-6.0 llvm-config60
+                      llvm-config-5.0 llvm-config50
                       llvm-config-4.0 llvm-config40
                       llvm-config-3.9 llvm-config39
                       llvm-config-3.8 llvm-config38

diff --git a/driver/cl_options.cpp b/driver/cl_options.cpp
@@ -287,10 +287,15 @@ cl::opt<llvm::Reloc::Model> mRelocModel(
                    "Relocatable external references, non-relocatable code")));
 
 cl::opt<llvm::CodeModel::Model> mCodeModel(
-    "code-model", cl::desc("Code model"), cl::init(llvm::CodeModel::Default),
+    "code-model", cl::desc("Code model"),
+#if LDC_LLVM_VER < 600
+    cl::init(llvm::CodeModel::Default),
+#endif
     clEnumValues(
+#if LDC_LLVM_VER < 600
         clEnumValN(llvm::CodeModel::Default, "default",
                    "Target default code model"),
+#endif
         clEnumValN(llvm::CodeModel::Small, "small", "Small code model"),
         clEnumValN(llvm::CodeModel::Kernel, "kernel", "Kernel code model"),
         clEnumValN(llvm::CodeModel::Medium, "medium", "Medium code model"),

diff --git a/driver/ldmd.cpp b/driver/ldmd.cpp
@@ -130,7 +130,13 @@ char *concat(const char *a, int b) {
  */
 int execute(const std::string &exePath, const char **args) {
   std::string errorMsg;
-  int rc = ls::ExecuteAndWait(exePath, args, nullptr, nullptr, 0, 0, &errorMsg);
+  int rc = ls::ExecuteAndWait(exePath, args, nullptr,
+#if LDC_LLVM_VER >= 600
+                              {},
+#else
+                              nullptr,
+#endif
+                              0, 0, &errorMsg);
   if (!errorMsg.empty()) {
     error("Error executing %s: %s", exePath.c_str(), errorMsg.c_str());
   }

diff --git a/driver/main.cpp b/driver/main.cpp
@@ -47,7 +47,9 @@
 #include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Target/TargetMachine.h"
-#if LDC_LLVM_VER >= 306
+#if LDC_LLVM_VER >= 600
+#include "llvm/CodeGen/TargetSubtargetInfo.h"
+#elif LDC_LLVM_VER >= 306
 #include "llvm/Target/TargetSubtargetInfo.h"
 #endif
 #include "llvm/LinkAllIR.h"
@@ -140,7 +142,11 @@ void printVersion(llvm::raw_ostream &OS) {
   // redirecting stdout to a file.
   OS.flush();
 
-  llvm::TargetRegistry::printRegisteredTargetsForVersion();
+  llvm::TargetRegistry::printRegisteredTargetsForVersion(
+#if LDC_LLVM_VER >= 600
+    OS
+#endif
+    );
 
   exit(EXIT_SUCCESS);
 }
@@ -342,7 +348,11 @@ static void parseCommandLine(int argc, char **argv, Strings &sourceFiles,
 
   final_args.insert(final_args.end(), &argv[1], &argv[argc]);
 
+#if LDC_LLVM_VER >= 600
+  cl::SetVersionPrinter(&printVersion);
+#else
   cl::SetVersionPrinter(&printVersionStdout);
+#endif
 
   hideLLVMOptions();
   cl::ParseCommandLineOptions(final_args.size(),

diff --git a/driver/toobj.cpp b/driver/toobj.cpp
@@ -37,7 +37,9 @@
 #if LDC_LLVM_VER >= 307
 #include "llvm/Analysis/TargetTransformInfo.h"
 #endif
-#if LDC_LLVM_VER >= 306
+#if LDC_LLVM_VER >= 600
+#include "llvm/CodeGen/TargetSubtargetInfo.h"
+#elif LDC_LLVM_VER >= 306
 #include "llvm/Target/TargetSubtargetInfo.h"
 #endif
 #include "llvm/IR/Module.h"

diff --git a/driver/tool.cpp b/driver/tool.cpp
@@ -36,7 +36,12 @@ int executeToolAndWait(const std::string &tool,
   // Execute tool.
   std::string errstr;
   if (int status = llvm::sys::ExecuteAndWait(tool, &realargs[0], nullptr,
-                                             nullptr, 0, 0, &errstr)) {
+#if LDC_LLVM_VER >= 600
+                                             {},
+#else
+                                             nullptr,
+#endif
+                                             0, 0, &errstr)) {
     error(Loc(), "%s failed with status: %d", tool.c_str(), status);
     if (!errstr.empty()) {
       error(Loc(), "message: %s", errstr.c_str());

diff --git a/gen/dibuilder.cpp b/gen/dibuilder.cpp
@@ -864,7 +864,11 @@ void ldc::DIBuilder::EmitValue(llvm::Value *val, VarDeclaration *vd) {
   }
 
   llvm::Instruction *instr =
-      DBuilder.insertDbgValueIntrinsic(val, 0, debugVariable,
+      DBuilder.insertDbgValueIntrinsic(val,
+#if LDC_LLVM_VER < 600
+                                       0,
+#endif
+                                       debugVariable,
 #if LDC_LLVM_VER >= 306
                                        DBuilder.createExpression(),
 #endif