From d4dc1a1166ffacf59762ba7fd00a08d41b1d11f5 Mon Sep 17 00:00:00 2001 From: Alexandre Ganea Date: Tue, 21 May 2019 19:40:28 +0000 Subject: [PATCH] [DebugInfo] Don't emit checksums when compiling a preprocessed CPP Fixes PR41215 Differential Revision: https://reviews.llvm.org/D60283 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@361296 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/SourceLocation.h | 11 +++++++++-- lib/Basic/SourceManager.cpp | 9 +++++++-- lib/CodeGen/CGDebugInfo.cpp | 6 +++++- .../CodeGen/Inputs/debug-info-file-checksum-line.cpp | 9 +++++++++ test/CodeGen/Inputs/debug-info-file-checksum-pre.cpp | 10 ++++++++++ test/CodeGen/debug-info-file-checksum.c | 12 ++++++++++++ 6 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 test/CodeGen/Inputs/debug-info-file-checksum-line.cpp create mode 100644 test/CodeGen/Inputs/debug-info-file-checksum-pre.cpp diff --git a/include/clang/Basic/SourceLocation.h b/include/clang/Basic/SourceLocation.h index ceebdf4822..d6e2f6e6de 100644 --- a/include/clang/Basic/SourceLocation.h +++ b/include/clang/Basic/SourceLocation.h @@ -282,13 +282,15 @@ public: /// You can get a PresumedLoc from a SourceLocation with SourceManager. class PresumedLoc { const char *Filename = nullptr; + FileID ID; unsigned Line, Col; SourceLocation IncludeLoc; public: PresumedLoc() = default; - PresumedLoc(const char *FN, unsigned Ln, unsigned Co, SourceLocation IL) - : Filename(FN), Line(Ln), Col(Co), IncludeLoc(IL) {} + PresumedLoc(const char *FN, FileID FID, unsigned Ln, unsigned Co, + SourceLocation IL) + : Filename(FN), ID(FID), Line(Ln), Col(Co), IncludeLoc(IL) {} /// Return true if this object is invalid or uninitialized. /// @@ -305,6 +307,11 @@ public: return Filename; } + FileID getFileID() const { + assert(isValid()); + return ID; + } + /// Return the presumed line number of this location. /// /// This can be affected by \#line etc. diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index 712cbb0d0e..e62cef7ec5 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -1430,6 +1430,7 @@ PresumedLoc SourceManager::getPresumedLoc(SourceLocation Loc, // To get the source name, first consult the FileEntry (if one exists) // before the MemBuffer as this will avoid unnecessarily paging in the // MemBuffer. + FileID FID = LocInfo.first; StringRef Filename; if (C->OrigEntry) Filename = C->OrigEntry->getName(); @@ -1453,8 +1454,12 @@ PresumedLoc SourceManager::getPresumedLoc(SourceLocation Loc, if (const LineEntry *Entry = LineTable->FindNearestLineEntry(LocInfo.first, LocInfo.second)) { // If the LineEntry indicates a filename, use it. - if (Entry->FilenameID != -1) + if (Entry->FilenameID != -1) { Filename = LineTable->getFilename(Entry->FilenameID); + // The contents of files referenced by #line are not in the + // SourceManager + FID = FileID::get(0); + } // Use the line number specified by the LineEntry. This line number may // be multiple lines down from the line entry. Add the difference in @@ -1473,7 +1478,7 @@ PresumedLoc SourceManager::getPresumedLoc(SourceLocation Loc, } } - return PresumedLoc(Filename.data(), LineNo, ColNo, IncludeLoc); + return PresumedLoc(Filename.data(), FID, LineNo, ColNo, IncludeLoc); } /// Returns whether the PresumedLoc for a given SourceLocation is diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index 4c43c00cd5..f436cab16c 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -422,8 +422,12 @@ llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) { } SmallString<32> Checksum; + + // Compute the checksum if possible. If the location is affected by a #line + // directive that refers to a file, PLoc will have an invalid FileID, and we + // will correctly get no checksum. Optional CSKind = - computeChecksum(SM.getFileID(Loc), Checksum); + computeChecksum(PLoc.getFileID(), Checksum); Optional> CSInfo; if (CSKind) CSInfo.emplace(*CSKind, Checksum); diff --git a/test/CodeGen/Inputs/debug-info-file-checksum-line.cpp b/test/CodeGen/Inputs/debug-info-file-checksum-line.cpp new file mode 100644 index 0000000000..e5fe98263a --- /dev/null +++ b/test/CodeGen/Inputs/debug-info-file-checksum-line.cpp @@ -0,0 +1,9 @@ +int foo(int x) { + return x+1; +} + +#line 100 +void test1() {} + +#line 200 +void test2() {} diff --git a/test/CodeGen/Inputs/debug-info-file-checksum-pre.cpp b/test/CodeGen/Inputs/debug-info-file-checksum-pre.cpp new file mode 100644 index 0000000000..11029e6b7a --- /dev/null +++ b/test/CodeGen/Inputs/debug-info-file-checksum-pre.cpp @@ -0,0 +1,10 @@ +#line 1 "F:\\svn\\clang\\test\\CodeGen\\Inputs\\debug-info-file-checksum.c" +#line 1 "f:\\svn\\clang\\test\\codegen\\inputs\\code-coverage-filter1.h" +void test1() {} +#line 2 "F:\\svn\\clang\\test\\CodeGen\\Inputs\\debug-info-file-checksum.c" +#line 1 "f:\\svn\\clang\\test\\codegen\\inputs\\code-coverage-filter2.h" +void test2() {} +#line 3 "F:\\svn\\clang\\test\\CodeGen\\Inputs\\debug-info-file-checksum.c" +int foo(int x) { + return x+1; +} diff --git a/test/CodeGen/debug-info-file-checksum.c b/test/CodeGen/debug-info-file-checksum.c index d644aac061..273a10b067 100644 --- a/test/CodeGen/debug-info-file-checksum.c +++ b/test/CodeGen/debug-info-file-checksum.c @@ -4,3 +4,15 @@ // Check that "checksum" is created correctly for the compiled file. // CHECK: !DIFile(filename:{{.*}}, directory:{{.*}}, checksumkind: CSK_MD5, checksum: "a3b7d27af071accdeccaa933fc603608") + +// Ensure #line directives (in already pre-processed files) do not emit checksums +// RUN: %clang -emit-llvm -S -g -gcodeview -x c %S/Inputs/debug-info-file-checksum-pre.cpp -o - | FileCheck %s --check-prefix NOCHECKSUM + +// NOCHECKSUM: !DIFile(filename: "{{.*}}code-coverage-filter1.h", directory: "{{[^"]*}}") +// NOCHECKSUM: !DIFile(filename: "{{.*}}code-coverage-filter2.h", directory: "{{[^"]*}}") +// NOCHECKSUM: !DIFile(filename: "{{.*}}debug-info-file-checksum.c", directory: "{{[^"]*}}") + +// Ensure #line directives without name do emit checksums +// RUN: %clang -emit-llvm -S -g -gcodeview -x c %S/Inputs/debug-info-file-checksum-line.cpp -o - | FileCheck %s --check-prefix CHECKSUM + +// CHECKSUM: !DIFile(filename: "{{.*}}debug-info-file-checksum-line.cpp", directory:{{.*}}, checksumkind: CSK_MD5, checksum: "7b568574d0e3c56c28e5e0234d1f4a06") -- 2.40.0