diff options
| author | Michael Goulet <michael@errs.io> | 2022-05-30 15:57:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-30 15:57:28 -0700 |
| commit | 12ba87b9964314535e68a1ae9a5616acac4a438a (patch) | |
| tree | 1464137c2ab872c112baa858113668f0f41a5d28 /compiler/rustc_const_eval/src/interpret | |
| parent | 22da719762c1d101c20f59620f1445f5eaf75bba (diff) | |
| parent | d7a2d9ae0e7e4b3c5811bdfd4809cfc772062140 (diff) | |
| download | rust-12ba87b9964314535e68a1ae9a5616acac4a438a.tar.gz rust-12ba87b9964314535e68a1ae9a5616acac4a438a.zip | |
Rollup merge of #97395 - RalfJung:call-abi, r=oli-obk
Miri call ABI check: ensure type size+align stay the same We should almost certainly not accept calls where caller and callee disagree on the size or alignment of the type. The checks we do *almost* imply that, except that `ScalarPair` types can have `repr(align)` and thus differ in size/align even when they are pairs of the same primitive type. r? ``@oli-obk``
Diffstat (limited to 'compiler/rustc_const_eval/src/interpret')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/terminator.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/terminator.rs b/compiler/rustc_const_eval/src/interpret/terminator.rs index a5c7d4c8e20..10da2f803af 100644 --- a/compiler/rustc_const_eval/src/interpret/terminator.rs +++ b/compiler/rustc_const_eval/src/interpret/terminator.rs @@ -185,7 +185,14 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { // No question return true; } - // Compare layout + if caller_abi.layout.size != callee_abi.layout.size + || caller_abi.layout.align.abi != callee_abi.layout.align.abi + { + // This cannot go well... + // FIXME: What about unsized types? + return false; + } + // The rest *should* be okay, but we are extra conservative. match (caller_abi.layout.abi, callee_abi.layout.abi) { // Different valid ranges are okay (once we enforce validity, // that will take care to make it UB to leave the range, just |