Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate constants during const_eval_raw #74949

Merged
merged 18 commits into from
Sep 20, 2020
Merged

Validate constants during const_eval_raw #74949

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift click to select a range
083f1d7
Validate constants during `const_eval_raw`
oli-obk Jul 30, 2020
2d7ac72
Stop using the `const_eval` query for initializers of statics
oli-obk Jul 31, 2020
6d3c7bb
Update codegen tests
oli-obk Jul 31, 2020
4397d66
Document `op_to_const`'s purpose
oli-obk Aug 10, 2020
b1bd34d
`turn_into_const` is infallible
oli-obk Aug 10, 2020
48f366f
Replace `and_then` `map_err` `and_then` chain with a match
oli-obk Aug 10, 2020
a6c60bb
Clarify a statement in UB test
oli-obk Aug 10, 2020
dd9702a
Do not call the `const_eval` query in mir interpretation except for c…
oli-obk Aug 10, 2020
40c2087
We can make const eval sound, it's just super expensive
oli-obk Aug 10, 2020
69a6be7
Rename const eval queries to reflect the validation changes
oli-obk Aug 10, 2020
888afd5
Unify the names of const eval queries and their return types
oli-obk Aug 20, 2020
90708c1
Fix rebase fallout and make the test work with debug info
oli-obk Aug 21, 2020
182ed85
Address review comments
oli-obk Sep 7, 2020
c3c8c98
Rustfmt
oli-obk Sep 9, 2020
ef04e68
Update compile-fail tests
oli-obk Sep 9, 2020
c5889e4
Update incremental tests
oli-obk Sep 9, 2020
b8e6883
Reflect the "do not call this query directly" mentality in its name
oli-obk Sep 19, 2020
34785fc
Make codegen test bitwidth-independent
oli-obk Sep 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Make codegen test bitwidth-independent
  • Loading branch information
@oli-obk
oli-obk committed Sep 20, 2020
commit 34785fcc4a56c4f705a1f5c9929689e5c46e1fbc
4 changes: 2 additions & 2 deletions src/test/codegen/consts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 43,14 @@ pub fn inline_enum_const() -> E<i8, i16> {
#[no_mangle]
pub fn low_align_const() -> E<i16, [i16; 3]> {
// Check that low_align_const and high_align_const use the same constant
// CHECK: memcpy.p0i8.p0i8.i64(i8* align 2 %1, i8* align 2 getelementptr inbounds (<{ [8 x i8] }>, <{ [8 x i8] }>* [[LOW_HIGH]], i32 0, i32 0, i32 0), i64 8, i1 false)
// CHECK: memcpy.p0i8.p0i8.i{{(32|64)}}(i8* align 2 %1, i8* align 2 getelementptr inbounds (<{ [8 x i8] }>, <{ [8 x i8] }>* [[LOW_HIGH]], i32 0, i32 0, i32 0), i{{(32|64)}} 8, i1 false)
*&E::A(0)
}

// CHECK-LABEL: @high_align_const
#[no_mangle]
pub fn high_align_const() -> E<i16, i32> {
// Check that low_align_const and high_align_const use the same constant
// CHECK: memcpy.p0i8.p0i8.i64(i8* align 4 %1, i8* align 4 getelementptr inbounds (<{ [8 x i8] }>, <{ [8 x i8] }>* [[LOW_HIGH]], i32 0, i32 0, i32 0), i64 8, i1 false)
// CHECK: memcpy.p0i8.p0i8.i{{(32|64)}}(i8* align 4 %1, i8* align 4 getelementptr inbounds (<{ [8 x i8] }>, <{ [8 x i8] }>* [[LOW_HIGH]], i32 0, i32 0, i32 0), i{{(32|64)}} 8, i1 false)
*&E::A(0)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not have the slightest idea what is happening here, even after reading the comments -- all I can see is that you are matching very different things than before, for whatever reason. Why did anything change here to begin with? Do you want to find someone to actually check this?