Skip to content

Commit 24ea418

Browse files
committed
Auto merge of #3301 - rust-lang:rustup-2024-02-16, r=saethlin
Automatic Rustup
2 parents b47aef2 + 605caa1 commit 24ea418

File tree

6 files changed

+10
-38
lines changed

6 files changed

+10
-38
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
502ce8287bc3c86dca07acc38c5ff9431a6097be
1+
0f806a9812b62c36bdab08d33c14cf2d3ecf4355

src/shims/intrinsics/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
106106
"volatile_load" => {
107107
let [place] = check_arg_count(args)?;
108108
let place = this.deref_pointer(place)?;
109-
this.copy_op(&place, dest, /*allow_transmute*/ false)?;
109+
this.copy_op(&place, dest)?;
110110
}
111111
"volatile_store" => {
112112
let [place, dest] = check_arg_count(args)?;
113113
let place = this.deref_pointer(place)?;
114-
this.copy_op(dest, &place, /*allow_transmute*/ false)?;
114+
this.copy_op(dest, &place)?;
115115
}
116116

117117
"write_bytes" | "volatile_set_memory" => {

src/shims/x86/mod.rs

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,7 @@ fn bin_op_simd_float_first<'tcx, F: rustc_apfloat::Float>(
296296
this.write_scalar(res0, &this.project_index(&dest, 0)?)?;
297297

298298
for i in 1..dest_len {
299-
this.copy_op(
300-
&this.project_index(&left, i)?,
301-
&this.project_index(&dest, i)?,
302-
/*allow_transmute*/ false,
303-
)?;
299+
this.copy_op(&this.project_index(&left, i)?, &this.project_index(&dest, i)?)?;
304300
}
305301

306302
Ok(())
@@ -421,11 +417,7 @@ fn unary_op_ss<'tcx>(
421417
this.write_scalar(res0, &this.project_index(&dest, 0)?)?;
422418

423419
for i in 1..dest_len {
424-
this.copy_op(
425-
&this.project_index(&op, i)?,
426-
&this.project_index(&dest, i)?,
427-
/*allow_transmute*/ false,
428-
)?;
420+
this.copy_op(&this.project_index(&op, i)?, &this.project_index(&dest, i)?)?;
429421
}
430422

431423
Ok(())
@@ -481,11 +473,7 @@ fn round_first<'tcx, F: rustc_apfloat::Float>(
481473
)?;
482474

483475
for i in 1..dest_len {
484-
this.copy_op(
485-
&this.project_index(&left, i)?,
486-
&this.project_index(&dest, i)?,
487-
/*allow_transmute*/ false,
488-
)?;
476+
this.copy_op(&this.project_index(&left, i)?, &this.project_index(&dest, i)?)?;
489477
}
490478

491479
Ok(())

src/shims/x86/sse.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,7 @@ pub(super) trait EvalContextExt<'mir, 'tcx: 'mir>:
208208
this.write_immediate(*res0, &dest0)?;
209209

210210
for i in 1..dest_len {
211-
this.copy_op(
212-
&this.project_index(&left, i)?,
213-
&this.project_index(&dest, i)?,
214-
/*allow_transmute*/ false,
215-
)?;
211+
this.copy_op(&this.project_index(&left, i)?, &this.project_index(&dest, i)?)?;
216212
}
217213
}
218214
_ => return Ok(EmulateForeignItemResult::NotSupported),

src/shims/x86/sse2.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -440,11 +440,7 @@ pub(super) trait EvalContextExt<'mir, 'tcx: 'mir>:
440440
this.write_scalar(res0, &this.project_index(&dest, 0)?)?;
441441

442442
for i in 1..dest_len {
443-
this.copy_op(
444-
&this.project_index(&op, i)?,
445-
&this.project_index(&dest, i)?,
446-
/*allow_transmute*/ false,
447-
)?;
443+
this.copy_op(&this.project_index(&op, i)?, &this.project_index(&dest, i)?)?;
448444
}
449445
}
450446
// Used to implement _mm_sqrt_pd functions.
@@ -581,11 +577,7 @@ pub(super) trait EvalContextExt<'mir, 'tcx: 'mir>:
581577

582578
// Copy remianing from `left`
583579
for i in 1..dest_len {
584-
this.copy_op(
585-
&this.project_index(&left, i)?,
586-
&this.project_index(&dest, i)?,
587-
/*allow_transmute*/ false,
588-
)?;
580+
this.copy_op(&this.project_index(&left, i)?, &this.project_index(&dest, i)?)?;
589581
}
590582
}
591583
// Used to implement the `_mm_pause` function.

src/shims/x86/sse41.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ pub(super) trait EvalContextExt<'mir, 'tcx: 'mir>:
5757
this.write_immediate(*src_value, &dest)?;
5858
} else {
5959
// copy from `left`
60-
this.copy_op(
61-
&this.project_index(&left, i)?,
62-
&dest,
63-
/*allow_transmute*/ false,
64-
)?;
60+
this.copy_op(&this.project_index(&left, i)?, &dest)?;
6561
}
6662
}
6763
}

0 commit comments

Comments
 (0)