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 pull request #85100 from adrian-prantl/163302154

Browse Source 
Add a -debug-module-path frontend option
This commit is contained in:
Adrian Prantl
2025-11-03 12:30:55 -08:00
committed by GitHub
parent 6dbe0cb0da cb4efa0839
commit 457a2d3325
5 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/swift/AST/IRGenOptions.h
View File

@@ -278,6 +278,9 @@ class IRGenOptions {
public:
std::string ModuleName;
/// The path to the main binary swiftmodule for the debug info.
std::string DebugModulePath;
/// The compilation directory for the debug info.
std::string DebugCompilationDir;

6
include/swift/Option/Options.td
View File

@@ -653,6 +653,12 @@ def project_name : Separate<["-"], "project-name">,
def module_name_EQ : Joined<["-"], "module-name=">, Flags<[FrontendOption]>,
Alias<module_name>;
def debug_module_path : Separate<["-"], "debug-module-path">,
Flags<[FrontendOption]>,
HelpText<"Path to this module's binary swiftmodule artifact (required by debug info)">;
def debug_module_path_EQ : Joined<["-"], "debug-module-path=">, Flags<[FrontendOption]>,
Alias<debug_module_path>;
def module_alias : Separate<["-"], "module-alias">,
Flags<[FrontendOption, ModuleInterfaceOption]>,
MetaVarName<"<alias_name=real_name>">,

3
lib/Frontend/CompilerInvocation.cpp
View File

@@ -3462,6 +3462,9 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
A->getAsString(Args), A->getValue());
}
if (const Arg *A = Args.getLastArg(options::OPT_debug_module_path))
Opts.DebugModulePath = A->getValue();
for (auto A : Args.getAllArgValues(options::OPT_file_prefix_map)) {
auto SplitMap = StringRef(A).split('=');
Opts.FilePrefixMap.addMapping(SplitMap.first, SplitMap.second);

8
lib/IRGen/IRGenDebugInfo.cpp
View File

@@ -864,7 +864,7 @@ private:
llvm::DIModule *getOrCreateModule(const void *Key, llvm::DIScope *Parent,
StringRef Name, StringRef IncludePath,
uint64_t Signature = ~1ULL,
StringRef ASTFile = StringRef()) {
StringRef ASTFile = {}) {
// Look in the cache first.
auto Val = DIModuleCache.find(Key);
if (Val != DIModuleCache.end())
@@ -2823,8 +2823,12 @@ IRGenDebugInfoImpl::IRGenDebugInfoImpl(const IRGenOptions &Opts,
// Create a module for the current compile unit.
auto *MDecl = IGM.getSwiftModule();
StringRef Path = Opts.DebugModulePath;
if (Path.empty()) {
llvm::sys::path::remove_filename(SourcePath);
MainModule = getOrCreateModule(MDecl, TheCU, Opts.ModuleName, SourcePath);
Path = SourcePath;
}
MainModule = getOrCreateModule(MDecl, TheCU, Opts.ModuleName, Path);
DBuilder.createImportedModule(MainFile, MainModule, MainFile, 0);
// Macro definitions that were defined by the user with "-Xcc -D" on the

4
test/DebugInfo/ebm_module_path.swift Normal file
View File

@@ -0,0 +1,4 @@
// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -module-name=A -debug-module-path %t/MY_MODULE_PATH.swiftmodule -emit-ir -o - | %FileCheck %s
// CHECK: DIModule(scope: null, name: "A", includePath: "{{.*}}MY_MODULE_PATH.swiftmodule")