fixup! DROPME patch builtins

rust-lang · Jan 10, 2025 · bd20c22 · bd20c22
1 parent 0799cbf
commit bd20c22
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/compiler/rustc_codegen_cranelift/Cargo.lock b/compiler/rustc_codegen_cranelift/Cargo.lock
@@ -402,9 +402,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "syn"
-version = "2.0.95"
+version = "2.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -519,5 +519,5 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[patch.unused]]
 name = "compiler_builtins"
-version = "0.1.139"
-source = "git+https://github.com/tgross35/compiler-builtins.git?branch=overflowing-c-safe-ret#8cb74d05a80a5782a5377a825d2ddd7b950bf220"
+version = "0.1.999"
+source = "git+https://github.com/tgross35/compiler-builtins.git?branch=NOMERGE-overflowing-c-safe-ret-version#fbdf922da9710c01698d7b42f7e40dcb1ac66d2d"
diff --git a/compiler/rustc_codegen_cranelift/Cargo.toml b/compiler/rustc_codegen_cranelift/Cargo.toml
@@ -24,7 +24,7 @@ smallvec = "1.8.1"
 
 [patch.crates-io]
 # todo: remove patch
-compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "overflowing-c-safe-ret" }
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "NOMERGE-overflowing-c-safe-ret-version" }
 #cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }
 #cranelift-frontend = { path = "../wasmtime/cranelift/frontend" }
 #cranelift-module = { path = "../wasmtime/cranelift/module" }

diff --git a/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml b/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml
@@ -14,7 +14,7 @@ proc_macro = { path = "./sysroot_src/library/proc_macro" }
 
 [patch.crates-io]
 # todo: remove patch
-compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "overflowing-c-safe-ret" }
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "NOMERGE-overflowing-c-safe-ret-version" }
 rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" }
 rustc-std-workspace-alloc = { path = "./sysroot_src/library/rustc-std-workspace-alloc" }
 rustc-std-workspace-std = { path = "./sysroot_src/library/rustc-std-workspace-std" }

diff --git a/compiler/rustc_codegen_gcc/src/int.rs b/compiler/rustc_codegen_gcc/src/int.rs
@@ -354,6 +354,7 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
         (res.dereference(self.location).to_rvalue(), overflow)
     }
 
+    /// Non-`__builtin_*` overflow operations with a `fn(T, T, &mut i32) -> bool` signature.
     pub fn operation_with_overflow(
         &self,
         func_name: &str,

diff --git a/library/Cargo.lock b/library/Cargo.lock
@@ -61,9 +61,8 @@ dependencies = [
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.140"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df14d41c5d172a886df3753d54238eefb0f61c96cbd8b363c33ccc92c457bee3"
+version = "0.1.999"
+source = "git+https://github.com/tgross35/compiler-builtins.git?branch=NOMERGE-overflowing-c-safe-ret-version#fbdf922da9710c01698d7b42f7e40dcb1ac66d2d"
 dependencies = [
  "cc",
  "rustc-std-workspace-core",
@@ -488,8 +487,3 @@ name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[patch.unused]]
-name = "compiler_builtins"
-version = "0.1.139"
-source = "git+https://github.com/tgross35/compiler-builtins.git?branch=overflowing-c-safe-ret#8cb74d05a80a5782a5377a825d2ddd7b950bf220"
diff --git a/library/Cargo.toml b/library/Cargo.toml
@@ -46,4 +46,4 @@ rustc-std-workspace-core = { path = 'rustc-std-workspace-core' }
 rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
 rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }
 # todo: remove patch
-compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "overflowing-c-safe-ret" }
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "NOMERGE-overflowing-c-safe-ret-version" }