averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use correct associated context for SIL parsing

Browse Source 
Adjust `SILModule::createEmptyModule` to accept a
FileUnit or ModuleDecl, and pass the corresponding
context for SIL generation and parsing. This
change means that SIL parsing will now correctly
use a SourceFile associated context when in
single-file mode.
This commit is contained in:
Hamish Knight
2020-05-10 19:56:13 -07:00
parent 27ed8b0b43
commit 574dd2bbf9
5 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/SIL/IR/SILModule.cpp
View File

@@ -92,13 +92,17 @@ class SILModule::SerializationCallback final
}
};
SILModule::SILModule(ModuleDecl *SwiftModule, TypeConverter &TC,
const SILOptions &Options, const DeclContext *associatedDC)
: TheSwiftModule(SwiftModule),
AssociatedDeclContext(associatedDC),
Stage(SILStage::Raw), Options(Options), serialized(false),
SILModule::SILModule(llvm::PointerUnion<FileUnit *, ModuleDecl *> context,
Lowering::TypeConverter &TC, const SILOptions &Options)
: Stage(SILStage::Raw), Options(Options), serialized(false),
SerializeSILAction(), Types(TC) {
assert(AssociatedDeclContext);
assert(!context.isNull());
if (auto *file = context.dyn_cast<FileUnit *>()) {
AssociatedDeclContext = file;
} else {
AssociatedDeclContext = context.get<ModuleDecl *>();
}
TheSwiftModule = AssociatedDeclContext->getParentModule();
// We always add the base SILModule serialization callback.
std::unique_ptr<DeserializationNotificationHandler> callback(
@@ -123,10 +127,10 @@ SILModule::~SILModule() {
}
}
std::unique_ptr<SILModule>
SILModule::createEmptyModule(ModuleDecl *M, TypeConverter &TC,
const SILOptions &Options) {
return std::unique_ptr<SILModule>(new SILModule(M, TC, Options, M));
std::unique_ptr<SILModule> SILModule::createEmptyModule(
llvm::PointerUnion<FileUnit *, ModuleDecl *> context,
Lowering::TypeConverter &TC, const SILOptions &Options) {
return std::unique_ptr<SILModule>(new SILModule(context, TC, Options));
}
ASTContext &SILModule::getASTContext() const {