Avoid reseting the thread local interner at the beginning of `phase_1_parse_input` by jseyfried · Pull Request #34856 · rust-lang/rust

jseyfried · 2016-07-16T18:30:39Z

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 · 2016-07-16T18:32:53Z

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

nrc · 2016-07-17T20:54:14Z

@bors: r+

bors · 2016-07-17T20:54:15Z

📌 Commit d008b3f has been approved by nrc

bors · 2016-07-17T22:09:54Z

⌛ Testing commit d008b3f with merge 5f01508...

bors · 2016-07-17T23:33:45Z

💔 Test failed - auto-mac-64-opt

bors · 2016-07-18T08:41:34Z

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

remove the thread local state reset at the beginning of `phase_1_parse_input`.

jseyfried · 2016-07-18T12:02:03Z

@bors r=nrc

bors · 2016-07-18T12:02:05Z

📌 Commit 0042c1a has been approved by nrc

bors · 2016-07-18T17:05:41Z

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

bors · 2016-07-18T18:29:24Z

💔 Test failed - auto-mac-64-opt

jseyfried · 2016-07-22T16:59:15Z

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

nikomatsakis · 2016-07-25T20:24:56Z

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

nikomatsakis · 2016-07-25T20:37:17Z

@jseyfried r=me for that

jseyfried · 2016-07-25T20:44:40Z

@bors r=nrc

bors · 2016-07-25T20:44:42Z

📌 Commit a279f2f has been approved by nrc

bors · 2016-07-25T21:45:11Z

⌛ Testing commit a279f2f with merge fa1f199...

bors · 2016-07-25T21:49:04Z

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

alexcrichton · 2016-07-25T22:15:04Z

@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 · 2016-07-26T10:06:17Z

⌛ Testing commit a279f2f with merge d588189...

bors · 2016-07-26T10:09:04Z

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

alexcrichton · 2016-07-26T17:20:34Z

@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 · 2016-07-27T17:16:36Z

⌛ Testing commit a279f2f with merge 29abe5e...

@nrc

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 · 2016-07-27T21:28:04Z

☀️ 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...

rust-highfive assigned nrc Jul 16, 2016

jseyfried mentioned this pull request Jul 16, 2016
Reset the thread local state between compiles. murarth/rusti#83
Closed

bors mentioned this pull request Jul 17, 2016
Improve {String,Vec}::from_raw_parts documentation #34884
Merged

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 force-pushed the refactor_reset_tls branch from d008b3f to 0042c1aCompare July 18, 2016 10:11

rust-highfive assigned nikomatsakis and unassigned nrc Jul 22, 2016

nikomatsakis reviewed Jul 25, 2016
View reviewed changes

jseyfried mentioned this pull request Jul 25, 2016
diagnostics: The compile-fail/lifetime-inference-give-expl-lifetime-param.rs test is unreliable #35038
Closed

Weaken test compile-fail/lifetime-inference-give-expl-lifetime-param.
a279f2f

jseyfried force-pushed the refactor_reset_tls branch from 66fc469 to a279f2fCompare July 25, 2016 20:34

bors merged commit a279f2f into rust-lang:masterJul 27, 2016

jseyfried deleted the refactor_reset_tls branch October 16, 2016 09:31

Uh oh!

Uh oh!

Conversation

jseyfried commented Jul 16, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jseyfried commented Jul 16, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nrc commented Jul 17, 2016

Uh oh!

bors commented Jul 17, 2016

Uh oh!

bors commented Jul 17, 2016

Uh oh!

bors commented Jul 17, 2016

Uh oh!

bors commented Jul 18, 2016

Uh oh!

jseyfried commented Jul 18, 2016

Uh oh!

bors commented Jul 18, 2016

Uh oh!

bors commented Jul 18, 2016

Uh oh!

bors commented Jul 18, 2016

Uh oh!

jseyfried commented Jul 22, 2016

Uh oh!

nikomatsakisJul 25, 2016

Choose a reason for hiding this comment

Uh oh!

jseyfriedJul 25, 2016

Choose a reason for hiding this comment

Uh oh!

nikomatsakis commented Jul 25, 2016

Uh oh!

jseyfried commented Jul 25, 2016

Uh oh!

bors commented Jul 25, 2016

Uh oh!

bors commented Jul 25, 2016

Uh oh!

bors commented Jul 25, 2016

Uh oh!

alexcrichton commented Jul 25, 2016

Uh oh!

bors commented Jul 26, 2016

Uh oh!

bors commented Jul 26, 2016

Uh oh!

alexcrichton commented Jul 26, 2016

Uh oh!

bors commented Jul 27, 2016

Uh oh!

bors commented Jul 27, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jseyfried commented Jul 16, 2016•
edited
Loading

jseyfried commented Jul 16, 2016•
edited
Loading