-
Notifications
You must be signed in to change notification settings - Fork 13.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #47794 - etaoins:fix-ice-on-const-eval-of-union-field, …
…r=eddyb 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 r? @eddyb
- Loading branch information
Showing
2 changed files
with
49 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
// 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)] | ||
|
||
type Field1 = i32; | ||
type Field2 = f32; | ||
type Field3 = i64; | ||
|
||
union DummyUnion { | ||
field1: Field1, | ||
field2: Field2, | ||
field3: Field3, | ||
} | ||
|
||
const FLOAT1_AS_I32: i32 = 1065353216; | ||
const UNION: DummyUnion = DummyUnion { field1: FLOAT1_AS_I32 }; | ||
|
||
const fn read_field1() -> Field1 { | ||
const FIELD1: Field1 = unsafe { UNION.field1 }; | ||
FIELD1 | ||
} | ||
|
||
const fn read_field2() -> Field2 { | ||
const FIELD2: Field2 = unsafe { UNION.field2 }; | ||
FIELD2 | ||
} | ||
|
||
const fn read_field3() -> Field3 { | ||
const FIELD3: Field3 = unsafe { UNION.field3 }; | ||
FIELD3 | ||
} | ||
|
||
fn main() { | ||
assert_eq!(read_field1(), FLOAT1_AS_I32); | ||
assert_eq!(read_field2(), 1.0); | ||
assert_eq!(read_field3(), unsafe { UNION.field3 }); | ||
} |