Author: Alex Langford Date: 2022-10-04T11:25:43-07:00 New Revision: 266ec801fb23f9f5f1d61ca9466e0805fbdb78a7
URL: https://github.com/llvm/llvm-project/commit/266ec801fb23f9f5f1d61ca9466e0805fbdb78a7 DIFF: https://github.com/llvm/llvm-project/commit/266ec801fb23f9f5f1d61ca9466e0805fbdb78a7.diff LOG: [clang][DebugInfo] Respect fmodule-file-home-is-cwd in skeleton CUs for clang modules When -fmodule-file-home-is-cwd and the path to the PCM is relative, we shouldn't assume that the path to the PCM is relative to the modulemap that produced it. To respect the option -fmodule-file-home-is-cwd, we should assume the path is relative to the current working directory. Reviewed By: rmaz Differential Revision: https://reviews.llvm.org/D134911 Added: Modified: clang/lib/CodeGen/CGDebugInfo.cpp clang/test/Modules/module-file-home-is-cwd.m Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 35432fa98e590..aa02821aa971b 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -2768,8 +2768,12 @@ llvm::DIModule *CGDebugInfo::getOrCreateModuleRef(ASTSourceDescriptor Mod, llvm::DIBuilder DIB(CGM.getModule()); SmallString<0> PCM; - if (!llvm::sys::path::is_absolute(Mod.getASTFile())) - PCM = Mod.getPath(); + if (!llvm::sys::path::is_absolute(Mod.getASTFile())) { + if (CGM.getHeaderSearchOpts().ModuleFileHomeIsCwd) + PCM = getCurrentDirname(); + else + PCM = Mod.getPath(); + } llvm::sys::path::append(PCM, Mod.getASTFile()); DIB.createCompileUnit( TheCU->getSourceLanguage(), diff --git a/clang/test/Modules/module-file-home-is-cwd.m b/clang/test/Modules/module-file-home-is-cwd.m index 4f79c5abd9ccd..57f8856406484 100644 --- a/clang/test/Modules/module-file-home-is-cwd.m +++ b/clang/test/Modules/module-file-home-is-cwd.m @@ -1,8 +1,22 @@ // RUN: cd %S -// RUN: %clang_cc1 -fmodules -fno-implicit-modules -fmodule-file-home-is-cwd -fmodule-name=libA -emit-module Inputs/normal-module-map/module.map -o %t/mod.pcm +// RUN: %clang_cc1 -x objective-c -fmodules -fno-implicit-modules \ +// RUN: -fmodule-file-home-is-cwd -fmodule-name=libA -emit-module \ +// RUN: -fmodules-embed-all-files %S/Inputs/normal-module-map/module.map \ +// RUN: -o %t/mod.pcm // RUN: llvm-bcanalyzer --dump --disable-histogram %t/mod.pcm | FileCheck %s // CHECK: <INPUT_FILE {{.*}}/> blob data = 'Inputs{{/|\\}}normal-module-map{{/|\\}}module.map' // CHECK: <INPUT_FILE {{.*}}/> blob data = 'Inputs{{/|\\}}normal-module-map{{/|\\}}a2.h' // CHECK: <INPUT_FILE {{.*}}/> blob data = 'Inputs{{/|\\}}normal-module-map{{/|\\}}a1.h' // CHECK-NOT: MODULE_DIRECTORY + +@import libA; + +// RUN: cd %t +// RUN: %clang_cc1 -x objective-c -fmodules -fno-implicit-modules -debug-info-kind=limited \ +// RUN: -debugger-tuning=lldb -dwarf-ext-refs -fmodule-file-home-is-cwd \ +// RUN: -fmodule-map-file=%S/Inputs/normal-module-map/module.map \ +// RUN: -fmodule-file=libA=mod.pcm -emit-llvm -o %t-mod.ll %s +// RUN: cat %t-mod.ll | FileCheck %s --check-prefix=SKELETON + +// SKELETON: !DICompileUnit(language: DW_LANG_ObjC, {{.*}}, splitDebugFilename: "mod.pcm" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits