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

Merge main into next - 2021-07-16

Browse Source 
Conflicts:
	lib/IRGen/IRGenFunction.cpp
    Take the changes made in #38386
This commit is contained in:
Eric Miotto
2021-07-16 09:15:42 -07:00
parent 5ffa637a1d b6107b4c72
commit 7d12cad37f
32 changed files with 702 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/DependencyScan/ScanDependencies.cpp
View File

@@ -1049,11 +1049,16 @@ identifyMainModuleDependencies(CompilerInstance &instance) {
instance.getASTContext()
.LangOpts.EffectiveLanguageVersion.asAPINotesVersionString())
.str();
// Compute the dependencies of the main module.
auto mainDependencies = ModuleDependencies::forMainSwiftModule(
{// ExtraPCMArgs
"-Xcc", "-target", "-Xcc",
instance.getASTContext().LangOpts.Target.str(), "-Xcc", apinotesVer});
std::vector<StringRef> ExtraPCMArgs = {
"-Xcc", apinotesVer
};
if (!instance.getASTContext().LangOpts.ClangTarget.hasValue())
ExtraPCMArgs.insert(ExtraPCMArgs.begin(),
{"-Xcc", "-target", "-Xcc",
instance.getASTContext().LangOpts.Target.str()});
auto mainDependencies = ModuleDependencies::forMainSwiftModule(ExtraPCMArgs);
// Compute Implicit dependencies of the main module
{