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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-07-30 21:21:37 -07:00
parent e5f4c9ea97 c3c032bdbc
commit 66ff05271c
5 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/swift/Frontend/FrontendOptions.h
View File

@@ -250,6 +250,9 @@ public:
/// Should we enable the dependency verifier for all primary files known to this frontend? /// Should we enable the dependency verifier for all primary files known to this frontend?
bool EnableIncrementalDependencyVerifier = false; bool EnableIncrementalDependencyVerifier = false;
/// The path of the swift-frontend executable.
std::string MainExecutablePath;
/// The directory path we should use when print #include for the bridging header. /// The directory path we should use when print #include for the bridging header.
/// By default, we include ImplicitObjCHeaderPath directly. /// By default, we include ImplicitObjCHeaderPath directly.
llvm::Optional<std::string> BridgingHeaderDirForPrint; llvm::Optional<std::string> BridgingHeaderDirForPrint;

4
include/swift/Frontend/ModuleInterfaceLoader.h
View File

@@ -266,10 +266,12 @@ struct ModuleInterfaceLoaderOptions {
bool remarkOnRebuildFromInterface = false; bool remarkOnRebuildFromInterface = false;
bool disableInterfaceLock = false; bool disableInterfaceLock = false;
bool disableImplicitSwiftModule = false; bool disableImplicitSwiftModule = false;
std::string mainExecutablePath;
ModuleInterfaceLoaderOptions(const FrontendOptions &Opts): ModuleInterfaceLoaderOptions(const FrontendOptions &Opts):
remarkOnRebuildFromInterface(Opts.RemarkOnRebuildFromModuleInterface), remarkOnRebuildFromInterface(Opts.RemarkOnRebuildFromModuleInterface),
disableInterfaceLock(Opts.DisableInterfaceFileLock), disableInterfaceLock(Opts.DisableInterfaceFileLock),
disableImplicitSwiftModule(Opts.DisableImplicitModules) {} disableImplicitSwiftModule(Opts.DisableImplicitModules),
mainExecutablePath(Opts.MainExecutablePath) {}
ModuleInterfaceLoaderOptions() = default; ModuleInterfaceLoaderOptions() = default;
}; };

1
lib/Frontend/CompilerInvocation.cpp
View File

@@ -52,6 +52,7 @@ void CompilerInvocation::computeRuntimeResourcePathFromExecutablePath(
} }
void CompilerInvocation::setMainExecutablePath(StringRef Path) { void CompilerInvocation::setMainExecutablePath(StringRef Path) {
FrontendOpts.MainExecutablePath = Path.str();
llvm::SmallString<128> LibPath; llvm::SmallString<128> LibPath;
computeRuntimeResourcePathFromExecutablePath(Path, LibPath); computeRuntimeResourcePathFromExecutablePath(Path, LibPath);
setRuntimeResourcePath(LibPath.str()); setRuntimeResourcePath(LibPath.str());

1
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -1268,6 +1268,7 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
StringRef prebuiltCachePath, StringRef prebuiltCachePath,
bool serializeDependencyHashes, bool serializeDependencyHashes,
bool trackSystemDependencies): SM(SM), Diags(Diags), ArgSaver(Allocator) { bool trackSystemDependencies): SM(SM), Diags(Diags), ArgSaver(Allocator) {
subInvocation.setMainExecutablePath(LoaderOpts.mainExecutablePath);
inheritOptionsForBuildingInterface(searchPathOpts, langOpts); inheritOptionsForBuildingInterface(searchPathOpts, langOpts);
// Configure front-end input. // Configure front-end input.
auto &SubFEOpts = subInvocation.getFrontendOptions(); auto &SubFEOpts = subInvocation.getFrontendOptions();

1
test/Runtime/linux-fatal-backtrace.swift
View File

@@ -1,3 +1,4 @@
// REQUIRES: rdar66283479
// RUN: %empty-directory(%t) // RUN: %empty-directory(%t)
// RUN: %target-build-swift %s -o %t/a.out // RUN: %target-build-swift %s -o %t/a.out
// RUN: %{python} %S/../Inputs/not.py "%target-run %t/a.out" 2>&1 | %{lldb-python} %utils/symbolicate-linux-fatal %t/a.out - | %{python} %utils/backtrace-check -u // RUN: %{python} %S/../Inputs/not.py "%target-run %t/a.out" 2>&1 | %{lldb-python} %utils/symbolicate-linux-fatal %t/a.out - | %{python} %utils/backtrace-check -u