Consolidate local_data implementations, and cleanup #8447
Conversation
|
r? @brson This looks fine to me but I ought to kick it over to you to make sure. |
| // but somehow this works. I have no idea what's going | ||
| // on but this seems to make things magically work. FML. | ||
| self.storage = LocalStorage(ptr::null(), None); | ||
| self.storage.take(); |
There was a problem hiding this comment.
@brson, you'd probably be interested in this particular modification
There was a problem hiding this comment.
afaics this doesn't do anything to address the deleted comment - it's the same workaround stated in a different way. Is that right?
There was a problem hiding this comment.
Can you add back the comment?
The problem is that TLS is deinitiialized, then the box annihilator runs dtors that access TLS, presumably reinitializing TLS after it's already been destroyed. This line should not be necessary at all, and the way it works isn't clear (Who destructs TLS after the annihilator re-constructs it?)
There was a problem hiding this comment.
I talked a bit about this on IRC, but I agree that this should be left in.
For a "solution", would you be opposed to forbidding TLS accesses once it's being destroyed? Instead of being Option it could be something like Uninitialized | Initialized(obj) | Destroying. I'm not really sure how a failure could be done, I imagine that the normal fail! macro would cause problems.
This cyclic dependency between annihilation and TLS is tricky...
|
@alexcrichton Needs a rebase. |
| // TLS, or possibly some destructors for those objects being | ||
| // annihilated invoke TLS. Sadly these two operations seemed to | ||
| // be intertwined, and miraculously work for now... | ||
| self.storage.take(); |
There was a problem hiding this comment.
r? @brson, I added some of my own comments here, the existing comment didn't quite make sense to me without some extra explanation.
This moves all local_data stuff into the `local_data` module and only that module alone. It also removes a fair amount of "super-unsafe" code in favor of just vanilla code generated by the compiler at the same time. Closes rust-lang#8113
This moves all local_data stuff into the `local_data` module and only that module alone. It also removes a fair amount of "super-unsafe" code in favor of just vanilla code generated by the compiler at the same time. Closes #8113
This moves all local_data stuff into the
local_datamodule and only thatmodule alone. It also removes a fair amount of "super-unsafe" code in favor of
just vanilla code generated by the compiler at the same time.
Closes #8113