Merge pull request #1 from rtfeldman/exceptions

Exception Primitives

Author: rtfeldman

.travis.yml

@@ -1,6 +1,5 @@
 language: rust
 
-dist: trusty
 sudo: required
 cache:
   directories:
@@ -47,6 +46,7 @@ matrix:
             - *BASE_PACKAGES
             - llvm-3.6-dev
       rust: nightly-2019-07-25
+      dist: trusty
     - env:
         - LLVM_VERSION="3.7"
       <<: *BASE
@@ -59,6 +59,7 @@ matrix:
             - *BASE_PACKAGES
             - llvm-3.7-dev
       rust: nightly-2019-07-25
+      dist: trusty
     - env:
         - LLVM_VERSION="3.8"
       <<: *BASE
@@ -71,6 +72,7 @@ matrix:
             - *BASE_PACKAGES
             - llvm-3.8-dev
       rust: nightly-2019-07-25
+      dist: trusty
     # 3.9 seems to have a linking issue :/
     # - env:
     #     - LLVM_VERSION="3.9"
@@ -83,6 +85,8 @@ matrix:
     #       packages:
     #         - *BASE_PACKAGES
     #         - llvm-3.9-dev
+    #       rust: nightly-2019-07-25
+    #       dist: trusty
     - env:
         - LLVM_VERSION="4.0"
       <<: *BASE
@@ -95,6 +99,7 @@ matrix:
             - *BASE_PACKAGES
             - llvm-4.0-dev
       rust: nightly-2019-07-25
+      dist: trusty
     - env:
         - LLVM_VERSION="5.0"
       <<: *BASE
@@ -107,6 +112,7 @@ matrix:
             - *BASE_PACKAGES
             - llvm-5.0-dev
       rust: nightly-2019-07-25
+      dist: trusty
     - env:
         - LLVM_VERSION="6.0"
       <<: *BASE
@@ -119,6 +125,7 @@ matrix:
             - *BASE_PACKAGES
             - llvm-6.0-dev
       rust: nightly-2019-07-25
+      dist: trusty
     - env:
         - LLVM_VERSION="7.0"
       <<: *BASE
@@ -131,6 +138,7 @@ matrix:
             - *BASE_PACKAGES
             - llvm-7-dev
       rust: nightly-2019-07-25
+      dist: trusty
     - env:
         - LLVM_VERSION="8.0"
       <<: *BASE
@@ -143,6 +151,37 @@ matrix:
             - *BASE_PACKAGES
             - llvm-8-dev
       rust: nightly-2019-07-25
+      dist: trusty
+    - env:
+        - LLVM_VERSION="9.0"
+      <<: *BASE
+      addons:
+        apt:
+          sources:
+            - *BASE_SOURCES
+            - llvm-toolchain-bionic-9
+            - sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+          packages:
+            - *BASE_PACKAGES
+            - llvm-9-dev
+      rust: nightly-2019-07-25
+      dist: bionic
+    - env:
+        - LLVM_VERSION="10.0"
+      <<: *BASE
+      addons:
+        apt:
+          sources:
+            - *BASE_SOURCES
+            - llvm-toolchain-bionic-10
+            - sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+          packages:
+            - *BASE_PACKAGES
+            - llvm-10-dev
+      rust: nightly-2019-07-25
+      dist: bionic
     - deploy: # Documentation build; Only latest supported LLVM version for now
         provider: pages
         skip-cleanup: true
@@ -152,10 +191,10 @@ matrix:
         on:
           branch: master
       before_install:
-        - export PATH=/usr/lib/llvm-8/bin/:$HOME/.local/bin:$PATH
-        - export LLVM_PATH=/usr/share/llvm-8/cmake/
+        - export PATH=/usr/lib/llvm-10/bin/:$HOME/.local/bin:$PATH
+        - export LLVM_PATH=/usr/share/llvm-10/cmake/
       script:
-        - cargo doc --no-default-features --features "target-all,llvm8-0" --color=always
+        - cargo doc --no-default-features --features "target-all,llvm10-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"
@@ -171,7 +210,11 @@ matrix:
             # - llvm-toolchain-trusty-5.0
             # - llvm-toolchain-trusty-6.0
             # - llvm-toolchain-trusty-7
-            - llvm-toolchain-trusty-8
+            # - llvm-toolchain-trusty-8
+            # - llvm-toolchain-bionic-9
+            - llvm-toolchain-bionic-10
+            - sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
           packages:
             - *BASE_PACKAGES
             # - llvm-3.6-dev
@@ -182,7 +225,10 @@ matrix:
             # - llvm-5.0-dev
             # - llvm-6.0-dev
             # - llvm-7-dev
-            - llvm-8-dev
+            # - llvm-8-dev
+            # - llvm-9-dev
+            - llvm-10-dev
+      dist: bionic
 
 env:
   global:

Cargo.toml

@@ -11,7 +11,7 @@ categories = ["development-tools::ffi"]
 edition = "2018"
 
 [features]
-default = ["target-all"]
+default = ["target-all", "llvm10-0"]
 # Please update internal_macros::FEATURE_VERSIONS when adding a new LLVM version
 llvm3-6 = []
 llvm3-7 = []
@@ -22,6 +22,8 @@ llvm5-0 = []
 llvm6-0 = []
 llvm7-0 = []
 llvm8-0 = []
+llvm9-0 = []
+llvm10-0 = []
 # Don't link aganist LLVM libraries. This is useful if another dependency is
 # installing LLVM. See llvm-sys for more details.
 no-llvm-linking = ["llvm-sys/no-llvm-linking"]
@@ -63,7 +65,7 @@ experimental = ["static-alloc"]
 either = "1.5"
 inkwell_internals = { path = "./internal_macros", version = "0.1.0" }
 libc = "0.2"
-llvm-sys = "80.1"
+llvm-sys = "100.0.1"
 once_cell = "1.2"
 parking_lot = "0.10"
 regex = "1"

internal_macros/src/lib.rs

@@ -19,8 +19,8 @@ use syn::spanned::Spanned;
 use syn::{Token, LitFloat, Ident, Item, Field, Variant, Attribute};
 
 // This array should match the LLVM features in the top level Cargo manifest
-const FEATURE_VERSIONS: [&str; 9] =
-    ["llvm3-6", "llvm3-7", "llvm3-8", "llvm3-9", "llvm4-0", "llvm5-0", "llvm6-0", "llvm7-0", "llvm8-0"];
+const FEATURE_VERSIONS: [&str; 11] =
+    ["llvm3-6", "llvm3-7", "llvm3-8", "llvm3-9", "llvm4-0", "llvm5-0", "llvm6-0", "llvm7-0", "llvm8-0", "llvm9-0", "llvm10-0"];
 
 /// Gets the index of the feature version that represents `latest`
 fn get_latest_feature_index(features: &[&str]) -> usize {

src/basic_block.rs

@@ -1,6 +1,6 @@
 //! A `BasicBlock` is a container of instructions.
 
-use llvm_sys::core::{LLVMGetBasicBlockParent, LLVMGetBasicBlockTerminator, LLVMGetNextBasicBlock, LLVMIsABasicBlock, LLVMIsConstant, LLVMMoveBasicBlockAfter, LLVMMoveBasicBlockBefore, LLVMPrintTypeToString, LLVMPrintValueToString, LLVMTypeOf, LLVMDeleteBasicBlock, LLVMGetPreviousBasicBlock, LLVMRemoveBasicBlockFromParent, LLVMGetFirstInstruction, LLVMGetLastInstruction, LLVMGetTypeContext, LLVMBasicBlockAsValue};
+use llvm_sys::core::{LLVMGetBasicBlockParent, LLVMGetBasicBlockTerminator, LLVMGetNextBasicBlock, LLVMIsABasicBlock, LLVMIsConstant, LLVMMoveBasicBlockAfter, LLVMMoveBasicBlockBefore, LLVMPrintTypeToString, LLVMPrintValueToString, LLVMTypeOf, LLVMDeleteBasicBlock, LLVMGetPreviousBasicBlock, LLVMRemoveBasicBlockFromParent, LLVMGetFirstInstruction, LLVMGetLastInstruction, LLVMGetTypeContext, LLVMBasicBlockAsValue, LLVMReplaceAllUsesWith};
 #[llvm_versions(3.9..=latest)]
 use llvm_sys::core::LLVMGetBasicBlockName;
 use llvm_sys::prelude::{LLVMValueRef, LLVMBasicBlockRef};
@@ -450,6 +450,41 @@ impl<'ctx> BasicBlock<'ctx> {
             CStr::from_ptr(ptr)
         }
     }
+
+    /// Replaces all uses of this basic block with another.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use inkwell::context::Context;
+    ///
+    /// let context = Context::create();
+    /// let builder = context.create_builder();
+    /// let module = context.create_module("my_mod");
+    /// let void_type = context.void_type();
+    /// let fn_type = void_type.fn_type(&[], false);
+    /// let fn_val = module.add_function("my_fn", fn_type, None);
+    /// let entry = context.append_basic_block(fn_val, "entry");
+    /// let bb1 = context.append_basic_block(fn_val, "bb1");
+    /// let bb2 = context.append_basic_block(fn_val, "bb2");
+    /// builder.position_at_end(entry);
+    /// let branch_inst = builder.build_unconditional_branch(bb1);
+    ///
+    /// bb1.replace_all_uses_with(&bb2);
+    ///
+    /// assert_eq!(branch_inst.get_operand(0).unwrap().right().unwrap(), bb2);
+    /// ```
+    pub fn replace_all_uses_with(&self, other: &BasicBlock<'ctx>) {
+        let value = unsafe { LLVMBasicBlockAsValue(self.basic_block) };
+        let other = unsafe { LLVMBasicBlockAsValue(other.basic_block) };
+
+        // LLVM may infinite-loop when they aren't distinct, which is UB in C++.
+        if value != other {
+            unsafe {
+                LLVMReplaceAllUsesWith(value, other);
+            }
+        }
+    }
 }
 
 impl fmt::Debug for BasicBlock<'_> {