IRGen: Ensure collocation of relative pointers in resilient witness tables #15793
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
…ables Ensure collocation by recording the dependence between witness table and witness before functions are processed. Debug info of inlined function scopes can reference the witness and will cause the wrong IRGenModule to be associated before lazy witness tables are processed. No, I am not sure that this is the only instance of this but the same solution can apply to other instances if we find them. rdar://39116991
|
@swift-ci Please test |
slavapestov
reviewed
Apr 6, 2018
| @@ -1832,10 +1832,6 @@ static llvm::Constant *emitResilientWitnessTable(IRGenModule &IGM, | |||
| SILFunction *Func = entry.getMethodWitness().Witness; | |||
| llvm::Constant *witness; | |||
| if (Func) { | |||
| // Force the thunk to be emitted in the current translation unit | |||
| // when in multi-threaded mode. | |||
| IGM.IRGen.forceLocalEmitOfLazyFunction(Func); | |||
There was a problem hiding this comment.
I think this was the only usage of forceLocalEmitOfLazyFunction so you can remove it
There was a problem hiding this comment.
I now use it in ensureRelativeSymbolCollocation.
aschwaighofer
commented
Apr 6, 2018
| @@ -1832,10 +1832,6 @@ static llvm::Constant *emitResilientWitnessTable(IRGenModule &IGM, | |||
| SILFunction *Func = entry.getMethodWitness().Witness; | |||
| llvm::Constant *witness; | |||
| if (Func) { | |||
| // Force the thunk to be emitted in the current translation unit | |||
| // when in multi-threaded mode. | |||
| IGM.IRGen.forceLocalEmitOfLazyFunction(Func); | |||
There was a problem hiding this comment.
I now use it in ensureRelativeSymbolCollocation.
| continue; | ||
| auto *witness = entry.getMethodWitness().Witness; | ||
| if (witness) | ||
| IRGen.forceLocalEmitOfLazyFunction(witness); |
There was a problem hiding this comment.
Using IRGen.forceLocalEmitOfLazyFunction here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Ensure collocation by recording the dependence between witness table and
witness before functions are processed. Debug info of inlined function
scopes can reference the witness and will cause the wrong IRGenModule to
be associated before lazy witness tables are processed.
No, I am not sure that this is the only instance of this but the same
solution can apply to other instances if we find them.
rdar://39116991