diff options
| author | Ryan Cumming <etaoins@gmail.com> | 2018-01-27 12:14:12 +1100 |
|---|---|---|
| committer | Malo Jaffré <jaffre.malo@gmail.com> | 2018-02-01 21:13:39 +0100 |
| commit | 2fefceef22a0867d8c09744b08e8174a77b7ceac (patch) | |
| tree | 3f2f95337e2a19ae6eea04b387cde93ee67419da /src/test | |
| parent | b2a634f8c97aec3b5b956601fbcf0f44354a8a5a (diff) | |
| download | rust-2fefceef22a0867d8c09744b08e8174a77b7ceac.tar.gz rust-2fefceef22a0867d8c09744b08e8174a77b7ceac.zip | |
Fix ICE on const eval of union field
MIR's `Const::get_field()` attempts to retrieve the value for a given field in a constant. In the case of a union constant it was falling through to a generic `const_get_elt` based on the field index. As union fields don't have an index this caused an ICE in `llvm_field_index`. Fix by simply returning the current value when accessing any field in a union. This works because all union fields start at byte offset 0. The added test uses `const_fn` it ensure the field is extracted using MIR's const evaluation. The crash is reproducible without it, however. Fixes #47788
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-pass/union/union-const-eval-field.rs | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/test/run-pass/union/union-const-eval-field.rs b/src/test/run-pass/union/union-const-eval-field.rs new file mode 100644 index 00000000000..a58b8bc34cd --- /dev/null +++ b/src/test/run-pass/union/union-const-eval-field.rs @@ -0,0 +1,26 @@ +// Copyright 2018 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)] + +union DummyUnion { + field1: i32, + field2: i32, +} + +const fn read_field() -> i32 { + const UNION: DummyUnion = DummyUnion { field1: 5 }; + const FIELD: i32 = unsafe { UNION.field2 }; + FIELD +} + +fn main() { + assert_eq!(read_field(), 5); +} |
