Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miri subtree update #117011

Merged
merged 48 commits into from
Oct 21, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
fc4aa4e
add test for self-assignment on call through reference
RalfJung Oct 9, 2023
e6aa233
add test to ensure RET assignments do not get propagated on unwinding
RalfJung Oct 9, 2023
e6637cb
return_pointer_aliasing2 should also run with SB
RalfJung Oct 9, 2023
ec1db97
Auto merge of #3114 - RalfJung:fn-call-tests, r=RalfJung
bors Oct 9, 2023
700bc97
Implement `llvm.x86.aesni.*` intrinsics
eduardosm Oct 2, 2023
aaba0a5
Auto merge of #3101 - eduardosm:x86-aes-intrinsics, r=RalfJung
bors Oct 9, 2023
d3b761a
avoid confusing loop in catch_panic test
RalfJung Oct 10, 2023
2b0c8a7
Auto merge of #3117 - RalfJung:catch-panic-loop, r=RalfJung
bors Oct 10, 2023
e3c2b66
Preparing for merge from rustc
RalfJung Oct 12, 2023
461d19b
Merge from rustc
RalfJung Oct 12, 2023
35de5bb
fmt
RalfJung Oct 12, 2023
eba1f5b
Auto merge of #3120 - RalfJung:rustup, r=RalfJung
bors Oct 12, 2023
c4b45c5
Preparing for merge from rustc
Oct 14, 2023
2383a00
Merge from rustc
Oct 14, 2023
99d6cd4
Auto merge of #3121 - rust-lang:rustup-2023-10-14, r=saethlin
bors Oct 14, 2023
949bb64
Implement `llvm.x86.sse41.*` intrinsics
eduardosm Oct 10, 2023
b800211
Auto merge of #3118 - eduardosm:intrinsics-x86-sse41, r=RalfJung
bors Oct 15, 2023
1c928f9
triagebot: re-enable merge commit check
RalfJung Oct 16, 2023
c1dbc19
Auto merge of #3123 - RalfJung:triagebot, r=RalfJung
bors Oct 16, 2023
8fa1b6a
Preparing for merge from rustc
Oct 17, 2023
2ca415c
Merge from rustc
Oct 17, 2023
d6f52bf
fmt
Oct 17, 2023
f408492
Auto merge of #3126 - rust-lang:rustup-2023-10-17, r=RalfJung
bors Oct 17, 2023
a8aa303
Fix rounding mode check in SSE4.1 round functions
eduardosm Oct 16, 2023
2366a90
Auto merge of #3124 - eduardosm:fix-sse41-round, r=RalfJung
bors Oct 17, 2023
0036d40
Bump rustix from 0.38.17 to 0.38.19
dependabot[bot] Oct 18, 2023
8c5ff75
Auto merge of #3127 - rust-lang:dependabot/cargo/rustix-0.38.19, r=Ra…
bors Oct 18, 2023
277ab78
Bump rustix from 0.38.17 to 0.38.19 in /cargo-miri
dependabot[bot] Oct 18, 2023
fb39dd4
Auto merge of #3128 - rust-lang:dependabot/cargo/cargo-miri/rustix-0.…
bors Oct 18, 2023
53fff96
Bump rustix from 0.38.17 to 0.38.19 in /miri-script
dependabot[bot] Oct 18, 2023
e120dea
Auto merge of #3129 - rust-lang:dependabot/cargo/miri-script/rustix-0…
bors Oct 19, 2023
8fb03fb
Preparing for merge from rustc
RalfJung Oct 19, 2023
d5d8a51
Merge from rustc
RalfJung Oct 19, 2023
b01c480
fmt
RalfJung Oct 19, 2023
5d62040
Auto merge of #3130 - RalfJung:rustup, r=RalfJung
bors Oct 19, 2023
f386329
intptrcast: only find strictly in-bounds pointers when we are not hit…
RalfJung Oct 14, 2023
55ce55d
switch intptrcast to helper trait pattern like everything else
RalfJung Oct 14, 2023
b325f31
remove allocations from int_to_ptr_map and exposed when they get freed
RalfJung Oct 14, 2023
ecaf828
clarify comment
RalfJung Oct 19, 2023
1e71277
Auto merge of #3122 - RalfJung:intrptrcast-clean, r=saethlin
bors Oct 19, 2023
464135d
Preparing for merge from rustc
RalfJung Oct 20, 2023
20fe485
Merge from rustc
RalfJung Oct 20, 2023
b824bb1
ignore deny lints in josh
RalfJung Oct 20, 2023
c51ce16
Auto merge of #3131 - RalfJung:rustup, r=RalfJung
bors Oct 20, 2023
ee54d83
Preparing for merge from rustc
Oct 21, 2023
8044a59
Merge from rustc
Oct 21, 2023
49056df
Auto merge of #3132 - rust-lang:rustup-2023-10-21, r=RalfJung
bors Oct 21, 2023
49e8acb
update lockfile
RalfJung Oct 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tools/miri/rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c07693c1608258f3577eb15057fc0744fa924ae9
c104861b7b51d2c28e7023e7e53db16cc6677e29
5 changes: 1 addition & 4 deletions src/tools/miri/src/intptrcast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,7 @@ impl<'mir, 'tcx> GlobalStateInner {
// Add offset with the right kind of pointer-overflowing arithmetic.
let dl = ecx.data_layout();
let absolute_addr = dl.overflowing_offset(base_addr, offset.bytes()).0;
Ok(Pointer::new(
Provenance::Concrete { alloc_id, tag },
Size::from_bytes(absolute_addr),
))
Ok(Pointer::new(Provenance::Concrete { alloc_id, tag }, Size::from_bytes(absolute_addr)))
}

/// When a pointer is used for a memory access, this computes where in which allocation the
Expand Down