Merge branch 'master' into chore/refactor-build-rs

Author: edg-l

.clangd

@@ -3,3 +3,4 @@
 /target
 compile_commands.json
 doc
+.clangd

.gitignore

@@ -13,6 +13,6 @@ Read the documentation at https://danacus.gitlab.io/tblgen-rs/tblgen/.
 
 ## Supported LLVM Versions
 
-An installation of LLVM is required to use this crate. Both LLVM 16 and 17 are supported and can be selected using feature flags.
+An installation of LLVM is required to use this crate. Both LLVM 16, 17 and 18 are supported and can be selected using feature flags.
 
 The `TABLEGEN_<version>_PREFIX` environment variable can be used to specify a custom directory of the LLVM installation.

README.md

@@ -64,8 +64,6 @@ fn run() -> Result<(), Box<dyn Error>> {
         println!("cargo:rustc-link-lib={}", name);
     }
 
-    env::set_var("CXXFLAGS", llvm_config("--cxxflags")?);
-    env::set_var("CFLAGS", llvm_config("--cflags")?);
     println!("cargo:rustc-link-search={}", &env::var("OUT_DIR")?);
 
     cc::Build::new()
@@ -78,8 +76,9 @@ fn run() -> Result<(), Box<dyn Error>> {
         .cpp(true)
         .include("cc/include")
         .include(llvm_config("--includedir")?)
-        // .flag("-MJcompile_commands.o.json")
-        .opt_level(3)
+        .flag(&llvm_config("--cxxflags")?)
+        .flag("-Wno-unused-parameter")
+        .std("c++17")
         .compile("CTableGen");
 
     println!("cargo:rustc-link-lib=static=CTableGen");

build.rs

@@ -19,7 +19,8 @@ void tableGenRecordKeeperFree(TableGenRecordKeeperRef rk_ref) {
 
 TableGenRecordKeeperIteratorRef
 tableGenRecordKeeperGetFirstClass(TableGenRecordKeeperRef rk_ref) {
-  auto *it = new RecordMap::const_iterator(unwrap(rk_ref)->getClasses().begin());
+  auto *it =
+      new RecordMap::const_iterator(unwrap(rk_ref)->getClasses().begin());
   if (*it == unwrap(rk_ref)->getClasses().end()) {
     return nullptr;
   }
@@ -95,9 +96,9 @@ TableGenRecordRef tableGenRecordKeeperGetDef(TableGenRecordKeeperRef rk_ref,
 TableGenRecordVectorRef
 tableGenRecordKeeperGetAllDerivedDefinitions(TableGenRecordKeeperRef rk_ref,
                                              TableGenStringRef className) {
-  return wrap(new ctablegen::RecordVector(
-      std::move(unwrap(rk_ref)->getAllDerivedDefinitions(
-          StringRef(className.data, className.len)))));
+  return wrap(
+      new ctablegen::RecordVector(unwrap(rk_ref)->getAllDerivedDefinitions(
+          StringRef(className.data, className.len))));
 }
 
 TableGenRecordRef tableGenRecordVectorGet(TableGenRecordVectorRef vec_ref,

cc/lib/RecordKeeper.cpp

@@ -37,7 +37,7 @@ impl<'a> From<&'a str> for StringRef<'a> {
     fn from(value: &'a str) -> Self {
         unsafe {
             StringRef::from_raw(TableGenStringRef {
-                data: value.as_ptr() as *const i8,
+                data: value.as_ptr() as *const _,
                 len: value.len(),
             })
         }
@@ -54,6 +54,6 @@ impl<'a> TryFrom<StringRef<'a>> for &'a str {
 
 impl<'a> From<StringRef<'a>> for &'a [u8] {
     fn from(value: StringRef<'a>) -> Self {
-        unsafe { std::slice::from_raw_parts(value.raw.data as *const u8, value.raw.len) }
+        unsafe { std::slice::from_raw_parts(value.raw.data as *const _, value.raw.len) }
     }
 }

src/string_ref.rs

@@ -9,3 +9,5 @@ brew install llvm@$llvm_version
 
 echo TABLEGEN_180_PREFIX=$(brew --prefix llvm@$llvm_version) >>$GITHUB_ENV
 echo PATH=$TABLEGEN_180_PREFIX/bin:$PATH >>$GITHUB_ENV
+echo LIBRARY_PATH=$(brew --prefix)/lib:$LIBRARY_PATH >>$GITHUB_ENV
+echo LD_LIBRARY_PATH=$(brew --prefix)/lib:$LD_LIBRARY_PATH >>$GITHUB_ENV