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

Avoid reseting the thread local interner at the beginning of phase_1_parse_input #34856

Merged
merged 2 commits into from
Jul 27, 2016
Merged

Avoid reseting the thread local interner at the beginning of phase_1_parse_input #34856

merged 2 commits into from
Jul 27, 2016

Conversation

jseyfried
Copy link
Contributor

@jseyfried jseyfried commented Jul 16, 2016 •
edited
Loading

The thread local interner is used before phase_1_parse_input to create InternedStrings, which currently wrap Rc<String>s. Once InternedString is refactored to be an interned string id (like Name), resetting will invalidate everything that was interned before phase_1_parse_input.

The resets were only useful for the rusti project, which can now use driver::reset_thread_local_state.

r? @nrc

@jseyfried jseyfried mentioned this pull request Jul 16, 2016
Closed
@jseyfried
Copy link
Contributor Author

jseyfried commented Jul 16, 2016 •
edited
Loading

cc @cgswords @murarth
c.f. murarth/rusti#83

@nrc
Copy link
Member

nrc commented Jul 17, 2016

@bors: r+

@bors
Copy link
Collaborator

bors commented Jul 17, 2016

📌 Commit d008b3f has been approved by nrc

@bors
Copy link
Collaborator

bors commented Jul 17, 2016

⌛ Testing commit d008b3f with merge 5f01508...

@bors bors mentioned this pull request Jul 17, 2016
Merged
@bors
Copy link
Collaborator

bors commented Jul 17, 2016

💔 Test failed - auto-mac-64-opt

@bors
Copy link
Collaborator

bors commented Jul 18, 2016

☔ The latest upstream changes (presumably #34860) made this pull request unmergeable. Please resolve the merge conflicts.

@jseyfried
Add librustc_driver::driver::reset_thread_local_state and
0042c1a 
remove the thread local state reset at the beginning of `phase_1_parse_input`.
@jseyfried jseyfried force-pushed the refactor_reset_tls branch from d008b3f to 0042c1a Compare July 18, 2016 10:11
@jseyfried
Copy link
Contributor Author

@bors r=nrc

@bors
Copy link
Collaborator

bors commented Jul 18, 2016

📌 Commit 0042c1a has been approved by nrc

@bors
Copy link
Collaborator

bors commented Jul 18, 2016

⌛ Testing commit 0042c1a with merge 26fdb8a...

@bors
Copy link
Collaborator

bors commented Jul 18, 2016

💔 Test failed - auto-mac-64-opt

@jseyfried
Copy link
Contributor Author

I weakened the test that was causing problems on Mac and added a FIXME -- r? @nikomatsakis

@rust-highfive rust-highfive assigned nikomatsakis and unassigned nrc Jul 22, 2016
nikomatsakis
nikomatsakis reviewed Jul 25, 2016
View reviewed changes
src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs
@@ -49,7 +49,8 @@ struct Baz<'x> {

impl<'a> Baz<'a> {
fn baz2<'b>(&self, x: &isize) -> (&'b isize, &'b isize) {
//~^ HELP consider using an explicit lifetime parameter as shown: fn baz2<'b>(&self, x: &'a isize) -> (&'a isize, &'a isize)
//~^ HELP consider using an explicit lifetime parameter as shown: fn baz2<'b>(&self, x: &'
// FIXME #34856: The above suggestion is different on Linux and Mac.
Copy link
Contributor

Choose a reason for hiding this comment

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

can you open an issue about the fact that this test is unrealiable and put the FIXME with that issue number?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@jseyfried jseyfried mentioned this pull request Jul 25, 2016
Closed
@jseyfried jseyfried force-pushed the refactor_reset_tls branch from 66fc469 to a279f2f Compare July 25, 2016 20:34
@nikomatsakis
Copy link
Contributor

@jseyfried r=me for that

@jseyfried
Copy link
Contributor Author

@bors r=nrc

@bors
Copy link
Collaborator

bors commented Jul 25, 2016

📌 Commit a279f2f has been approved by nrc

@bors
Copy link
Collaborator

bors commented Jul 25, 2016

⌛ Testing commit a279f2f with merge fa1f199...

@bors
Copy link
Collaborator

bors commented Jul 25, 2016

💔 Test failed - auto-win-gnu-32-opt

@alexcrichton
Copy link
Member

@bors: retry

On Mon, Jul 25, 2016 at 2:49 PM, bors notifications@github.com wrote:

💔 Test failed - auto-win-gnu-32-opt
https://buildbot.rust-lang.org/builders/auto-win-gnu-32-opt/builds/5068

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#34856 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95DLMO334H2qZ9flyFUDybi54u7Jfks5qZS9SgaJpZM4JOEWv
.

@bors
Copy link
Collaborator

bors commented Jul 26, 2016

⌛ Testing commit a279f2f with merge d588189...

@bors
Copy link
Collaborator

bors commented Jul 26, 2016

💔 Test failed - auto-win-msvc-64-opt

@alexcrichton
Copy link
Member

@bors: retry

On Tue, Jul 26, 2016 at 3:09 AM, bors notifications@github.com wrote:

💔 Test failed - auto-win-msvc-64-opt
https://buildbot.rust-lang.org/builders/auto-win-msvc-64-opt/builds/5066

—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#34856 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95LKhRzSDovZP86cb7uiQta-D4G8yks5qZdzDgaJpZM4JOEWv
.

@bors
Copy link
Collaborator

bors commented Jul 27, 2016

⌛ Testing commit a279f2f with merge 29abe5e...

bors added a commit that referenced this pull request Jul 27, 2016
@bors
Auto merge of #34856 - jseyfried:refactor_reset_tls, r=nrc
29abe5e 
Avoid reseting the thread local interner at the beginning of `phase_1_parse_input`

The thread local interner is used before `phase_1_parse_input` to create `InternedString`s, which currently wrap `Rc<String>`s. Once `InternedString` is refactored to be an interned string id (like `Name`), resetting will invalidate everything that was interned before `phase_1_parse_input`.

The resets were only useful for the `rusti` project, which can now use `driver::reset_thread_local_state`.

r? @nrc
@bors
Copy link
Collaborator

bors commented Jul 27, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild
Approved by: nrc
Pushing 29abe5e to master...

@bors bors merged commit a279f2f into rust-lang:master Jul 27, 2016
@jseyfried jseyfried deleted the refactor_reset_tls branch October 16, 2016 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jseyfried @nrc @bors @nikomatsakis @alexcrichton