File tree Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -545,7 +545,7 @@ class ModuleDecl
545
545
}
546
546
547
547
// / Returns true if the module was rebuilt from a module interface instead
548
- // / of being build from the full source.
548
+ // / of being built from the full source.
549
549
bool isBuiltFromInterface () const {
550
550
return Bits.ModuleDecl .IsBuiltFromInterface ;
551
551
}
Original file line number Diff line number Diff line change @@ -220,8 +220,8 @@ class ClangImporter final : public ClangModuleLoader {
220
220
// / \param path A sequence of (identifier, location) pairs that denote
221
221
// / the dotted module name to load, e.g., AppKit.NSWindow.
222
222
// /
223
- // / \param AllowMemoryCache Enables preserving the loaded module in the
224
- // / in-memory cache for the next loading attempt .
223
+ // / \param AllowMemoryCache Affects only loading serialized Swift modules,
224
+ // / this parameter has no effect in the ClangImporter .
225
225
// /
226
226
// / \returns the module referenced, if it could be loaded. Otherwise,
227
227
// / emits a diagnostic and returns NULL.
Original file line number Diff line number Diff line change @@ -430,8 +430,10 @@ static bool buildModuleFromInterface(CompilerInstance &Instance) {
430
430
Invocation.getFrontendOptions ().RequestedAction !=
431
431
FrontendOptions::ActionType::TypecheckModuleFromInterface &&
432
432
!Invocation.getFrontendOptions ().ExplicitInterfaceBuild ) {
433
- IgnoreAdjacentModules = Instance.getASTContext ().IgnoreAdjacentModules ;
434
- }
433
+ // Only pass down IgnoreAdjacentModules when the parent instance has an
434
+ // ASTContext.
435
+ IgnoreAdjacentModules = Instance.getASTContext ().IgnoreAdjacentModules ;
436
+ }
435
437
436
438
// If an explicit interface build was requested, bypass the creation of a new
437
439
// sub-instance from the interface which will build it in a separate thread,
You can’t perform that action at this time.
0 commit comments