Skip to content

Commit 4693a47

Browse files
Merge pull request #76378 from cachemeifyoucan/eng/PR-135611011
[Modules] Make SubInstance spawn correctly under DirectCC1Mode
2 parents e24f296 + a6c560b commit 4693a47

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

lib/Frontend/ModuleInterfaceLoader.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,9 +1953,13 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
19531953
genericSubInvocation.getFrontendOptions()
19541954
.DependencyScanningSubInvocation = true;
19551955
} else if (LoaderOpts.strictImplicitModuleContext ||
1956-
// Explicit module Interface verification jobs still spawn a sub-instance
1957-
// and we must ensure this sub-instance gets all of the Xcc flags.
1958-
LoaderOpts.disableImplicitSwiftModule) {
1956+
// Explicit module Interface verification jobs still spawn a
1957+
// sub-instance and we must ensure this sub-instance gets all of
1958+
// the Xcc flags.
1959+
LoaderOpts.disableImplicitSwiftModule ||
1960+
// If using direct cc1 argument mode for lldb or typecheck
1961+
// interface, inherit all clang arguments.
1962+
clangImporterOpts.DirectClangCC1ModuleBuild) {
19591963
// If the compiler has been asked to be strict with ensuring downstream
19601964
// dependencies get the parent invocation's context, inherit the extra Clang
19611965
// arguments also. Inherit any clang-specific state of the compilation

0 commit comments

Comments
 (0)