Bug 1894093 - Apply https://github.com/rust-lang/rust-bindgen/pull/2824 to vendored bindgen. r=emilio,supply-chain-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D209112

Cargo.lock

@@ -433,8 +433,6 @@ dependencies = [
 [[package]]
 name = "bindgen"
 version = "0.69.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
  "bitflags 2.5.0",
  "cexpr",

Cargo.toml

@@ -152,6 +152,8 @@ backtrace = { path = "build/rust/backtrace" }
 
 # Patch bindgen 0.63 to 0.69
 bindgen_0_63 = { package = "bindgen", path = "build/rust/bindgen-0.63" }
+# Locally patch bindgen for https://github.com/rust-lang/rust-bindgen/pull/2824
+bindgen = { path = "third_party/rust/bindgen" }
 
 # Patch nix 0.26 to 0.28
 nix = { path = "build/rust/nix" }

supply-chain/config.toml

@@ -27,6 +27,10 @@ notes = "This is the upstream code plus the ARM intrinsics workaround from qcms,
 audit-as-crates-io = true
 notes = "This is the upstream code plus a few local fixes, see bug 1685697."
 
+[policy."bindgen:0.69.4"]
+audit-as-crates-io = true
+notes = "This is the upstream code plus a fix for clang trunk. See bug 1894093."
+
 [policy.chardetng]
 audit-as-crates-io = true
 notes = "This is a crate Henri wrote which is also published. We should probably update Firefox to tip and certify that."

third_party/rust/bindgen/clang.rs

@@ -1608,7 +1608,7 @@ impl SourceLocation {
             let mut line = 0;
             let mut col = 0;
             let mut off = 0;
-            clang_getSpellingLocation(
+            clang_getFileLocation(
                 self.x, &mut file, &mut line, &mut col, &mut off,
             );
             (File { x: file }, line as usize, col as usize, off as usize)