Skip to content

Do not ICE on unicode next point - #68084

Merged
bors merged 5 commits into
rust-lang:masterfrom
estebank:ice-68000
Jan 11, 2020
Merged

Do not ICE on unicode next point#68084
bors merged 5 commits into
rust-lang:masterfrom
estebank:ice-68000

Conversation

@estebank

@estebankestebank commented Jan 10, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Use shrink_to_hi instead of next_point and fix next_point.

Fix#68000, fix#68091, fix#68092.

@estebank
Do not ICE on unicode next point
fcd850f
Use `shrink_to_hi` instead of `next_point`
Fixrust-lang#68000.
@rust-highfive

rust-highfive commented Jan 10, 2020

Copy link
Copy Markdown
Contributor

r? @zackmdavis

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 10, 2020
@estebankestebank added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. and removed beta-accepted Accepted for backporting to the compiler in the beta channel. labels Jan 10, 2020
@varkor

varkor commented Jan 10, 2020

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jan 10, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit fcd850f has been approved by varkor

@borsbors 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 Jan 10, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 10, 2020
@JohnTitor
Rollup merge ofrust-lang#68084- estebank:ice-68000, r=varkor
0d7a792
Do not ICE on unicode next point
Use `shrink_to_hi` instead of `next_point`.
Fixrust-lang#68000.
@JohnTitorJohnTitor mentioned this pull request Jan 10, 2020
Closed
@estebank

estebank commented Jan 10, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

@varkor Added some extra changes that should fix all possible ICEs stemming from this: fixed next_point and reduced its usage wherever possible. If you don't mind re-reviewing it should be pretty fast and each commit should be easy to follow.

estebank
estebank commented Jan 10, 2020
View reviewed changes
Comment threadsrc/librustc_span/source_map.rs
pub fn next_point(&self, sp: Span) -> Span {
let start_of_next_point = sp.hi().0;

let width = self.find_width_of_character_at_span(sp, true);

@estebankestebankJan 10, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This is the only necessary change to stop the ICEs in stable and beta.

@pnkfelixpnkfelixJan 16, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This isolated change is stable-accepted

@varkor

varkor commented Jan 10, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 10, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit f6e9fd0 has been approved by varkor

Centril added a commit to Centril/rust that referenced this pull request Jan 11, 2020
@Centril
Rollup merge ofrust-lang#68084- estebank:ice-68000, r=varkor
4b7838f
Do not ICE on unicode next point
Use `shrink_to_hi` instead of `next_point` and fix `next_point`.
Fixrust-lang#68000, fixrust-lang#68091, fixrust-lang#68092.
@CentrilCentril mentioned this pull request Jan 11, 2020
Closed
Centril added a commit to Centril/rust that referenced this pull request Jan 11, 2020
@Centril
Rollup merge ofrust-lang#68084- estebank:ice-68000, r=varkor
cacda2d
Do not ICE on unicode next point
Use `shrink_to_hi` instead of `next_point` and fix `next_point`.
Fixrust-lang#68000, fixrust-lang#68091, fixrust-lang#68092.
@CentrilCentril mentioned this pull request Jan 11, 2020
Merged
bors added a commit that referenced this pull request Jan 11, 2020
@bors
Auto merge of#68115- Centril:rollup-e2fszdv, r=Centril
88d1109
Rollup of 8 pull requests
Successful merges:
- #67666 (make use of pointer::is_null)
- #67806 (Extract `rustc_ast_passes`, move gating, & refactor linting)
- #68043 (Add some missing timers)
- #68074 (Add `llvm-skip-rebuild` flag to `x.py`)
- #68079 (Clarify suggestion for E0013)
- #68084 (Do not ICE on unicode next point)
- #68102 (Inline some conversion methods around OsStr)
- #68106 (Fix issue with using `self` module via indirection)
Failed merges:
r? @ghost
@bors
bors merged commit f6e9fd0 into rust-lang:masterJan 11, 2020
This was referenced Jan 14, 2020
Closed
Merged
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 15, 2020
@Dylan-DPC
Rollup merge ofrust-lang#68236- JohnTitor:ice-tests, r=Centril
2039d7e
Add some regression tests
Closesrust-lang#64848 (fixed by rust-lang#67631)
Closesrust-lang#65918 (ICE is hidden by rust-lang#67000, no longer ICE)
Closesrust-lang#66473 (fixed by rust-lang#68084)
Closesrust-lang#67550 (set mir-opt-level to 3)
r? @Centril
@pnkfelix

pnkfelix commented Jan 16, 2020

Copy link
Copy Markdown
Contributor

discussed at T-compiler meeting. Accepted for beta-backport.

@pnkfelixpnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 16, 2020
@pnkfelix

pnkfelix commented Jan 16, 2020

Copy link
Copy Markdown
Contributor

aforementioned isolated change is stable-accepted for backport

@pnkfelixpnkfelix added the stable-accepted Accepted for backporting to the compiler in the stable channel. label Jan 16, 2020
@cuvipercuviper mentioned this pull request Jan 17, 2020
Merged
bors added a commit that referenced this pull request Jan 19, 2020
@bors
Auto merge of#68321- cuviper:beta-next, r=Dylan-DPC
fb30562
Beta backports
- expect `fn` after `const unsafe` / `const extern` #68073
- Do not ICE on unicode next point #68084
- rustdoc: Don't allow `#![feature(...)]` on stable or beta #67989
r? @Mark-Simulacrum
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 23, 2020
@Mark-SimulacrumMark-Simulacrum removed stable-accepted Accepted for backporting to the compiler in the stable channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Jan 31, 2020
@estebank
estebank deleted the ice-68000 branch November 9, 2023 05:17
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@pnkfelixpnkfelixpnkfelix left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@zackmdaviszackmdavis

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

7 participants

@estebank@rust-highfive@varkor@bors@pnkfelix@zackmdavis@Mark-Simulacrum