https://github.com/ykhatav updated
https://github.com/llvm/llvm-project/pull/146729
>From 4097be5501d17ad6dda68404c086e6419d863f25 Mon Sep 17 00:00:00 2001
From: "Khatavkar, Yashasvi" <yashasvi.khatav...@intel.com>
Date: Wed, 2 Jul 2025 08:23:14 -0700
Subject: [PATCH 1/7] Fix scoping of dependent typedefs
---
clang/lib/CodeGen/CGDebugInfo.cpp | 12 ++++++++++--
.../dependent-template-type-scope.cpp | 18 ++++++++++++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 clang/test/CodeGenCXX/dependent-template-type-scope.cpp
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index 994bdbdae860f..1ee6f52efda6a 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -4183,9 +4183,17 @@ llvm::DICompositeType
*CGDebugInfo::CreateLimitedType(const RecordType *Ty) {
llvm::MDNode::replaceWithDistinct(llvm::TempDICompositeType(RealDecl));
break;
}
-
- RegionMap[RD].reset(RealDecl);
+ auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(Ty->getDecl());
+ if(CTSD) {
+ CXXRecordDecl *TemplateDecl =
+ CTSD->getSpecializedTemplate()->getTemplatedDecl();
+ RegionMap[TemplateDecl].reset(RealDecl);
+ TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
+ }
+ else {
+ RegionMap[Ty->getDecl()].reset(RealDecl);
TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
+}
if (const auto *TSpecial = dyn_cast<ClassTemplateSpecializationDecl>(RD))
DBuilder.replaceArrays(RealDecl, llvm::DINodeArray(),
diff --git a/clang/test/CodeGenCXX/dependent-template-type-scope.cpp
b/clang/test/CodeGenCXX/dependent-template-type-scope.cpp
new file mode 100644
index 0000000000000..3b2e57b700936
--- /dev/null
+++ b/clang/test/CodeGenCXX/dependent-template-type-scope.cpp
@@ -0,0 +1,18 @@
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm
-debug-info-kind=standalone -o - %s | FileCheck %s
+
+struct X {
+ typedef int inside;
+ inside i;
+};
+
+template <typename T = int>
+struct Y {
+ typedef int outside;
+ outside o;
+};
+
+X x;
+Y<> y;
+
+// CHECK: ![[Y:.*]] = distinct !DICompositeType(tag: DW_TAG_structure_type,
name: "Y<int>", {{.*}}identifier: "_ZTS1YIiE")
+// CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "outside", scope: ![[Y]],
>From 75205d1cd03b09575c29839a11d1de2f8b94d687 Mon Sep 17 00:00:00 2001
From: "Khatavkar, Yashasvi" <yashasvi.khatav...@intel.com>
Date: Wed, 2 Jul 2025 08:24:26 -0700
Subject: [PATCH 2/7] Apply clang-format
---
clang/lib/CodeGen/CGDebugInfo.cpp | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index 1ee6f52efda6a..d9b5935f7bb7c 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -4183,17 +4183,16 @@ llvm::DICompositeType
*CGDebugInfo::CreateLimitedType(const RecordType *Ty) {
llvm::MDNode::replaceWithDistinct(llvm::TempDICompositeType(RealDecl));
break;
}
- auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(Ty->getDecl());
- if(CTSD) {
- CXXRecordDecl *TemplateDecl =
- CTSD->getSpecializedTemplate()->getTemplatedDecl();
- RegionMap[TemplateDecl].reset(RealDecl);
- TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
- }
- else {
- RegionMap[Ty->getDecl()].reset(RealDecl);
- TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
-}
+ auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(Ty->getDecl());
+ if (CTSD) {
+ CXXRecordDecl *TemplateDecl =
+ CTSD->getSpecializedTemplate()->getTemplatedDecl();
+ RegionMap[TemplateDecl].reset(RealDecl);
+ TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
+ } else {
+ RegionMap[Ty->getDecl()].reset(RealDecl);
+ TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
+ }
if (const auto *TSpecial = dyn_cast<ClassTemplateSpecializationDecl>(RD))
DBuilder.replaceArrays(RealDecl, llvm::DINodeArray(),
>From c23cba5234be63de7901c12751f256b870cbaf2c Mon Sep 17 00:00:00 2001
From: "Khatavkar, Yashasvi" <yashasvi.khatav...@intel.com>
Date: Thu, 10 Jul 2025 06:28:49 -0700
Subject: [PATCH 3/7] address review comments
---
clang/lib/CodeGen/CGDebugInfo.cpp | 3 +--
clang/test/CodeGenCXX/dependent-template-type-scope.cpp | 6 ------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index d9b5935f7bb7c..1dc12d705b2cf 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -4188,11 +4188,10 @@ llvm::DICompositeType
*CGDebugInfo::CreateLimitedType(const RecordType *Ty) {
CXXRecordDecl *TemplateDecl =
CTSD->getSpecializedTemplate()->getTemplatedDecl();
RegionMap[TemplateDecl].reset(RealDecl);
- TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
} else {
RegionMap[Ty->getDecl()].reset(RealDecl);
- TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
}
+ TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
if (const auto *TSpecial = dyn_cast<ClassTemplateSpecializationDecl>(RD))
DBuilder.replaceArrays(RealDecl, llvm::DINodeArray(),
diff --git a/clang/test/CodeGenCXX/dependent-template-type-scope.cpp
b/clang/test/CodeGenCXX/dependent-template-type-scope.cpp
index 3b2e57b700936..25a4d8741b01e 100644
--- a/clang/test/CodeGenCXX/dependent-template-type-scope.cpp
+++ b/clang/test/CodeGenCXX/dependent-template-type-scope.cpp
@@ -1,17 +1,11 @@
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm
-debug-info-kind=standalone -o - %s | FileCheck %s
-struct X {
- typedef int inside;
- inside i;
-};
-
template <typename T = int>
struct Y {
typedef int outside;
outside o;
};
-X x;
Y<> y;
// CHECK: ![[Y:.*]] = distinct !DICompositeType(tag: DW_TAG_structure_type,
name: "Y<int>", {{.*}}identifier: "_ZTS1YIiE")
>From 6648c570d32b779343ebcef38fe2f9ae39cc2355 Mon Sep 17 00:00:00 2001
From: "Khatavkar, Yashasvi" <yashasvi.khatav...@intel.com>
Date: Wed, 16 Jul 2025 10:44:34 -0700
Subject: [PATCH 4/7] Address review comments
---
clang/docs/ReleaseNotes.rst | 85 +++++++++++++++++++++++++++++++
clang/lib/CodeGen/CGDebugInfo.cpp | 3 +-
2 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index e23b7a1267ac2..608318d86b705 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -180,6 +180,7 @@ Improvements to Coverage Mapping
Bug Fixes in This Version
-------------------------
+
- Fix a crash when marco name is empty in ``#pragma push_macro("")`` or
``#pragma pop_macro("")``. (#GH149762).
- `-Wunreachable-code`` now diagnoses tautological or contradictory
@@ -187,6 +188,90 @@ Bug Fixes in This Version
targets that treat ``_Float16``/``__fp16`` as native scalar types. Previously
the warning was silently lost because the operands differed only by an
implicit
cast chain. (#GH149967).
+- Clang now outputs correct values when #embed data contains bytes with
negative
+ signed char values (#GH102798).
+- Fixed a crash when merging named enumerations in modules (#GH114240).
+- Fixed rejects-valid problem when #embed appears in std::initializer_list or
+ when it can affect template argument deduction (#GH122306).
+- Fix crash on code completion of function calls involving partial order of
function templates
+ (#GH125500).
+- Fixed clang crash when #embed data does not fit into an array
+ (#GH128987).
+- Non-local variable and non-variable declarations in the first clause of a
``for`` loop in C are no longer incorrectly
+ considered an error in C23 mode and are allowed as an extension in earlier
language modes.
+
+- Remove the ``static`` specifier for the value of ``_FUNCTION_`` for static
functions, in MSVC compatibility mode.
+- Fixed a modules crash where exception specifications were not propagated
properly (#GH121245, relanded in #GH129982)
+- Fixed a problematic case with recursive deserialization within
``FinishedDeserializing()`` where
+ ``PassInterestingDeclsToConsumer()`` was called before the declarations were
safe to be passed. (#GH129982)
+- Fixed a modules crash where an explicit Constructor was deserialized.
(#GH132794)
+- Defining an integer literal suffix (e.g., ``LL``) before including
+ ``<stdint.h>`` in a freestanding build no longer causes invalid token pasting
+ when using the ``INTn_C`` macros. (#GH85995)
+- Fixed an assertion failure in the expansion of builtin macros like
``__has_embed()`` with line breaks before the
+ closing paren. (#GH133574)
+- Fixed a crash in error recovery for expressions resolving to templates.
(#GH135621)
+- Clang no longer accepts invalid integer constants which are too large to fit
+ into any (standard or extended) integer type when the constant is
unevaluated.
+ Merely forming the token is sufficient to render the program invalid. Code
+ like this was previously accepted and is now rejected (#GH134658):
+ .. code-block:: c
+
+ #if 1 ? 1 : 999999999999999999999
+ #endif
+- ``#embed`` directive now diagnoses use of a non-character file (device file)
+ such as ``/dev/urandom`` as an error. This restriction may be relaxed in the
+ future. See (#GH126629).
+- Fixed a clang 20 regression where diagnostics attached to some calls to
member functions
+ using C++23 "deducing this" did not have a diagnostic location (#GH135522)
+
+- Fixed a crash when a ``friend`` function is redefined as deleted. (#GH135506)
+- Fixed a crash when ``#embed`` appears as a part of a failed constant
+ evaluation. The crashes were happening during diagnostics emission due to
+ unimplemented statement printer. (#GH132641)
+- Fixed visibility calculation for template functions. (#GH103477)
+- Fixed a bug where an attribute before a ``pragma clang attribute`` or
+ ``pragma clang __debug`` would cause an assertion. Instead, this now
diagnoses
+ the invalid attribute location appropriately. (#GH137861)
+- Fixed a crash when a malformed ``_Pragma`` directive appears as part of an
+ ``#include`` directive. (#GH138094)
+- Fixed a crash during constant evaluation involving invalid lambda captures
+ (#GH138832)
+- Fixed compound literal is not constant expression inside initializer list
+ (#GH87867)
+- Fixed a crash when instantiating an invalid dependent friend template
specialization.
+ (#GH139052)
+- Fixed a crash with an invalid member function parameter list with a default
+ argument which contains a pragma. (#GH113722)
+- Fixed assertion failures when generating name lookup table in modules.
(#GH61065, #GH134739)
+- Fixed an assertion failure in constant compound literal statements.
(#GH139160)
+- Fix crash due to unknown references and pointer implementation and handling
of
+ base classes. (GH139452)
+- Fixed an assertion failure in serialization of constexpr structs containing
unions. (#GH140130)
+- Fixed duplicate entries in TableGen that caused the wrong attribute to be
selected. (GH#140701)
+- Fixed type mismatch error when 'builtin-elementwise-math' arguments have
different qualifiers, this should be well-formed. (#GH141397)
+- Constant evaluation now correctly runs the destructor of a variable declared
in
+ the second clause of a C-style ``for`` loop. (#GH139818)
+- Fixed a bug with constexpr evaluation for structs containing unions in case
of C++ modules. (#GH143168)
+- Fixed incorrect token location when emitting diagnostics for tokens expanded
from macros. (#GH143216)
+- Fixed an infinite recursion when checking constexpr destructors. (#GH141789)
+- Fixed a crash when a malformed using declaration appears in a ``constexpr``
function. (#GH144264)
+- Fixed a bug when use unicode character name in macro concatenation.
(#GH145240)
+- Clang doesn't erroneously inject a ``static_assert`` macro in
ms-compatibility and
+ -std=c99 mode. This resulted in deletion of
``-W/Wno-microsoft-static-assert``
+ flag and diagnostic because the macro injection was used to emit this
warning.
+ Unfortunately there is no other good way to diagnose usage of
``static_assert``
+ macro without inclusion of ``<assert.h>``.
+- In C23, something like ``[[/*possible attributes*/]];`` is an attribute
+ declaration, not a statement. So it is not allowed by the syntax in places
+ where a statement is required, specifically as the secondary block of a
+ selection or iteration statement. This differs from C++, since C++ allows
+ declaration statements. Clang now emits a warning for these patterns.
(#GH141659)
+- Fixed false positives for redeclaration errors of using enum in
+ nested scopes. (#GH147495)
+- Fixed a failed assertion with an operator call expression which comes from a
+ macro expansion when performing analysis for nullability attributes.
(#GH138371)
+- Fixed scope of typedefs present inside a template class. (#GH91451)
Bug Fixes to Compiler Builtins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index 1dc12d705b2cf..6fbed3e3369d1 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -4183,8 +4183,7 @@ llvm::DICompositeType
*CGDebugInfo::CreateLimitedType(const RecordType *Ty) {
llvm::MDNode::replaceWithDistinct(llvm::TempDICompositeType(RealDecl));
break;
}
- auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(Ty->getDecl());
- if (CTSD) {
+ if (auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(Ty->getDecl())) {
CXXRecordDecl *TemplateDecl =
CTSD->getSpecializedTemplate()->getTemplatedDecl();
RegionMap[TemplateDecl].reset(RealDecl);
>From 0ec73500ea303fbd87a79542f61936ea84d1e654 Mon Sep 17 00:00:00 2001
From: "Khatavkar, Yashasvi" <yashasvi.khatav...@intel.com>
Date: Wed, 13 Aug 2025 12:19:44 -0700
Subject: [PATCH 5/7] Address review comment
---
clang/lib/CodeGen/CGDebugInfo.cpp | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index 6fbed3e3369d1..a4663f79bd609 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -4183,13 +4183,11 @@ llvm::DICompositeType
*CGDebugInfo::CreateLimitedType(const RecordType *Ty) {
llvm::MDNode::replaceWithDistinct(llvm::TempDICompositeType(RealDecl));
break;
}
- if (auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(Ty->getDecl())) {
- CXXRecordDecl *TemplateDecl =
- CTSD->getSpecializedTemplate()->getTemplatedDecl();
- RegionMap[TemplateDecl].reset(RealDecl);
- } else {
- RegionMap[Ty->getDecl()].reset(RealDecl);
+ auto *Decl = Ty->getDecl();
+ if (auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(Decl)) {
+ Decl = CTSD->getSpecializedTemplate()->getTemplateDecl();
}
+ RegionMap[Decl].reset(RealDecl);
TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
if (const auto *TSpecial = dyn_cast<ClassTemplateSpecializationDecl>(RD))
>From effabee9ad73d8628f0cb6bf5d33f87cfefccb42 Mon Sep 17 00:00:00 2001
From: "Khatavkar, Yashasvi" <yashasvi.khatav...@intel.com>
Date: Thu, 14 Aug 2025 06:54:27 -0700
Subject: [PATCH 6/7] Fix release note after merge confits
---
clang/docs/ReleaseNotes.rst | 84 -------------------------------------
1 file changed, 84 deletions(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 608318d86b705..9cdd117fde1e1 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -180,7 +180,6 @@ Improvements to Coverage Mapping
Bug Fixes in This Version
-------------------------
-
- Fix a crash when marco name is empty in ``#pragma push_macro("")`` or
``#pragma pop_macro("")``. (#GH149762).
- `-Wunreachable-code`` now diagnoses tautological or contradictory
@@ -188,89 +187,6 @@ Bug Fixes in This Version
targets that treat ``_Float16``/``__fp16`` as native scalar types. Previously
the warning was silently lost because the operands differed only by an
implicit
cast chain. (#GH149967).
-- Clang now outputs correct values when #embed data contains bytes with
negative
- signed char values (#GH102798).
-- Fixed a crash when merging named enumerations in modules (#GH114240).
-- Fixed rejects-valid problem when #embed appears in std::initializer_list or
- when it can affect template argument deduction (#GH122306).
-- Fix crash on code completion of function calls involving partial order of
function templates
- (#GH125500).
-- Fixed clang crash when #embed data does not fit into an array
- (#GH128987).
-- Non-local variable and non-variable declarations in the first clause of a
``for`` loop in C are no longer incorrectly
- considered an error in C23 mode and are allowed as an extension in earlier
language modes.
-
-- Remove the ``static`` specifier for the value of ``_FUNCTION_`` for static
functions, in MSVC compatibility mode.
-- Fixed a modules crash where exception specifications were not propagated
properly (#GH121245, relanded in #GH129982)
-- Fixed a problematic case with recursive deserialization within
``FinishedDeserializing()`` where
- ``PassInterestingDeclsToConsumer()`` was called before the declarations were
safe to be passed. (#GH129982)
-- Fixed a modules crash where an explicit Constructor was deserialized.
(#GH132794)
-- Defining an integer literal suffix (e.g., ``LL``) before including
- ``<stdint.h>`` in a freestanding build no longer causes invalid token pasting
- when using the ``INTn_C`` macros. (#GH85995)
-- Fixed an assertion failure in the expansion of builtin macros like
``__has_embed()`` with line breaks before the
- closing paren. (#GH133574)
-- Fixed a crash in error recovery for expressions resolving to templates.
(#GH135621)
-- Clang no longer accepts invalid integer constants which are too large to fit
- into any (standard or extended) integer type when the constant is
unevaluated.
- Merely forming the token is sufficient to render the program invalid. Code
- like this was previously accepted and is now rejected (#GH134658):
- .. code-block:: c
-
- #if 1 ? 1 : 999999999999999999999
- #endif
-- ``#embed`` directive now diagnoses use of a non-character file (device file)
- such as ``/dev/urandom`` as an error. This restriction may be relaxed in the
- future. See (#GH126629).
-- Fixed a clang 20 regression where diagnostics attached to some calls to
member functions
- using C++23 "deducing this" did not have a diagnostic location (#GH135522)
-
-- Fixed a crash when a ``friend`` function is redefined as deleted. (#GH135506)
-- Fixed a crash when ``#embed`` appears as a part of a failed constant
- evaluation. The crashes were happening during diagnostics emission due to
- unimplemented statement printer. (#GH132641)
-- Fixed visibility calculation for template functions. (#GH103477)
-- Fixed a bug where an attribute before a ``pragma clang attribute`` or
- ``pragma clang __debug`` would cause an assertion. Instead, this now
diagnoses
- the invalid attribute location appropriately. (#GH137861)
-- Fixed a crash when a malformed ``_Pragma`` directive appears as part of an
- ``#include`` directive. (#GH138094)
-- Fixed a crash during constant evaluation involving invalid lambda captures
- (#GH138832)
-- Fixed compound literal is not constant expression inside initializer list
- (#GH87867)
-- Fixed a crash when instantiating an invalid dependent friend template
specialization.
- (#GH139052)
-- Fixed a crash with an invalid member function parameter list with a default
- argument which contains a pragma. (#GH113722)
-- Fixed assertion failures when generating name lookup table in modules.
(#GH61065, #GH134739)
-- Fixed an assertion failure in constant compound literal statements.
(#GH139160)
-- Fix crash due to unknown references and pointer implementation and handling
of
- base classes. (GH139452)
-- Fixed an assertion failure in serialization of constexpr structs containing
unions. (#GH140130)
-- Fixed duplicate entries in TableGen that caused the wrong attribute to be
selected. (GH#140701)
-- Fixed type mismatch error when 'builtin-elementwise-math' arguments have
different qualifiers, this should be well-formed. (#GH141397)
-- Constant evaluation now correctly runs the destructor of a variable declared
in
- the second clause of a C-style ``for`` loop. (#GH139818)
-- Fixed a bug with constexpr evaluation for structs containing unions in case
of C++ modules. (#GH143168)
-- Fixed incorrect token location when emitting diagnostics for tokens expanded
from macros. (#GH143216)
-- Fixed an infinite recursion when checking constexpr destructors. (#GH141789)
-- Fixed a crash when a malformed using declaration appears in a ``constexpr``
function. (#GH144264)
-- Fixed a bug when use unicode character name in macro concatenation.
(#GH145240)
-- Clang doesn't erroneously inject a ``static_assert`` macro in
ms-compatibility and
- -std=c99 mode. This resulted in deletion of
``-W/Wno-microsoft-static-assert``
- flag and diagnostic because the macro injection was used to emit this
warning.
- Unfortunately there is no other good way to diagnose usage of
``static_assert``
- macro without inclusion of ``<assert.h>``.
-- In C23, something like ``[[/*possible attributes*/]];`` is an attribute
- declaration, not a statement. So it is not allowed by the syntax in places
- where a statement is required, specifically as the secondary block of a
- selection or iteration statement. This differs from C++, since C++ allows
- declaration statements. Clang now emits a warning for these patterns.
(#GH141659)
-- Fixed false positives for redeclaration errors of using enum in
- nested scopes. (#GH147495)
-- Fixed a failed assertion with an operator call expression which comes from a
- macro expansion when performing analysis for nullability attributes.
(#GH138371)
- Fixed scope of typedefs present inside a template class. (#GH91451)
Bug Fixes to Compiler Builtins
>From eeb5134310924ab2d811bd06a2ed2315728534e4 Mon Sep 17 00:00:00 2001
From: "Khatavkar, Yashasvi" <yashasvi.khatav...@intel.com>
Date: Thu, 14 Aug 2025 07:18:19 -0700
Subject: [PATCH 7/7] Fix build failure
---
clang/lib/CodeGen/CGDebugInfo.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index a4663f79bd609..3f379850ac5ad 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -4183,11 +4183,11 @@ llvm::DICompositeType
*CGDebugInfo::CreateLimitedType(const RecordType *Ty) {
llvm::MDNode::replaceWithDistinct(llvm::TempDICompositeType(RealDecl));
break;
}
- auto *Decl = Ty->getDecl();
- if (auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(Decl)) {
- Decl = CTSD->getSpecializedTemplate()->getTemplateDecl();
+
+ if (auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(RD)) {
+ RD = CTSD->getSpecializedTemplate()->getTemplatedDecl();
}
- RegionMap[Decl].reset(RealDecl);
+ RegionMap[RD].reset(RealDecl);
TypeCache[QualType(Ty, 0).getAsOpaquePtr()].reset(RealDecl);
if (const auto *TSpecial = dyn_cast<ClassTemplateSpecializationDecl>(RD))
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
