Undo an assert causing an ICE until we fix the problem properly

2 files changed, 16 insertions, 5 deletions

diff --git a/src/librustc_target/abi/mod.rs b/src/librustc_target/abi/mod.rs
index a19bb6807f1..2d7e05037ba 100644
--- a/src/librustc_target/abi/mod.rs
+++ b/src/librustc_target/abi/mod.rs
@@ -694,11 +694,7 @@ impl FieldPlacement {
 
     pub fn offset(&self, i: usize) -> Size {
         match *self {
-            FieldPlacement::Union(count) => {
-                assert!(i < count,
-                        "Tried to access field {} of union with {} fields", i, count);
-                Size::ZERO
-            },
+            FieldPlacement::Union(_) => Size::ZERO,
             FieldPlacement::Array { stride, count } => {
                 let i = i as u64;
                 assert!(i < count);
diff --git a/src/test/ui/issues/issue-65462.rs b/src/test/ui/issues/issue-65462.rs
new file mode 100644
index 00000000000..8c39ea531d2
--- /dev/null
+++ b/src/test/ui/issues/issue-65462.rs
@@ -0,0 +1,15 @@
+// build-pass
+
+enum Empty {}
+enum Enum {
+    Empty( Empty )
+}
+
+fn foobar() -> Option< Enum > {
+    let value: Option< Empty > = None;
+    Some( Enum::Empty( value? ) )
+}
+
+fn main() {
+    foobar();
+}