Update to LLVM 6.0

Author: CodaFi

.travis.yml

@@ -5,7 +5,7 @@ matrix:
   include:
   - os: osx
     language: objective-c
-    osx_image: xcode9
+    osx_image: xcode9.2
     before_install:
     - export PATH=/usr/local/opt/llvm/bin:"${PATH}"
     - brew update
@@ -18,26 +18,36 @@ matrix:
     sudo: required
     dist: trusty
     env:
-    - LLVM_API_VERSION=5.0
-    before_install:
+    - LLVM_API_VERSION=6.0
+    addons:
+      apt:
+        sources:
+          - ubuntu-toolchain-r-test
+          - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main'
+            key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+          - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main'
+            key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+        packages:
+          - llvm-6.0
+          - libc++1
+
+    script:
     - export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:"${PKG_CONFIG_PATH}"
-    - wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-    - sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-${LLVM_API_VERSION}
-      main"
-    - sudo apt-get update
-    - sudo apt-get install llvm-${LLVM_API_VERSION} libc++1
     - sudo cp /usr/lib/x86_64-linux-gnu/libc++.so.1.0 /usr/lib/
     - sudo ln -sf /usr/lib/libc++.so.1.0 /usr/lib/libc++.so
     - sudo rm -rf /usr/local/clang-*/bin/llvm-config
     - ls -l /usr/bin/llvm-config*
     - sudo rm -f /usr/bin/llvm-config
     - sudo ln -s /usr/bin/llvm-config-${LLVM_API_VERSION} /usr/bin/llvm-config
     - wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
-    - wget https://swift.org/builds/swift-4.0-release/ubuntu1404/swift-4.0-RELEASE/swift-4.0-RELEASE-ubuntu14.04.tar.gz
-    - tar xzf swift-4.0-RELEASE-ubuntu14.04.tar.gz
-    - export PATH=${PWD}/swift-4.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
-    - sudo ./swift-4.0-RELEASE-ubuntu14.04/usr/bin/swift utils/make-pkgconfig.swift
-    script:
+    - wget https://swift.org/builds/swift-4.0.3-release/ubuntu1404/swift-4.0.3-RELEASE/swift-4.0.3-RELEASE-ubuntu14.04.tar.gz
+    - tar -xzf swift-4.0.3-RELEASE-ubuntu14.04.tar.gz
+    - export PATH=$PATH:$(pwd)/swift-4.0.3-RELEASE-ubuntu14.04/usr/bin
+    - sudo apt-get remove llvm-6.0
+    - sudo apt autoremove
+    - sudo apt-get install llvm-5.0
+    - sudo $(pwd)/swift-4.0.3-RELEASE-ubuntu14.04/usr/bin/swift utils/make-pkgconfig.swift
+    - swift build
     - swift test
 notifications:
   slack:

Sources/LLVM/MetadataType.swift

@@ -18,6 +18,6 @@ public struct MetadataType: IRType {
 
   /// Retrieves the underlying LLVM type object.
   public func asLLVM() -> LLVMTypeRef {
-    fatalError("This version of LLVM does not support the creation of MetadataType objects")
+    return LLVMMetadataTypeInContext(context.llvm)
   }
 }

Sources/LLVM/TokenType.swift

@@ -19,6 +19,6 @@ public struct TokenType: IRType {
 
   /// Retrieves the underlying LLVM type object.
   public func asLLVM() -> LLVMTypeRef {
-    fatalError("This version of LLVM does not support the creation of TokenType objects")
+    return LLVMTokenTypeInContext(context.llvm)
   }
 }