Merge remote-tracking branch 'origin/main' into rebranch

This commit is contained in:
swift-ci
2022-06-16 21:53:49 -07:00
4 changed files with 3 additions and 9 deletions

View File

@@ -806,8 +806,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
Opts.ClangTarget = llvm::Triple(A->getValue());
}
Opts.EnableCXXInterop |= Args.hasArg(OPT_enable_experimental_cxx_interop) ||
Args.hasArg(OPT_enable_cxx_interop);
Opts.EnableCXXInterop |= Args.hasArg(OPT_enable_experimental_cxx_interop);
Opts.EnableObjCInterop =
Args.hasFlag(OPT_enable_objc_interop, OPT_disable_objc_interop,
Target.isOSDarwin());