Fix unsafe_op_in_unsafe_fn in compiler

rust-lang-ci · Jul 16, 2024 · 28503d6 · 28503d6
1 parent 71eb49c
commit 28503d6
Show file tree

Hide file tree

Showing 15 changed files with 383 additions and 308 deletions.
diff --git a/compiler/rustc_abi/src/lib.rs b/compiler/rustc_abi/src/lib.rs
@@ -627,7 +627,7 @@ impl Step for Size {
 
  #[inline]
  unsafe fn forward_unchecked(start: Self, count: usize) -> Self {
- Self::from_bytes(u64::forward_unchecked(start.bytes(), count))
+ Self::from_bytes(unsafe { u64::forward_unchecked(start.bytes(), count) })
  }
 
  #[inline]
@@ -642,7 +642,7 @@ impl Step for Size {
 
  #[inline]
  unsafe fn backward_unchecked(start: Self, count: usize) -> Self {
- Self::from_bytes(u64::backward_unchecked(start.bytes(), count))
+ Self::from_bytes(unsafe { u64::backward_unchecked(start.bytes(), count) })
  }
 }
 

diff --git a/compiler/rustc_codegen_llvm/src/allocator.rs b/compiler/rustc_codegen_llvm/src/allocator.rs
@@ -21,14 +21,16 @@ pub(crate) unsafe fn codegen(
 ) {
  let llcx = &*module_llvm.llcx;
  let llmod = module_llvm.llmod();
- let usize = match tcx.sess.target.pointer_width {
- 16 => llvm::LLVMInt16TypeInContext(llcx),
- 32 => llvm::LLVMInt32TypeInContext(llcx),
- 64 => llvm::LLVMInt64TypeInContext(llcx),
- tws => bug!("Unsupported target word size for int: {}", tws),
+ let usize = unsafe {
+ match tcx.sess.target.pointer_width {
+ 16 => llvm::LLVMInt16TypeInContext(llcx),
+ 32 => llvm::LLVMInt32TypeInContext(llcx),
+ 64 => llvm::LLVMInt64TypeInContext(llcx),
+ tws => bug!("Unsupported target word size for int: {}", tws),
+ }
  };
- let i8 = llvm::LLVMInt8TypeInContext(llcx);
- let i8p = llvm::LLVMPointerTypeInContext(llcx, 0);
+ let i8 = unsafe { llvm::LLVMInt8TypeInContext(llcx) };
+ let i8p = unsafe { llvm::LLVMPointerTypeInContext(llcx, 0) };
 
  if kind == AllocatorKind::Default {
  for method in ALLOCATOR_METHODS {
@@ -73,23 +75,25 @@ pub(crate) unsafe fn codegen(
  true,
  );
 
- // __rust_alloc_error_handler_should_panic
- let name = OomStrategy::SYMBOL;
- let ll_g = llvm::LLVMRustGetOrInsertGlobal(llmod, name.as_ptr().cast(), name.len(), i8);
- if tcx.sess.default_hidden_visibility() {
- llvm::LLVMRustSetVisibility(ll_g, llvm::Visibility::Hidden);
- }
- let val = tcx.sess.opts.unstable_opts.oom.should_panic();
- let llval = llvm::LLVMConstInt(i8, val as u64, False);
- llvm::LLVMSetInitializer(ll_g, llval);
-
- let name = NO_ALLOC_SHIM_IS_UNSTABLE;
- let ll_g = llvm::LLVMRustGetOrInsertGlobal(llmod, name.as_ptr().cast(), name.len(), i8);
- if tcx.sess.default_hidden_visibility() {
- llvm::LLVMRustSetVisibility(ll_g, llvm::Visibility::Hidden);
+ unsafe {
+ // __rust_alloc_error_handler_should_panic
+ let name = OomStrategy::SYMBOL;
+ let ll_g = llvm::LLVMRustGetOrInsertGlobal(llmod, name.as_ptr().cast(), name.len(), i8);
+ if tcx.sess.default_hidden_visibility() {
+ llvm::LLVMRustSetVisibility(ll_g, llvm::Visibility::Hidden);
+ }
+ let val = tcx.sess.opts.unstable_opts.oom.should_panic();
+ let llval = llvm::LLVMConstInt(i8, val as u64, False);
+ llvm::LLVMSetInitializer(ll_g, llval);
+
+ let name = NO_ALLOC_SHIM_IS_UNSTABLE;
+ let ll_g = llvm::LLVMRustGetOrInsertGlobal(llmod, name.as_ptr().cast(), name.len(), i8);
+ if tcx.sess.default_hidden_visibility() {
+ llvm::LLVMRustSetVisibility(ll_g, llvm::Visibility::Hidden);
+ }
+ let llval = llvm::LLVMConstInt(i8, 0, False);
+ llvm::LLVMSetInitializer(ll_g, llval);
  }
- let llval = llvm::LLVMConstInt(i8, 0, False);
- llvm::LLVMSetInitializer(ll_g, llval);
 
  if tcx.sess.opts.debuginfo != DebugInfo::None {
  let dbg_cx = debuginfo::CodegenUnitDebugContext::new(llmod);

diff --git a/compiler/rustc_codegen_llvm/src/back/lto.rs b/compiler/rustc_codegen_llvm/src/back/lto.rs
@@ -727,7 +727,7 @@ pub unsafe fn optimize_thin_module(
  // into that context. One day, however, we may do this for upstream
  // crates but for locally codegened modules we may be able to reuse
  // that LLVM Context and Module.
- let llcx = llvm::LLVMRustContextCreate(cgcx.fewer_names);
+ let llcx = unsafe { llvm::LLVMRustContextCreate(cgcx.fewer_names) };
  let llmod_raw = parse_module(llcx, module_name, thin_module.data(), dcx)? as *const _;
  let mut module = ModuleCodegen {
  module_llvm: ModuleLlvm { llmod_raw, llcx, tm: ManuallyDrop::new(tm) },
@@ -750,7 +750,9 @@ pub unsafe fn optimize_thin_module(
  {
  let _timer =
  cgcx.prof.generic_activity_with_arg("LLVM_thin_lto_rename", thin_module.name());
- if !llvm::LLVMRustPrepareThinLTORename(thin_module.shared.data.0, llmod, target) {
+ if unsafe {
+ !llvm::LLVMRustPrepareThinLTORename(thin_module.shared.data.0, llmod, target)
+ } {
  return Err(write::llvm_err(dcx, LlvmError::PrepareThinLtoModule));
  }
  save_temp_bitcode(cgcx, &module, "thin-lto-after-rename");
@@ -760,7 +762,8 @@ pub unsafe fn optimize_thin_module(
  let _timer = cgcx
  .prof
  .generic_activity_with_arg("LLVM_thin_lto_resolve_weak", thin_module.name());
- if !llvm::LLVMRustPrepareThinLTOResolveWeak(thin_module.shared.data.0, llmod) {
+ if unsafe { !llvm::LLVMRustPrepareThinLTOResolveWeak(thin_module.shared.data.0, llmod) }
+ {
  return Err(write::llvm_err(dcx, LlvmError::PrepareThinLtoModule));
  }
  save_temp_bitcode(cgcx, &module, "thin-lto-after-resolve");
@@ -770,7 +773,8 @@ pub unsafe fn optimize_thin_module(
  let _timer = cgcx
  .prof
  .generic_activity_with_arg("LLVM_thin_lto_internalize", thin_module.name());
- if !llvm::LLVMRustPrepareThinLTOInternalize(thin_module.shared.data.0, llmod) {
+ if unsafe { !llvm::LLVMRustPrepareThinLTOInternalize(thin_module.shared.data.0, llmod) }
+ {
  return Err(write::llvm_err(dcx, LlvmError::PrepareThinLtoModule));
  }
  save_temp_bitcode(cgcx, &module, "thin-lto-after-internalize");
@@ -779,7 +783,9 @@ pub unsafe fn optimize_thin_module(
  {
  let _timer =
  cgcx.prof.generic_activity_with_arg("LLVM_thin_lto_import", thin_module.name());
- if !llvm::LLVMRustPrepareThinLTOImport(thin_module.shared.data.0, llmod, target) {
+ if unsafe {
+ !llvm::LLVMRustPrepareThinLTOImport(thin_module.shared.data.0, llmod, target)
+ } {
  return Err(write::llvm_err(dcx, LlvmError::PrepareThinLtoModule));
  }
  save_temp_bitcode(cgcx, &module, "thin-lto-after-import");

diff --git a/compiler/rustc_codegen_llvm/src/back/profiling.rs b/compiler/rustc_codegen_llvm/src/back/profiling.rs
@@ -46,13 +46,15 @@ pub unsafe extern "C" fn selfprofile_before_pass_callback(
  pass_name: *const c_char,
  ir_name: *const c_char,
 ) {
- let llvm_self_profiler = &mut *(llvm_self_profiler as *mut LlvmSelfProfiler<'_>);
- let pass_name = CStr::from_ptr(pass_name).to_str().expect("valid UTF-8");
- let ir_name = CStr::from_ptr(ir_name).to_str().expect("valid UTF-8");
- llvm_self_profiler.before_pass_callback(pass_name, ir_name);
+ unsafe {
+ let llvm_self_profiler = &mut *(llvm_self_profiler as *mut LlvmSelfProfiler<'_>);
+ let pass_name = CStr::from_ptr(pass_name).to_str().expect("valid UTF-8");
+ let ir_name = CStr::from_ptr(ir_name).to_str().expect("valid UTF-8");
+ llvm_self_profiler.before_pass_callback(pass_name, ir_name);
+ }
 }
 
 pub unsafe extern "C" fn selfprofile_after_pass_callback(llvm_self_profiler: *mut c_void) {
- let llvm_self_profiler = &mut *(llvm_self_profiler as *mut LlvmSelfProfiler<'_>);
+ let llvm_self_profiler = unsafe { &mut *(llvm_self_profiler as *mut LlvmSelfProfiler<'_>) };
  llvm_self_profiler.after_pass_callback();
 }