Bump bindgen to 0.71.1 (#530)

* Remove unused import

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* Bump bindgen to 0.71.1

- Use the bindgen opaque struct where appropriate.

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* Bump mozjs-sys to 128.3-7

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* Specify the rust target for jsglue

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* blocklist js::ProfilingStackFrame

We don't use the typ and on i686-linux-android bindgen
generates a wrong struct with failing layout tests.

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

---------

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

Author: jschwe

Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 [workspace.dependencies]
 cc = "1"
 libc = "0.2"
-bindgen = { version = "0.69", default-features = false, features = [
+bindgen = { version = "0.71.1", default-features = false, features = [
     "runtime",
     "which-rustfmt",
 ] }

mozjs-sys/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mozjs_sys"
 description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
 repository.workspace = true
-version = "0.128.3-6"
+version = "0.128.3-7"
 authors = ["Mozilla"]
 links = "mozjs"
 build = "build.rs"

mozjs-sys/build.rs

@@ -142,6 +142,15 @@ fn should_build_from_source() -> bool {
     }
 }
 
+/// Returns the Rust version bindgen should target
+pub(crate) fn minimum_rust_target() -> bindgen::RustTarget {
+    let Ok(rust_target) = bindgen::RustTarget::stable(80, 0) else {
+        // `InvalidRustTarget` does not implement Debug, so we manually panic.
+        panic!("Unsupported Rust target")
+    };
+    rust_target
+}
+
 #[cfg(not(windows))]
 fn find_make() -> OsString {
     if let Some(make) = env::var_os("MAKE") {
@@ -412,7 +421,7 @@ fn build_jsapi_bindings(build_dir: &Path) {
     config &= !bindgen::CodegenConfig::METHODS;
 
     let mut builder = bindgen::builder()
-        .rust_target(bindgen::RustTarget::Stable_1_59)
+        .rust_target(minimum_rust_target())
         .header("./src/jsapi.cpp")
         // Translate every enum with the "rustified enum" strategy. We should
         // investigate switching to the "constified module" strategy, which has
@@ -621,6 +630,7 @@ const BLACKLIST_TYPES: &'static [&'static str] = &[
     "JS::MutableHandleVector",
     "JS::Rooted.*Vector",
     "JS::RootedValueArray",
+    "js::ProfilingStackFrame.*",
     // Classes we don't use and we cannot generate their
     // types properly from bindgen so we'll skip them for now.
     "JS::dbg::Builder",
@@ -760,6 +770,7 @@ mod jsglue {
         println!("cargo:rerun-if-changed=src/jsglue.cpp");
         let mut builder = bindgen::Builder::default()
             .header("./src/jsglue.cpp")
+            .rust_target(super::minimum_rust_target())
             .parse_callbacks(Box::new(CustomCargoCallbacks::new()))
             .size_t_is_usize(true)
             .formatter(bindgen::Formatter::Rustfmt)

mozjs-sys/src/jsimpls.rs

@@ -27,7 +27,6 @@ use crate::jsval::{JSVal, UndefinedValue};
 use std::marker::PhantomData;
 use std::ops::Deref;
 use std::ops::DerefMut;
-use std::os::raw::c_void;
 use std::ptr;
 
 impl<T> Deref for JS::Handle<T> {
@@ -200,7 +199,7 @@ impl JS::AutoGCRooter {
         #[allow(non_snake_case)]
         let autoGCRooters: *mut _ = {
             let rooting_cx = cx as *mut JS::RootingContext;
-            &mut (*rooting_cx).autoGCRooters_[self.kind_ as usize]
+            &mut (*rooting_cx).autoGCRooters_.0[self.kind_ as usize]
         };
         self.stackTop = autoGCRooters as *mut *mut _;
         self.down = *autoGCRooters as *mut _;
@@ -420,7 +419,7 @@ impl RootedBase {
     unsafe fn get_root_stack(cx: *mut JSContext, kind: JS::RootKind) -> *mut *mut RootedBase {
         let kind = kind as usize;
         let rooting_cx = Self::get_rooting_context(cx);
-        &mut (*rooting_cx).stackRoots_[kind] as *mut _ as *mut _
+        &mut (*rooting_cx).stackRoots_.0[kind] as *mut _ as *mut _
     }
 
     unsafe fn get_rooting_context(cx: *mut JSContext) -> *mut JS::RootingContext {

mozjs/src/rust.rs

@@ -369,9 +369,11 @@ impl Runtime {
         });
 
         #[cfg(target_pointer_width = "64")]
-        InitSelfHostedCode(js_context, [0u64; 2], None);
+        let cache = crate::jsapi::__BindgenOpaqueArray::<u64, 2>::default();
         #[cfg(target_pointer_width = "32")]
-        InitSelfHostedCode(js_context, [0u32; 2], None);
+        let cache = crate::jsapi::__BindgenOpaqueArray::<u32, 2>::default();
+
+        InitSelfHostedCode(js_context, cache, None);
 
         SetWarningReporter(js_context, Some(report_warning));