Merge pull request rust-lang#89 from lumen/llvm8

Add support for LLVM 8

Author: TheDan64

.travis.yml

@@ -130,6 +130,18 @@ matrix:
             - *BASE_PACKAGES
             - llvm-7-dev
       rust: nightly-2019-01-15
+    - env:
+        - LLVM_VERSION="8.0"
+      <<: *BASE
+      addons:
+        apt:
+          sources:
+            - *BASE_SOURCES
+            - llvm-toolchain-trusty-8
+          packages:
+            - *BASE_PACKAGES
+            - llvm-8-dev
+      rust: nightly-2019-01-15
     - deploy: # Documentation build; Only latest supported LLVM version for now
         provider: pages
         skip-cleanup: true
@@ -139,10 +151,10 @@ matrix:
         on:
           branch: master
       before_install:
-        - export PATH=/usr/lib/llvm-7/bin/:$HOME/.local/bin:$PATH
-        - export LLVM_PATH=/usr/share/llvm-7/cmake/
+        - export PATH=/usr/lib/llvm-8/bin/:$HOME/.local/bin:$PATH
+        - export LLVM_PATH=/usr/share/llvm-8/cmake/
       script:
-        - cargo doc --no-default-features --features llvm7-0 --color=always
+        - cargo doc --no-default-features --features llvm8-0 --color=always
         - echo '<meta http-equiv="refresh" content="1; url=inkwell/index.html">' > target/doc/index.html
       rust: nightly
       name: "GitHub IO Documentation Deployment"
@@ -157,7 +169,8 @@ matrix:
             # - llvm-toolchain-trusty-4.0
             # - llvm-toolchain-trusty-5.0
             # - llvm-toolchain-trusty-6.0
-            - llvm-toolchain-trusty-7
+            # - llvm-toolchain-trusty-7
+            - llvm-toolchain-trusty-8
           packages:
             - *BASE_PACKAGES
             # - llvm-3.6-dev
@@ -167,7 +180,8 @@ matrix:
             # - llvm-4.0-dev
             # - llvm-5.0-dev
             # - llvm-6.0-dev
-            - llvm-7-dev
+            # - llvm-7-dev
+            - llvm-8-dev
 
 env:
   global:

Cargo.toml

@@ -20,13 +20,14 @@ llvm4-0 = []
 llvm5-0 = []
 llvm6-0 = []
 llvm7-0 = []
+llvm8-0 = []
 
 [dependencies]
 either = "1.5"
 enum-methods = "0.0.8"
 inkwell_internal_macros = { path = "./internal_macros", version = "0.1.0" }
 libc = "0.2"
-llvm-sys = "70.0"
+llvm-sys = "80.0"
 
 [badges]
 travis-ci = { repository = "TheDan64/inkwell" }

README.md

@@ -15,7 +15,7 @@ Inkwell aims to help you pen your own programming languages by safely wrapping l
 
 * Rust 1.31+
 * Rust Stable, Beta, or Nightly
-* LLVM 3.6, 3.7, 3.8, 3.9, 4.0, 5.0, 6.0, or 7.0
+* LLVM 3.6, 3.7, 3.8, 3.9, 4.0, 5.0, 6.0, 7.0, or 8.0
 
 ## Usage
 
@@ -38,6 +38,7 @@ Supported versions:
 | 5.0.x        | llvm5-0       |
 | 6.0.x        | llvm6-0       |
 | 7.0.x        | llvm7-0       |
+| 8.0.x        | llvm8-0       |
 
 ## Documentation
 

examples/jit.rs

@@ -40,7 +40,7 @@ fn jit_compile_sum(
     unsafe { execution_engine.get_function("sum").ok() }
 }
 
-fn main() -> Result<(), Box<Error>> {
+fn main() -> Result<(), Box<dyn Error>> {
     let context = Context::create();
     let module = context.create_module("sum");
     let builder = context.create_builder();

examples/kaleidoscope/main.rs

@@ -155,7 +155,7 @@ impl<'a> Lexer<'a> {
                 Ok(Token::Comment)
             },
 
-            '.' | '0' ... '9' => {
+            '.' | '0' ..= '9' => {
                 // Parse number literal
                 loop {
                     let ch = match chars.peek() {
@@ -175,7 +175,7 @@ impl<'a> Lexer<'a> {
                 Ok(Token::Number(src[start..pos].parse().unwrap()))
             },
 
-            'a' ... 'z' | 'A' ... 'Z' | '_' => {
+            'a' ..= 'z' | 'A' ..= 'Z' | '_' => {
                 // Parse identifier
                 loop {
                     let ch = match chars.peek() {

internal_macros/Cargo.toml

@@ -3,10 +3,15 @@ name = "inkwell_internal_macros"
 version = "0.1.0"
 authors = ["Daniel Kolsoi <[email protected]>"]
 edition = "2018"
+build = "build.rs"
 
 [dependencies]
 quote = "0.6"
-syn = { version = "0.15", features = ["full"] }
+syn = { version = "0.15", features = ["full", "fold"] }
+proc-macro2 = "0.4"
+
+[build-dependencies]
+cargo_toml = "0.6"
 
 [lib]
 proc-macro = true

internal_macros/build.rs

@@ -0,0 +1,24 @@
+extern crate cargo_toml;
+
+use cargo_toml::Manifest;
+
+use std::path::Path;
+
+fn main() {
+    let manifest_path = "../Cargo.toml";
+    let manifest = Manifest::from_path(Path::new(manifest_path))
+        .expect("Unable to load Cargo manifest!");
+
+    let features = manifest.features
+        .keys()
+        .filter(|feature| feature.as_str().starts_with("llvm"))
+        .cloned()
+        .collect::<Vec<_>>();
+
+    let features_csv = features.as_slice().join(",");
+
+    // Exports a comma-separated feature list in the environment during compilation
+    // Can be fetched with `env!("INKWELL_FEATURES")`
+    println!("cargo:rustc-env=INKWELL_FEATURES={}", features_csv);
+    println!("cargo:rerun-if-changed={}", manifest_path);
+}