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

Jump to bottom

static eval: Do not ICE on layout size overflow #56909

Merged
merged 1 commit into from Dec 23, 2018
Merged

static eval: Do not ICE on layout size overflow #56909

merged 1 commit into from Dec 23, 2018

Conversation

dlrobertson
Copy link
Contributor

Layout size overflow and typeck eval errors are reported. Trigger a bug
only when the eval error is strictly labeled as TooGeneric.

Fixes: #56762

@rust-highfive
Copy link
Collaborator

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 17, 2018
@dlrobertson
Copy link
Contributor Author

r? @estebank

@rust-highfive rust-highfive assigned estebank and unassigned varkor Dec 17, 2018
@dlrobertson
Copy link
Contributor Author

I tested this locally, but didn't add a test because I think the error would be architecture specific.

@oli-obk
Copy link
Contributor

oli-obk commented Dec 17, 2018

You can limit the test to a specific architecture (grep e.g. for x86 in the test directory, you should see a bunch of "ignore" or "only" comments)

@dlrobertson
Copy link
Contributor Author

@oli-obk updated with your suggestion and added a test.

oli-obk
oli-obk requested changes Dec 17, 2018
View reviewed changes
src/librustc_mir/const_eval.rs Outdated Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

Sign in to view
@dlrobertson
static eval: Do not ICE on layout size overflow
e7e17f9 
Layout size overflow and typeck eval errors are reported. Trigger a bug
only when the eval error is strictly labeled as TooGeneric.
@dlrobertson
Copy link
Contributor Author

@oli-obk updated

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Dec 17, 2018

📌 Commit e7e17f9 has been approved by estebank

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 17, 2018
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Dec 20, 2018
@pietroalbini
Rollup merge of rust-lang#56909 - dlrobertson:fix_56762, r=estebank
7b61ef3 
static eval: Do not ICE on layout size overflow

Layout size overflow and typeck eval errors are reported. Trigger a bug
only when the eval error is strictly labeled as TooGeneric.

Fixes: rust-lang#56762
@pietroalbini pietroalbini mentioned this pull request Dec 20, 2018
Closed
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Dec 21, 2018
@pietroalbini
Rollup merge of rust-lang#56909 - dlrobertson:fix_56762, r=estebank
df96d1f 
static eval: Do not ICE on layout size overflow

Layout size overflow and typeck eval errors are reported. Trigger a bug
only when the eval error is strictly labeled as TooGeneric.

Fixes: rust-lang#56762
@pietroalbini pietroalbini mentioned this pull request Dec 21, 2018
Closed
bors added a commit that referenced this pull request Dec 21, 2018
@bors
Auto merge of #57025 - pietroalbini:rollup, r=pietroalbini
9130e21 
Rollup of 20 pull requests

Successful merges:

 - #56802 (Add DoubleEndedIterator::nth_back)
 - #56842 (Add unstable VecDeque::rotate_{left|right})
 - #56869 (Reduce search-index.js size)
 - #56887 (Disable field reordering for repr(int).)
 - #56892 (rustc: Update Clang used to build LLVM on Linux)
 - #56909 (static eval: Do not ICE on layout size overflow)
 - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le)
 - #56917 (Simplify MIR generation for logical operations)
 - #56919 (Remove a wrong multiplier on relocation offset computation)
 - #56933 (Add --progress to git submodule commands in x.py)
 - #56941 (deny intra-doc link resolution failures in libstd)
 - #56964 (Remove `TokenStream::JointTree`.)
 - #56970 (Mem uninit doc ptr drop)
 - #56973 (make basic CTFE tracing available on release builds)
 - #56979 (Adding unwinding support for x86_64_fortanix_unknown_sgx target.)
 - #56981 (miri: allocation is infallible)
 - #56984 (A few tweaks to dropck_outlives)
 - #56989 (Fix compiletest `trim` deprecation warnings)
 - #56992 (suggest similar lint names for unknown lints)
 - #57002 (Stabilize Vec(Deque)::resize_with)

Failed merges:

r? @ghost
bors added a commit that referenced this pull request Dec 21, 2018
@bors
Auto merge of #57025 - pietroalbini:rollup, r=pietroalbini
0623286 
Rollup of 20 pull requests

Successful merges:

 - #56802 (Add DoubleEndedIterator::nth_back)
 - #56842 (Add unstable VecDeque::rotate_{left|right})
 - #56869 (Reduce search-index.js size)
 - #56887 (Disable field reordering for repr(int).)
 - #56892 (rustc: Update Clang used to build LLVM on Linux)
 - #56909 (static eval: Do not ICE on layout size overflow)
 - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le)
 - #56917 (Simplify MIR generation for logical operations)
 - #56919 (Remove a wrong multiplier on relocation offset computation)
 - #56933 (Add --progress to git submodule commands in x.py)
 - #56941 (deny intra-doc link resolution failures in libstd)
 - #56964 (Remove `TokenStream::JointTree`.)
 - #56970 (Mem uninit doc ptr drop)
 - #56973 (make basic CTFE tracing available on release builds)
 - #56979 (Adding unwinding support for x86_64_fortanix_unknown_sgx target.)
 - #56981 (miri: allocation is infallible)
 - #56984 (A few tweaks to dropck_outlives)
 - #56989 (Fix compiletest `trim` deprecation warnings)
 - #56992 (suggest similar lint names for unknown lints)
 - #57002 (Stabilize Vec(Deque)::resize_with)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2018
@Centril
Rollup merge of rust-lang#56909 - dlrobertson:fix_56762, r=estebank
e480450 
static eval: Do not ICE on layout size overflow

Layout size overflow and typeck eval errors are reported. Trigger a bug
only when the eval error is strictly labeled as TooGeneric.

Fixes: rust-lang#56762
@Centril Centril mentioned this pull request Dec 22, 2018
Closed
@kennytm kennytm mentioned this pull request Dec 22, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Dec 22, 2018
@kennytm
Rollup merge of rust-lang#56909 - dlrobertson:fix_56762, r=estebank
a92e21c 
static eval: Do not ICE on layout size overflow

Layout size overflow and typeck eval errors are reported. Trigger a bug
only when the eval error is strictly labeled as TooGeneric.

Fixes: rust-lang#56762
bors added a commit that referenced this pull request Dec 22, 2018
@bors
Auto merge of #57063 - kennytm:rollup, r=kennytm
16329b0 
Rollup of 25 pull requests

Successful merges:

 - #56802 (Add DoubleEndedIterator::nth_back)
 - #56909 (static eval: Do not ICE on layout size overflow)
 - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le)
 - #56919 (Remove a wrong multiplier on relocation offset computation)
 - #56933 (Add --progress to git submodule commands in x.py)
 - #56936 (rename div_euc -> div_euclid, and mod_euc -> rem_euclid)
 - #56941 (deny intra-doc link resolution failures in libstd)
 - #56945 (Fix rustdoc-js tests)
 - #56967 (Replace current crate's searchIndex when regenerating)
 - #56970 (Mem uninit doc ptr drop)
 - #56973 (make basic CTFE tracing available on release builds)
 - #56979 (Adding unwinding support for x86_64_fortanix_unknown_sgx target.)
 - #56981 (miri: allocation is infallible)
 - #56984 (A few tweaks to dropck_outlives)
 - #56989 (Fix compiletest `trim` deprecation warnings)
 - #56992 (suggest similar lint names for unknown lints)
 - #57002 (Stabilize Vec(Deque)::resize_with)
 - #57011 (rustdoc: add new CLI flag to load static files from a different location)
 - #57027 (Optimize away a move)
 - #57034 (Inline tweaks)
 - #57039 (Update migrate warning wording.)
 - #57040 (Fix feature gate to point to 1.32.0 for `path_from_str`)
 - #57049 (Stabilize #[repr(packed(N))])
 - #57050 (Fixed typo in HashMap documentation)
 - #57052 (Fix stabilization version numbers (exhaustive_integer_patterns + macro_literal_matcher))
@bors bors merged commit e7e17f9 into rust-lang:master Dec 23, 2018
@dlrobertson dlrobertson deleted the fix_56762 branch December 23, 2018 02:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk approved these changes

Assignees

@estebank estebank

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@dlrobertson @rust-highfive @oli-obk @estebank @bors @varkor