Normalize tests for i686 Windows.

26 files changed, 58 insertions, 147 deletions

diff --git a/src/test/ui/huge-enum.rs b/src/test/ui/huge-enum.rs
index 6e7c05370b9..17e20766bab 100644
--- a/src/test/ui/huge-enum.rs
+++ b/src/test/ui/huge-enum.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // error-pattern: Option
+// normalize-stderr-test "<\[u32; \d+\]>" -> "<[u32; N]>"
 
 // FIXME: work properly with higher limits
 
diff --git a/src/test/ui/huge-enum.stderr b/src/test/ui/huge-enum.stderr
index 239428badc2..b7cf2550461 100644
--- a/src/test/ui/huge-enum.stderr
+++ b/src/test/ui/huge-enum.stderr
@@ -1,4 +1,4 @@
-error: the type `std::option::Option<[u32; 35184372088831]>` is too big for the current architecture
+error: the type `std::option::Option<[u32; N]>` is too big for the current architecture
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/huge-struct.rs b/src/test/ui/huge-struct.rs
index a10c61d6606..c935ad92e44 100644
--- a/src/test/ui/huge-struct.rs
+++ b/src/test/ui/huge-struct.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "S32" -> "SXX"
+// normalize-stderr-test "S1M" -> "SXX"
 // error-pattern: too big for the current
 
 struct S32<T> {
diff --git a/src/test/ui/huge-struct.stderr b/src/test/ui/huge-struct.stderr
index 15807309d48..06b084bdc3a 100644
--- a/src/test/ui/huge-struct.stderr
+++ b/src/test/ui/huge-struct.stderr
@@ -1,4 +1,4 @@
-error: the type `S32<S1M<S1M<u32>>>` is too big for the current architecture
+error: the type `SXX<SXX<SXX<u32>>>` is too big for the current architecture
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-15919.rs b/src/test/ui/issues/issue-15919.rs
index df7e7c102b2..f3719951909 100644
--- a/src/test/ui/issues/issue-15919.rs
+++ b/src/test/ui/issues/issue-15919.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // error-pattern: too big for the current architecture
+// normalize-stderr-test "\[usize; \d+\]" -> "[usize; N]"
 
 #[cfg(target_pointer_width = "32")]
 fn main() {
diff --git a/src/test/ui/issues/issue-15919.stderr b/src/test/ui/issues/issue-15919.stderr
index a69e7b43e25..e4e88cc47cf 100644
--- a/src/test/ui/issues/issue-15919.stderr
+++ b/src/test/ui/issues/issue-15919.stderr
@@ -1,4 +1,4 @@
-error: the type `[usize; 18446744073709551615]` is too big for the current architecture
+error: the type `[usize; N]` is too big for the current architecture
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-17913.rs b/src/test/ui/issues/issue-17913.rs
index 80e5f2b6e21..9b9159994ac 100644
--- a/src/test/ui/issues/issue-17913.rs
+++ b/src/test/ui/issues/issue-17913.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
+// normalize-stderr-test "\[&usize; \d+\]" -> "[&usize; N]"
 // error-pattern: too big for the current architecture
 
 #![feature(box_syntax)]
diff --git a/src/test/ui/issues/issue-17913.stderr b/src/test/ui/issues/issue-17913.stderr
index ca8a28c0fd7..ae388c4d491 100644
--- a/src/test/ui/issues/issue-17913.stderr
+++ b/src/test/ui/issues/issue-17913.stderr
@@ -1,4 +1,4 @@
-error: the type `[&usize; 17293822569102704640]` is too big for the current architecture
+error: the type `[&usize; N]` is too big for the current architecture
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-23595-1.rs b/src/test/ui/issues/issue-23595-1.rs
deleted file mode 100644
index a3422d859c6..00000000000
--- a/src/test/ui/issues/issue-23595-1.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(associated_type_defaults)]
-
-use std::ops::{Index};
-
-trait Hierarchy {
-    type Value;
-    type ChildKey;
-    type Children = Index<Self::ChildKey, Output=Hierarchy>;
-    //~^ ERROR: the value of the associated type `ChildKey`
-    //~^^ ERROR: the value of the associated type `Children`
-    //~^^^ ERROR: the value of the associated type `Value`
-
-    fn data(&self) -> Option<(Self::Value, Self::Children)>;
-}
-
-fn main() {}
diff --git a/src/test/ui/issues/issue-23595-1.stderr b/src/test/ui/issues/issue-23595-1.stderr
deleted file mode 100644
index 624534eb8d7..00000000000
--- a/src/test/ui/issues/issue-23595-1.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0191]: the value of the associated type `ChildKey` (from the trait `Hierarchy`) must be specified
-  --> $DIR/issue-23595-1.rs:18:50
-   |
-LL |     type Children = Index<Self::ChildKey, Output=Hierarchy>;
-   |                                                  ^^^^^^^^^ missing associated type `ChildKey` value
-
-error[E0191]: the value of the associated type `Children` (from the trait `Hierarchy`) must be specified
-  --> $DIR/issue-23595-1.rs:18:50
-   |
-LL |     type Children = Index<Self::ChildKey, Output=Hierarchy>;
-   |                                                  ^^^^^^^^^ missing associated type `Children` value
-
-error[E0191]: the value of the associated type `Value` (from the trait `Hierarchy`) must be specified
-  --> $DIR/issue-23595-1.rs:18:50
-   |
-LL |     type Children = Index<Self::ChildKey, Output=Hierarchy>;
-   |                                                  ^^^^^^^^^ missing associated type `Value` value
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0191`.
diff --git a/src/test/ui/issues/issue-28625.rs b/src/test/ui/issues/issue-28625.rs
index dc9155ed66c..273629a90fc 100644
--- a/src/test/ui/issues/issue-28625.rs
+++ b/src/test/ui/issues/issue-28625.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
+
 trait Bar {
     type Bar;
 }
diff --git a/src/test/ui/issues/issue-28625.stderr b/src/test/ui/issues/issue-28625.stderr
index 90b50f193fb..22f8db4d387 100644
--- a/src/test/ui/issues/issue-28625.stderr
+++ b/src/test/ui/issues/issue-28625.stderr
@@ -1,11 +1,11 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/issue-28625.rs:20:14
+  --> $DIR/issue-28625.rs:22:14
    |
 LL |     unsafe { std::mem::transmute(a) } //~ ERROR transmute called with types of different sizes
    |              ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: &ArrayPeano<T> (64 bits)
-   = note: target type: &[T] (128 bits)
+   = note: source type: &ArrayPeano<T> (N bits)
+   = note: target type: &[T] (N bits)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-32377.rs b/src/test/ui/issues/issue-32377.rs
index 5091ba4ee1a..425dcc6b21e 100644
--- a/src/test/ui/issues/issue-32377.rs
+++ b/src/test/ui/issues/issue-32377.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
+
 use std::mem;
 use std::marker::PhantomData;
 
diff --git a/src/test/ui/issues/issue-32377.stderr b/src/test/ui/issues/issue-32377.stderr
index a0698885caa..7168a000a02 100644
--- a/src/test/ui/issues/issue-32377.stderr
+++ b/src/test/ui/issues/issue-32377.stderr
@@ -1,11 +1,11 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/issue-32377.rs:23:14
+  --> $DIR/issue-32377.rs:25:14
    |
 LL |     unsafe { mem::transmute(x) }
    |              ^^^^^^^^^^^^^^
    |
-   = note: source type: [usize; 2] (128 bits)
-   = note: target type: Bar<U> (0 bits)
+   = note: source type: [usize; 2] (N bits)
+   = note: target type: Bar<U> (N bits)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-43733-2.rs b/src/test/ui/issues/issue-43733-2.rs
deleted file mode 100644
index a5ba9ef9bd3..00000000000
--- a/src/test/ui/issues/issue-43733-2.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(const_fn)]
-#![feature(cfg_target_thread_local, thread_local_internals)]
-
-// On platforms *without* `#[thread_local]`, use
-// a custom non-`Sync` type to fake the same error.
-#[cfg(not(target_thread_local))]
-struct Key<T> {
-    _data: std::cell::UnsafeCell<Option<T>>,
-    _flag: std::cell::Cell<bool>,
-}
-
-#[cfg(not(target_thread_local))]
-impl<T> Key<T> {
-    const fn new() -> Self {
-        Key {
-            _data: std::cell::UnsafeCell::new(None),
-            _flag: std::cell::Cell::new(false),
-        }
-    }
-}
-
-#[cfg(target_thread_local)]
-use std::thread::__FastLocalKeyInner as Key;
-
-static __KEY: Key<()> = Key::new();
-//~^ ERROR `std::cell::UnsafeCell<std::option::Option<()>>` cannot be shared between threads
-//~| ERROR `std::cell::Cell<bool>` cannot be shared between threads safely [E0277]
-
-fn main() {}
diff --git a/src/test/ui/issues/issue-43733-2.stderr b/src/test/ui/issues/issue-43733-2.stderr
deleted file mode 100644
index 8eb150ff833..00000000000
--- a/src/test/ui/issues/issue-43733-2.stderr
+++ /dev/null
@@ -1,23 +0,0 @@
-error[E0277]: `std::cell::UnsafeCell<std::option::Option<()>>` cannot be shared between threads safely
-  --> $DIR/issue-43733-2.rs:35:1
-   |
-LL | static __KEY: Key<()> = Key::new();
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell<std::option::Option<()>>` cannot be shared between threads safely
-   |
-   = help: within `std::thread::Key<()>`, the trait `std::marker::Sync` is not implemented for `std::cell::UnsafeCell<std::option::Option<()>>`
-   = note: required because it appears within the type `std::thread::Key<()>`
-   = note: shared static variables must have a type that implements `Sync`
-
-error[E0277]: `std::cell::Cell<bool>` cannot be shared between threads safely
-  --> $DIR/issue-43733-2.rs:35:1
-   |
-LL | static __KEY: Key<()> = Key::new();
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::Cell<bool>` cannot be shared between threads safely
-   |
-   = help: within `std::thread::Key<()>`, the trait `std::marker::Sync` is not implemented for `std::cell::Cell<bool>`
-   = note: required because it appears within the type `std::thread::Key<()>`
-   = note: shared static variables must have a type that implements `Sync`
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/packed-struct/packed-struct-transmute.rs b/src/test/ui/packed-struct/packed-struct-transmute.rs
index abb02dd39e6..695ffbdb2af 100644
--- a/src/test/ui/packed-struct/packed-struct-transmute.rs
+++ b/src/test/ui/packed-struct/packed-struct-transmute.rs
@@ -13,6 +13,7 @@
 // the error points to the start of the file, not the line with the
 // transmute
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
 // error-pattern: transmute called with types of different sizes
 
 use std::mem;
diff --git a/src/test/ui/packed-struct/packed-struct-transmute.stderr b/src/test/ui/packed-struct/packed-struct-transmute.stderr
index 6158dea524e..5da7d8f7b7e 100644
--- a/src/test/ui/packed-struct/packed-struct-transmute.stderr
+++ b/src/test/ui/packed-struct/packed-struct-transmute.stderr
@@ -1,11 +1,11 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/packed-struct-transmute.rs:35:24
+  --> $DIR/packed-struct-transmute.rs:36:24
    |
 LL |         let oof: Oof = mem::transmute(foo);
    |                        ^^^^^^^^^^^^^^
    |
-   = note: source type: Foo (72 bits)
-   = note: target type: Oof (128 bits)
+   = note: source type: Foo (N bits)
+   = note: target type: Oof (N bits)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/transmute/transmute-different-sizes.rs b/src/test/ui/transmute/transmute-different-sizes.rs
index 113e2ed4c80..62e9ceb2b2f 100644
--- a/src/test/ui/transmute/transmute-different-sizes.rs
+++ b/src/test/ui/transmute/transmute-different-sizes.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
+
 // Tests that `transmute` cannot be called on types of different size.
 
 #![allow(warnings)]
diff --git a/src/test/ui/transmute/transmute-different-sizes.stderr b/src/test/ui/transmute/transmute-different-sizes.stderr
index e33e0e93fd1..a07b75e29d5 100644
--- a/src/test/ui/transmute/transmute-different-sizes.stderr
+++ b/src/test/ui/transmute/transmute-different-sizes.stderr
@@ -1,28 +1,28 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-different-sizes.rs:19:17
+  --> $DIR/transmute-different-sizes.rs:21:17
    |
 LL |     let _: i8 = transmute(16i16);
    |                 ^^^^^^^^^
    |
-   = note: source type: i16 (16 bits)
-   = note: target type: i8 (8 bits)
+   = note: source type: i16 (N bits)
+   = note: target type: i8 (N bits)
 
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-different-sizes.rs:24:17
+  --> $DIR/transmute-different-sizes.rs:26:17
    |
 LL |     let _: i8 = transmute(x);
    |                 ^^^^^^^^^
    |
-   = note: source type: &T (64 bits)
-   = note: target type: i8 (8 bits)
+   = note: source type: &T (N bits)
+   = note: target type: i8 (N bits)
 
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-different-sizes.rs:35:5
+  --> $DIR/transmute-different-sizes.rs:37:5
    |
 LL |     transmute(x)
    |     ^^^^^^^^^
    |
-   = note: source type: u16 (16 bits)
+   = note: source type: u16 (N bits)
    = note: target type: <T as Specializable>::Output (this type's size can vary)
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/transmute/transmute-fat-pointers.rs b/src/test/ui/transmute/transmute-fat-pointers.rs
index 59027fc7787..c1e6ee3ddcc 100644
--- a/src/test/ui/transmute/transmute-fat-pointers.rs
+++ b/src/test/ui/transmute/transmute-fat-pointers.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
+
 // Tests that are conservative around thin/fat pointer mismatches.
 
 #![allow(dead_code)]
diff --git a/src/test/ui/transmute/transmute-fat-pointers.stderr b/src/test/ui/transmute/transmute-fat-pointers.stderr
index e5d9459e3ec..8ea71e101c0 100644
--- a/src/test/ui/transmute/transmute-fat-pointers.stderr
+++ b/src/test/ui/transmute/transmute-fat-pointers.stderr
@@ -1,14 +1,14 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-fat-pointers.rs:18:14
+  --> $DIR/transmute-fat-pointers.rs:20:14
    |
 LL |     unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
    |              ^^^^^^^^^
    |
-   = note: source type: &[T] (128 bits)
+   = note: source type: &[T] (N bits)
    = note: target type: &U (pointer to U)
 
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-fat-pointers.rs:22:14
+  --> $DIR/transmute-fat-pointers.rs:24:14
    |
 LL |     unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
    |              ^^^^^^^^^
@@ -17,21 +17,21 @@ LL |     unsafe { transmute(x) } //~ ERROR transmute called with types of differ
    = note: target type: &U (pointer to U)
 
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-fat-pointers.rs:34:14
+  --> $DIR/transmute-fat-pointers.rs:36:14
    |
 LL |     unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
    |              ^^^^^^^^^
    |
    = note: source type: &T (pointer to T)
-   = note: target type: &U (64 bits)
+   = note: target type: &U (N bits)
 
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-fat-pointers.rs:38:14
+  --> $DIR/transmute-fat-pointers.rs:40:14
    |
 LL |     unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
    |              ^^^^^^^^^
    |
-   = note: source type: &T (64 bits)
+   = note: source type: &T (N bits)
    = note: target type: &U (pointer to U)
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/transmute/transmute-impl.rs b/src/test/ui/transmute/transmute-impl.rs
index 2f8f9e46e1a..3bf4ca5b9e0 100644
--- a/src/test/ui/transmute/transmute-impl.rs
+++ b/src/test/ui/transmute/transmute-impl.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
+
 // Tests that are conservative around thin/fat pointer mismatches.
 
 #![allow(dead_code)]
diff --git a/src/test/ui/transmute/transmute-impl.stderr b/src/test/ui/transmute/transmute-impl.stderr
index f435e28976b..21f272b0cc1 100644
--- a/src/test/ui/transmute/transmute-impl.stderr
+++ b/src/test/ui/transmute/transmute-impl.stderr
@@ -1,11 +1,11 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-impl.rs:29:18
+  --> $DIR/transmute-impl.rs:31:18
    |
 LL |         unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
    |                  ^^^^^^^^^
    |
    = note: source type: &T (pointer to T)
-   = note: target type: &isize (64 bits)
+   = note: target type: &isize (N bits)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/union-ub-fat-ptr.rs b/src/test/ui/union-ub-fat-ptr.rs
index 935e69d2e22..cfce92ece7a 100644
--- a/src/test/ui/union-ub-fat-ptr.rs
+++ b/src/test/ui/union-ub-fat-ptr.rs
@@ -8,6 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "alignment \d+" -> "alignment N"
+// normalize-stderr-test "offset \d+" -> "offset N"
+// normalize-stderr-test "allocation \d+" -> "allocation N"
+// normalize-stderr-test "size \d+" -> "size N"
+
 #[repr(C)]
 #[derive(Copy, Clone)]
 struct SliceRepr {
diff --git a/src/test/ui/union-ub-fat-ptr.stderr b/src/test/ui/union-ub-fat-ptr.stderr
index f8877e35f7a..f0298d9013c 100644
--- a/src/test/ui/union-ub-fat-ptr.stderr
+++ b/src/test/ui/union-ub-fat-ptr.stderr
@@ -1,5 +1,5 @@
 error[E0080]: this constant likely exhibits undefined behavior
-  --> $DIR/union-ub-fat-ptr.rs:67:1
+  --> $DIR/union-ub-fat-ptr.rs:72:1
    |
 LL | const C: &str = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.str};
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered length is not a valid integer
@@ -7,7 +7,7 @@ LL | const C: &str = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
 
 error[E0080]: this constant likely exhibits undefined behavior
-  --> $DIR/union-ub-fat-ptr.rs:75:1
+  --> $DIR/union-ub-fat-ptr.rs:80:1
    |
 LL | const C2: &[u8] = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.slice};
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered length is not a valid integer
@@ -15,23 +15,23 @@ LL | const C2: &[u8] = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, l
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
 
 error[E0080]: this constant likely exhibits undefined behavior
-  --> $DIR/union-ub-fat-ptr.rs:79:1
+  --> $DIR/union-ub-fat-ptr.rs:84:1
    |
 LL | const D: &Trait = unsafe { DynTransmute { repr: DynRepr { ptr: &92, vtable: &3 } }.rust};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ tried to access memory with alignment 1, but alignment 8 is required
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ tried to access memory with alignment N, but alignment N is required
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
 
 error[E0080]: this constant likely exhibits undefined behavior
-  --> $DIR/union-ub-fat-ptr.rs:82:1
+  --> $DIR/union-ub-fat-ptr.rs:87:1
    |
 LL | const E: &Trait = unsafe { DynTransmute { repr2: DynRepr2 { ptr: &92, vtable: &3 } }.rust};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access at offset 16, outside bounds of allocation 56 which has size 8
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access at offset N, outside bounds of allocation N which has size N
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
 
 error[E0080]: this constant likely exhibits undefined behavior
-  --> $DIR/union-ub-fat-ptr.rs:85:1
+  --> $DIR/union-ub-fat-ptr.rs:90:1
    |
 LL | const F: &Trait = unsafe { DynTransmute { bad: BadDynRepr { ptr: &92, vtable: 3 } }.rust};
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered vtable address is not a pointer