[5.5] Fix two cross-module-optimization bugs #39018
Conversation
…eclaration is created This makes sure that all analysis will get the `notifyAddedOrModifiedFunction` notifications. This fixes a crash in CallerAnalysis, which relies that it's notified for all newly created functions. This is related to following bug reports for cross-module-optimization: https://bugs.swift.org/browse/SR-15048 rdar://81701218 Although I believe that there are more bugs involved which need to be fixed. Unfortunately I don't have a test case for this fix.
…implementationOnly-imported functions The check for implementationOnly imports was already done for types, but it was missing for functions. Fixes a crash when implementationOnly-importing a C module. https://bugs.swift.org/browse/SR-15048 rdar://81701218
|
@swift-ci test |
| // The function is not really de-serialized, but it's important to call | ||
| // `didDeserialize` on every new function. Otherwise some Analysis might miss | ||
| // `notifyAddedOrModifiedFunction` notifications. | ||
| if (Callback) |
There was a problem hiding this comment.
Why is this not in the builder itself? A user should not have to worry about this sort of thing.
There was a problem hiding this comment.
That's how you implemented it 😊
It follows the other patterns in the deserializer.
There was a problem hiding this comment.
Ok. I'll take that. More than 2 weeks = p. That being said, we should consider adding it into the Builder (not in this commit though). I think in the SILOptFunctionBuilder I did this and maybe just didn't get around to doing this with this specific builder.
| @@ -2196,7 +2197,7 @@ canBeUsedForCrossModuleOptimization(NominalTypeDecl *nominal) const { | |||
|
|
|||
| auto &imports = getASTContext().getImportCache(); | |||
| for (auto &desc : results) { | |||
| if (imports.isImportedBy(moduleOfNominal, desc.importedModule)) | |||
| if (imports.isImportedBy(moduleOfCtxt, desc.importedModule)) | |||
There was a problem hiding this comment.
This looks reasonable to me. But I would like someone who understands the import cache to also look at this. I just don't know how it works.
There was a problem hiding this comment.
I added @xymus who also reviewed the original code
AnthonyLatsis
added
🍒 release cherry pick
This is a cherry-pick of two fixes related to cross-module-optimization:
Deserializer: call the deserialization callback when a new function declaration is created #38926
cross-module-optimization: Don't serialize functions which reference implementationOnly-imported functions #38951
https://bugs.swift.org/browse/SR-15048
rdar://81701218