rustc_llvm: use rust-bindgen to generate FFI bindings

Author: tamird

src/Cargo.lock

@@ -58,3 +58,4 @@ cargo = { path = "tools/cargo" }
 
 [patch.crates-io]
 rustfmt-nightly = { path = "tools/rustfmt" }
+bindgen = { path = "../../rust-bindgen" }

src/Cargo.toml

@@ -12,10 +12,7 @@ crate-type = ["dylib"]
 [features]
 static-libstdcpp = []
 
-[dependencies]
-bitflags = "1.0"
-rustc_cratesio_shim = { path = "../librustc_cratesio_shim" }
-
 [build-dependencies]
-build_helper = { path = "../build_helper" }
+bindgen = "0.31.2"
 cc = "1.0.1"
+build_helper = { path = "../build_helper" }

src/librustc_llvm/Cargo.toml

@@ -93,6 +93,7 @@ impl<'a> Iterator for Iter<'a> {
         if ptr.is_null() {
             ::last_error().map(Err)
         } else {
+            let ptr = ptr as *mut _;
             Some(Ok(Child {
                 ptr,
                 _data: marker::PhantomData,

src/librustc_llvm/archive_ro.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+extern crate bindgen;
 extern crate cc;
 extern crate build_helper;
 
@@ -139,6 +140,127 @@ fn main() {
     let cxxflags = output(&mut cmd);
     let mut cfg = cc::Build::new();
     cfg.warnings(false);
+
+    let out_path = PathBuf::from(env::var("OUT_DIR")
+        .expect("Failed to determine output directory"));
+
+    let mut builder = bindgen::builder()
+        .header("../rustllvm/rustllvm.h")
+        .clang_args(&["-x", "c++"])
+        .rust_target(bindgen::RustTarget::Nightly)
+        .whitelist_recursively(false)
+        .whitelist_type("(LLVM)?Rust.*")
+        .whitelist_function("(LLVM)?Rust.*")
+        .rustfmt_bindings(true)
+        .layout_tests(false)
+        .with_codegen_config(bindgen::CodegenConfig{
+            functions: true,
+            types: true,
+            vars: false,
+            methods: false,
+            constructors: false,
+            destructors: false,
+        });
+
+    for visible_type in [
+        "LLVMBool",
+        "LLVMDiagnosticHandler",
+        "LLVMTwineRef",
+        "LLVMValueRef",
+        // https://github.com/rust-lang-nursery/rust-bindgen/issues/1164.
+        "llvm::LLVMContext_InlineAsmDiagHandlerTy",
+    ].into_iter() {
+        builder = builder
+            .whitelist_type(visible_type);
+    }
+
+    for opaque_type in [
+        "LLVMBasicBlockRef",
+        "LLVMBuilderRef",
+        "LLVMContextRef",
+        "LLVMDebugLocRef",
+        "LLVMDiagnosticInfoRef",
+        "LLVMMemoryBufferRef",
+        "LLVMMetadataRef",
+        "LLVMModuleRef",
+        "LLVMObjectFileRef",
+        "LLVMOpaqueTwine",
+        "LLVMOpaqueValue",
+        "LLVMPassManagerRef",
+        "LLVMRustArchiveIteratorRef",
+        "LLVMRustJITMemoryManagerRef",
+        "LLVMRustOperandBundleDefRef",
+        "LLVMSMDiagnosticRef",
+        "LLVMSectionIteratorRef",
+        "LLVMTargetDataRef",
+        "LLVMTargetMachineRef",
+        "LLVMTypeKind",
+        "LLVMTypeRef",
+        "RustStringRef",
+        "llvm::DIBuilder",
+        "llvm::DiagnosticInfo",
+        "llvm::SMDiagnostic",
+        // https://github.com/rust-lang-nursery/rust-bindgen/issues/1164.
+        "llvm::object::Archive_Child",
+        "llvm::object::OwningBinary",
+    ].into_iter() {
+        builder = builder
+            .opaque_type(opaque_type)
+            .whitelist_type(opaque_type);
+    }
+
+    for rustified_enum in [
+        "LLVMAtomicOrdering",
+        "LLVMAtomicRMWBinOp",
+        "LLVMDLLStorageClass",
+        "LLVMDiagnosticSeverity",
+        "LLVMIntPredicate",
+        "LLVMRealPredicate",
+        "LLVMRelocMode",
+        "LLVMRustArchiveKind",
+        "LLVMRustAsmDialect",
+        "LLVMRustAttribute",
+        "LLVMRustCodeGenOptLevel",
+        "LLVMRustCodeModel",
+        "LLVMRustDIFlags",
+        "LLVMRustDiagnosticKind",
+        "LLVMRustFileType",
+        "LLVMRustLinkage",
+        "LLVMRustPassKind",
+        "LLVMRustResult",
+        "LLVMRustSynchronizationScope",
+        "LLVMRustVisibility",
+        "LLVMThreadLocalMode",
+        "LLVMTypeKind",
+        // https://github.com/rust-lang-nursery/rust-bindgen/issues/1161.
+        "llvm::CallingConv::.*",
+        // https://github.com/rust-lang-nursery/rust-bindgen/issues/1164.
+        "llvm::LLVMContext.*",
+    ].into_iter() {
+        builder = builder
+            .whitelist_type(rustified_enum)
+            .rustified_enum(rustified_enum)
+    }
+
+    for llvm_function in [
+        "LLVMCountParams",
+        "LLVMGetParam",
+        "LLVMCreateObjectFile",
+        "LLVMCreateTargetData",
+        "LLVMDisposeObjectFile",
+        "LLVMDisposeSectionIterator",
+        "LLVMDisposeTargetData",
+        "LLVMGetSections",
+        "LLVMGetValueName",
+        "LLVMSetFunctionCallConv",
+        "LLVMSetInstructionCallConv",
+        "LLVMSetThreadLocal",
+        "LLVMSetThreadLocalMode",
+        "LLVMSetUnnamedAddr",
+    ].into_iter() {
+        builder = builder.whitelist_function(llvm_function);
+    }
+
     for flag in cxxflags.split_whitespace() {
         // Ignore flags like `-m64` when we're doing a cross build
         if is_crossed && flag.starts_with("-m") {
@@ -151,8 +273,14 @@ fn main() {
         }
 
         cfg.flag(flag);
+        builder = builder.clang_arg(flag);
     }
 
+    builder.generate()
+        .expect("Failed to generate bindings")
+        .write_to_file(out_path.join("bindings.rs"))
+        .expect("Failed to write bindings");
+
     for component in &components {
         let mut flag = String::from("-DLLVM_COMPONENT_");
         flag.push_str(&component.to_uppercase());

src/librustc_llvm/build.rs

@@ -93,7 +93,7 @@ impl OptimizationDiagnostic {
     }
 }
 
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct InlineAsmDiagnostic {
     pub cookie: c_uint,
     pub message: TwineRef,