Upgrade to LLVM 10

The `LT_OPT_PIPELINE_REG` CMake flag and the corresponding workaround for
pass auto-registration has been removed. The corresponding issue in LLVM
has been fixed:
llvm/llvm-project@52c1d20

Author: banach-space

.github/workflows/x86-darwin-llvm-from-sources.yml

@@ -30,7 +30,7 @@ jobs:
           export PATH=$GITHUB_WORKSPACE:$PATH
           git clone https://github.com/llvm/llvm-project
           cd llvm-project
-          git checkout release/9.x
+          git checkout release/10.x
           mkdir build && cd build
           cmake -G Ninja -D CMAKE_MAKE_PROGRAM=$GITHUB_WORKSPACE/ninja \
             -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang" \

.github/workflows/x86-darwin.yml

@@ -9,18 +9,21 @@ jobs:
       - uses: actions/checkout@v1
       - name: Install Dependencies
         run: |
-          brew install llvm@9
+          brew update
+          brew install llvm@10
+          brew upgrade llvm
           pip install lit
+          ls /usr/local/opt/
       - name: Build HelloWorld
         run: |
           cd HelloWorld
           mkdir build && cd build
-          cmake -DLT_LLVM_INSTALL_DIR="/usr/local/opt/llvm@9/"  ../
+          cmake -DLT_LLVM_INSTALL_DIR="/usr/local/opt/llvm/"  ../
           make -j2
       - name: Build llvm-tutor + run tests
         run: |
           cd $GITHUB_WORKSPACE
           mkdir build && cd build
-          cmake -DLT_LLVM_INSTALL_DIR="/usr/local/opt/llvm@9/"  ../
+          cmake -DLT_LLVM_INSTALL_DIR="/usr/local/opt/llvm/"  ../
           make -j2
           lit test/

.github/workflows/x86-ubuntu-llvm-from-sources.yml

@@ -30,7 +30,7 @@ jobs:
           export PATH=$GITHUB_WORKSPACE:$PATH
           git clone https://github.com/llvm/llvm-project
           cd llvm-project
-          git checkout release/9.x
+          git checkout release/10.x
           mkdir build && cd build
           ln -s /usr/bin/x86_64-linux-gnu-ld.gold ld
           cmake -G Ninja -D CMAKE_MAKE_PROGRAM=$GITHUB_WORKSPACE/ninja \

.github/workflows/x86-ubuntu.yml

@@ -10,20 +10,20 @@ jobs:
       - name: Install Dependencies
         run: |
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main"
+          sudo apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main"
           sudo apt-get update
-          sudo apt-get install -y llvm-9 llvm-9-dev clang-9 llvm-9-tools
+          sudo apt-get install -y llvm-10 llvm-10-dev clang-10 llvm-10-tools
           sudo pip install lit
       - name: Build HelloWorld
         run: |
           cd HelloWorld
           mkdir build && cd build
-          cmake -DLT_LLVM_INSTALL_DIR="/usr/lib/llvm-9/" ../
+          cmake -DLT_LLVM_INSTALL_DIR="/usr/lib/llvm-10/" ../
           make -j2
       - name: Build llvm-tutor + run tests
         run: |
           cd $GITHUB_WORKSPACE
           mkdir build && cd build
-          cmake -DLT_LLVM_INSTALL_DIR="/usr/lib/llvm-9/" ../
+          cmake -DLT_LLVM_INSTALL_DIR="/usr/lib/llvm-10/" ../
           make -j2
           lit test/

.travis.yml

@@ -6,13 +6,13 @@ addons:
   apt:
     update: true
     sources:
-      - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
+      - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
         key_url: 'http://apt.llvm.org/llvm-snapshot.gpg.key'
     packages:
-      - llvm-9
-      - llvm-9-dev
-      - llvm-9-tools
-      - clang-9
+      - llvm-10
+      - llvm-10-dev
+      - llvm-10-tools
+      - clang-10
 
 env:
   - CONFIGURATION=Debug
@@ -31,12 +31,12 @@ script:
   # Build HelloWorld as a standalone project
   - cd HelloWorld
   - mkdir build && cd build
-  - cmake -DLT_LLVM_INSTALL_DIR=/usr/lib/llvm-9/ -DCMAKE_BUILD_TYPE=$CONFIGURATION ../
+  - cmake -DLT_LLVM_INSTALL_DIR=/usr/lib/llvm-10/ -DCMAKE_BUILD_TYPE=$CONFIGURATION ../
   - make -j4
   # Build the top project and run tests
   - cd ../../
   - mkdir build
   - cd build
-  - cmake -DLT_LLVM_INSTALL_DIR=/usr/lib/llvm-9/ -DCMAKE_BUILD_TYPE=$CONFIGURATION ../
+  - cmake -DLT_LLVM_INSTALL_DIR=/usr/lib/llvm-10/ -DCMAKE_BUILD_TYPE=$CONFIGURATION ../
   - make -j4
   - lit test/

CMakeLists.txt

@@ -28,7 +28,7 @@ endif()
 # find_package can locate it)
 list(APPEND CMAKE_PREFIX_PATH "${LT_LLVM_INSTALL_DIR}/lib/cmake/llvm/")
 
-find_package(LLVM 9.0.0 REQUIRED CONFIG)
+find_package(LLVM 10.0.0 REQUIRED CONFIG)
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LT_LLVM_INSTALL_DIR}")
 
@@ -74,23 +74,6 @@ if (${SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG} EQUAL "1")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
 endif()
 
-# WARNING: Keep this turned off unless building LLVM from sources. When using
-# LLVM installed with HomeBrew (MacOS) or apt-get (Ubuntu), auto-registration
-# leads to a seg-fault. This is a known issue:
-#   * https://github.com/sampsyo/llvm-pass-skeleton/issues/7
-#   * https://bugs.llvm.org/show_bug.cgi?id=39321
-OPTION(LT_OPT_PIPELINE_REG "Auto-register OpcodeCounter with the optimisation pipelines" OFF)
-
-# Canonicalise LT_OPT_PIPELINE_REG as either 1 (On) or 0 (Off). This way we can
-# keep the implementation in lit.cfg.py.in (which uses it) clean and
-# straightforward.
-if(${LT_OPT_PIPELINE_REG})
-  set(LT_OPT_PIPELINE_REG 1)
-  add_definitions(-DLT_OPT_PIPELINE_REG)
-else()
-  set(LT_OPT_PIPELINE_REG 0)
-endif()
-
 # Set the build directories
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")

HelloWorld/CMakeLists.txt

@@ -11,7 +11,7 @@ set(LT_LLVM_INSTALL_DIR "" CACHE PATH "LLVM installation directory")
 # find_package can locate it)
 list(APPEND CMAKE_PREFIX_PATH "${LT_LLVM_INSTALL_DIR}/lib/cmake/llvm/")
 
-find_package(LLVM 9.0.0 REQUIRED CONFIG)
+find_package(LLVM 10.0.0 REQUIRED CONFIG)
 
 # HelloWorld includes headers from LLVM - update the include paths accordingly
 include_directories(${LLVM_INCLUDE_DIRS})