[clang][PCH] Don't try to create standalone debug-info for types marked nodebug #123253
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ed nodebug Fixes one of the crashes uncovered by llvm#118710 `getOrCreateStandaloneType` asserts that a `DIType` was created for the requested type. If the `Decl` was marked `nodebug`, however, we can't generate debug-info for it, so we would previously trigger the assert. For now keep the assertion around and check the `nodebug` at the callsite.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang-modules @llvm/pr-subscribers-clang Author: Michael Buch (Michael137) ChangesFixes one of the crashes uncovered by
Full diff: https://github.com/llvm/llvm-project/pull/123253.diff 2 Files Affected:
diff --git a/clang/lib/CodeGen/ObjectFilePCHContainerWriter.cpp b/clang/lib/CodeGen/ObjectFilePCHContainerWriter.cpp
index 5447b98d7105e0..02635ce235a12b 100644
--- a/clang/lib/CodeGen/ObjectFilePCHContainerWriter.cpp
+++ b/clang/lib/CodeGen/ObjectFilePCHContainerWriter.cpp
@@ -81,6 +81,9 @@ class PCHContainerGenerator : public ASTConsumer {
if (!TD->isCompleteDefinition())
return true;
+ if (D->hasAttr<NoDebugAttr>())
+ return true;
+
QualType QualTy = Ctx.getTypeDeclType(D);
if (!QualTy.isNull() && CanRepresent(QualTy.getTypePtr()))
DI.getOrCreateStandaloneType(QualTy, D->getLocation());
diff --git a/clang/test/Modules/gmodules-nodebug.cpp b/clang/test/Modules/gmodules-nodebug.cpp
new file mode 100644
index 00000000000000..ac987c074f18c9
--- /dev/null
+++ b/clang/test/Modules/gmodules-nodebug.cpp
@@ -0,0 +1,12 @@
+// RUN: %clang_cc1 -std=c++23 -x c++-header -emit-pch -fmodule-format=obj \
+// RUN: -o %t.pch %s \
+// RUN: -mllvm -debug-only=pchcontainer &>%t-pch.ll
+// RUN: cat %t-pch.ll | FileCheck %s
+
+template<class...>
+using __void_t [[gnu::nodebug]] = void;
+
+__void_t<> func() {}
+
+// CHECK: !DICompileUnit
+// CHECK-NOT: __void_t
|
|
@llvm/pr-subscribers-clang-codegen Author: Michael Buch (Michael137) ChangesFixes one of the crashes uncovered by
Full diff: https://github.com/llvm/llvm-project/pull/123253.diff 2 Files Affected:
diff --git a/clang/lib/CodeGen/ObjectFilePCHContainerWriter.cpp b/clang/lib/CodeGen/ObjectFilePCHContainerWriter.cpp
index 5447b98d7105e0..02635ce235a12b 100644
--- a/clang/lib/CodeGen/ObjectFilePCHContainerWriter.cpp
+++ b/clang/lib/CodeGen/ObjectFilePCHContainerWriter.cpp
@@ -81,6 +81,9 @@ class PCHContainerGenerator : public ASTConsumer {
if (!TD->isCompleteDefinition())
return true;
+ if (D->hasAttr<NoDebugAttr>())
+ return true;
+
QualType QualTy = Ctx.getTypeDeclType(D);
if (!QualTy.isNull() && CanRepresent(QualTy.getTypePtr()))
DI.getOrCreateStandaloneType(QualTy, D->getLocation());
diff --git a/clang/test/Modules/gmodules-nodebug.cpp b/clang/test/Modules/gmodules-nodebug.cpp
new file mode 100644
index 00000000000000..ac987c074f18c9
--- /dev/null
+++ b/clang/test/Modules/gmodules-nodebug.cpp
@@ -0,0 +1,12 @@
+// RUN: %clang_cc1 -std=c++23 -x c++-header -emit-pch -fmodule-format=obj \
+// RUN: -o %t.pch %s \
+// RUN: -mllvm -debug-only=pchcontainer &>%t-pch.ll
+// RUN: cat %t-pch.ll | FileCheck %s
+
+template<class...>
+using __void_t [[gnu::nodebug]] = void;
+
+__void_t<> func() {}
+
+// CHECK: !DICompileUnit
+// CHECK-NOT: __void_t
|
Michael137
commented
Jan 16, 2025
| // RUN: -mllvm -debug-only=pchcontainer &>%t-pch.ll | ||
| // RUN: cat %t-pch.ll | FileCheck %s | ||
|
|
||
| template<class...> |
There was a problem hiding this comment.
I just used exactly the template alias that was crashing in the libc++ case. I suppose it doesn't actually have to be a template
adrian-prantl
approved these changes
Jan 16, 2025
| // RUN: -o %t.pch %s \ | ||
| // RUN: -mllvm -debug-only=pchcontainer &>%t-pch.ll | ||
| // RUN: cat %t-pch.ll | FileCheck %s | ||
|
|
There was a problem hiding this comment.
Don't forget the REQUIRE: assertions! (because of -debug-only)
Michael137
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Mar 14, 2025
…ed nodebug (llvm#123253) Fixes one of the crashes uncovered by llvm#118710 `getOrCreateStandaloneType` asserts that a `DIType` was created for the requested type. If the `Decl` was marked `nodebug`, however, we can't generate debug-info for it, so we would previously trigger the assert. For now keep the assertion around and check the `nodebug` at the callsite. (cherry picked from commit 30e276d)
Michael137
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Mar 14, 2025
…ed nodebug (llvm#123253) Fixes one of the crashes uncovered by llvm#118710 `getOrCreateStandaloneType` asserts that a `DIType` was created for the requested type. If the `Decl` was marked `nodebug`, however, we can't generate debug-info for it, so we would previously trigger the assert. For now keep the assertion around and check the `nodebug` at the callsite. (cherry picked from commit 30e276d)
Michael137
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Mar 17, 2025
🍒[clang][PCH] Don't try to create standalone debug-info for types marked nodebug (llvm#123253)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes one of the crashes uncovered by
#118710
getOrCreateStandaloneTypeasserts that aDITypewas created for the requested type. If theDeclwas markednodebug, however, we can't generate debug-info for it, so we would previously trigger the assert. For now keep the assertion around and check thenodebugat the callsite.