Backport only: avoid ICE on bad placeholder type #69324
Merged
Conversation
This file contains hidden or 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
rust-lang#69148 has a proper fix, but it is too big to backport. This change avoids the ICE by actually emitting an appropriate error. The output will be duplicated in some cases, but that's better than the avoidable ICE.
rust-highfive added the S-waiting-on-review | The PR points at master, what's the appropriate branch to point to for beta backport? |
estebank added beta-nominated 
Centril approved these changes Feb 21, 2020
| @bors r=Centril I'll rebase the branch with proper fix. Let's land this quickly to fix the ICE. |
| 📌 Commit 1cb555a has been approved by |
| 🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened |
bors added S-waiting-on-bors 
bors added a commit that referenced this pull request Feb 27, 2020
Rollup of 7 pull requests Successful merges: - #69324 (Backport only: avoid ICE on bad placeholder type) - #69439 (resolve: `lifetimes.rs` -> `late/lifetimes.rs`) - #69473 (update llvm to silence gcc 9 warnings) - #69479 (clarify operator precedence) - #69480 (Clean up E0373 explanation) - #69500 (Simplify the signature of par_for_each_in) - #69505 (Enable setting diagnostic labels) Failed merges: r? @ghost
| (T-compiler discussed this last week and it was beta-approved.) |
pnkfelix added the beta-accepted 
Mark-Simulacrum removed the beta-nominated bors added a commit that referenced this pull request Mar 6, 2020
[beta] another round of backports for 1.42 This backports the following pull requests: * Fix a leak in `DiagnosticBuilder::into_diagnostic`. #69628 * stash API: remove panic to fix ICE. #69623 * Do not ICE on invalid type node after parse recovery #69583 * Backport only: avoid ICE on bad placeholder type #69324 * add regression test for issue #68794 #69168 * Update compiler-builtins to 0.1.25 #69086 * Update RELEASES.md for 1.42.0 #68989
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
#69148 has a proper fix, but it is too big to backport.
This change avoids the ICE by actually emitting an appropriate error. The
output will be duplicated in some cases, but that's better than the
avoidable ICE.
r? @Centril