Auto merge of #2986 - rust-lang:rustup-2023-07-18, r=RalfJung

Automatic sync from rustc

Author: bors

miri

@@ -97,7 +97,9 @@ toolchain)
     CUR_COMMIT=$(rustc +miri --version -v 2>/dev/null | grep "^commit-hash: " | cut -d " " -f 2)
     if [[ "$CUR_COMMIT" == "$NEW_COMMIT" ]]; then
         echo "miri toolchain is already at commit $CUR_COMMIT."
-        rustup override set miri
+        if [[ "$TOOLCHAIN" != "miri" ]]; then
+            rustup override set miri
+        fi
         exit 0
     fi
     # Install and setup new toolchain.

rust-version

@@ -1 +1 @@
-ffb9b61294b96c389d343a4c55b15400249d74e6
+ec362f0ae8a05618b75727cfdca853540cb2950e

src/borrow_tracker/mod.rs

@@ -413,7 +413,7 @@ impl AllocState {
         alloc_id: AllocId,
         prov_extra: ProvenanceExtra,
         range: AllocRange,
-        machine: &mut MiriMachine<'_, 'tcx>,
+        machine: &MiriMachine<'_, 'tcx>,
     ) -> InterpResult<'tcx> {
         match self {
             AllocState::StackedBorrows(sb) =>
@@ -434,7 +434,7 @@ impl AllocState {
         alloc_id: AllocId,
         prov_extra: ProvenanceExtra,
         range: AllocRange,
-        machine: &mut MiriMachine<'_, 'tcx>,
+        machine: &MiriMachine<'_, 'tcx>,
     ) -> InterpResult<'tcx> {
         match self {
             AllocState::StackedBorrows(sb) =>

src/borrow_tracker/stacked_borrows/mod.rs

@@ -244,7 +244,7 @@ impl<'tcx> Stack {
     fn item_invalidated(
         item: &Item,
         global: &GlobalStateInner,
-        dcx: &mut DiagnosticCx<'_, '_, '_, 'tcx>,
+        dcx: &DiagnosticCx<'_, '_, '_, 'tcx>,
         cause: ItemInvalidationCause,
     ) -> InterpResult<'tcx> {
         if !global.tracked_pointer_tags.is_empty() {
@@ -575,7 +575,7 @@ impl Stacks {
         alloc_id: AllocId,
         tag: ProvenanceExtra,
         range: AllocRange,
-        machine: &mut MiriMachine<'_, 'tcx>,
+        machine: &MiriMachine<'_, 'tcx>,
     ) -> InterpResult<'tcx> {
         trace!(
             "write access with tag {:?}: {:?}, size {}",
@@ -596,7 +596,7 @@ impl Stacks {
         alloc_id: AllocId,
         tag: ProvenanceExtra,
         range: AllocRange,
-        machine: &mut MiriMachine<'_, 'tcx>,
+        machine: &MiriMachine<'_, 'tcx>,
     ) -> InterpResult<'tcx> {
         trace!("deallocation with tag {:?}: {:?}, size {}", tag, alloc_id, range.size.bytes());
         let dcx = DiagnosticCxBuilder::dealloc(machine, tag);

src/shims/unix/sync.rs

@@ -18,14 +18,14 @@ use crate::*;
 const PTHREAD_MUTEX_NORMAL_FLAG: i32 = 0x8000000;
 
 fn is_mutex_kind_default<'mir, 'tcx: 'mir>(
-    ecx: &mut MiriInterpCx<'mir, 'tcx>,
+    ecx: &MiriInterpCx<'mir, 'tcx>,
     kind: i32,
 ) -> InterpResult<'tcx, bool> {
     Ok(kind == ecx.eval_libc_i32("PTHREAD_MUTEX_DEFAULT"))
 }
 
 fn is_mutex_kind_normal<'mir, 'tcx: 'mir>(
-    ecx: &mut MiriInterpCx<'mir, 'tcx>,
+    ecx: &MiriInterpCx<'mir, 'tcx>,
     kind: i32,
 ) -> InterpResult<'tcx, bool> {
     let mutex_normal_kind = ecx.eval_libc_i32("PTHREAD_MUTEX_NORMAL");

tests/fail/function_calls/target_feature.rs

@@ -0,0 +1,12 @@
+//@only-target-x86_64: uses x86 target features
+//@ignore-target-x86_64-apple-darwin: that target actually has ssse3
+
+fn main() {
+    assert!(!is_x86_feature_detected!("ssse3"));
+    unsafe {
+        ssse3_fn(); //~ ERROR: calling a function that requires unavailable target features: ssse3
+    }
+}
+
+#[target_feature(enable = "ssse3")]
+unsafe fn ssse3_fn() {}

tests/fail/function_calls/target_feature.stderr

@@ -0,0 +1,15 @@
+error: Undefined Behavior: calling a function that requires unavailable target features: ssse3
+  --> $DIR/target_feature.rs:LL:CC
+   |
+LL |         ssse3_fn();
+   |         ^^^^^^^^^^ calling a function that requires unavailable target features: ssse3
+   |
+   = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
+   = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
+   = note: BACKTRACE:
+   = note: inside `main` at $DIR/target_feature.rs:LL:CC
+
+note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
+
+error: aborting due to previous error
+

tests/pass/function_calls/target_feature.rs

@@ -0,0 +1,12 @@
+//@only-target-x86_64: uses x86 target features
+//@compile-flags: -C target-feature=+ssse3
+
+fn main() {
+    assert!(is_x86_feature_detected!("ssse3"));
+    unsafe {
+        ssse3_fn();
+    }
+}
+
+#[target_feature(enable = "ssse3")]
+unsafe fn ssse3_fn() {}