[clang] fix nested tags of the same name not being included in their context #155965
+17
−1
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
…context
Fix an error in the logic meant to handle a redeclaration such as:
```C++
struct A {
struct __attribute__((foo)) A *ptr;
};
```
In the declaration of ptr, we must introduce a new redeclaration of A
in order for it to carry the new attribute. This is a redeclaration of
the existing A, but it is only lexically contained in A, but still
semantically belonging to the TU. This is the same deal as happens with
friend declarations, and the logic used to handle that is reused here.
But this was going haywire with a class indirectly nested within a class
of the same name.
The fix limits this logic to only apply when the tag use is just a simple
reference.
Fixes #155936
|
@llvm/pr-subscribers-clang Author: Matheus Izvekov (mizvekov) Changes…context Fix an error in the logic meant to handle a redeclaration such as: struct A {
struct __attribute__((foo)) A *ptr;
};In the declaration of ptr, we must introduce a new redeclaration of A in order for it to carry the new attribute. This is a redeclaration of the existing A, but it is only lexically contained in A, but still semantically belonging to the TU. This is the same deal as happens with friend declarations, and the logic used to handle that is reused here. But this was going haywire with a class indirectly nested within a class of the same name. The fix limits this logic to only apply when the tag use is just a simple reference. Fixes #155936 Full diff: https://github.com/llvm/llvm-project/pull/155965.diff 2 Files Affected:
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 0afef106821d9..12bedae05f6f3 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -18050,7 +18050,8 @@ Sema::ActOnTag(Scope *S, unsigned TagSpec, TagUseKind TUK, SourceLocation KWLoc,
}
}
} else if (auto *RD = dyn_cast<CXXRecordDecl>(PrevDecl);
- RD && RD->isInjectedClassName()) {
+ TUK == TagUseKind::Reference && RD &&
+ RD->isInjectedClassName()) {
// If lookup found the injected class name, the previous declaration is
// the class being injected into.
PrevDecl = cast<TagDecl>(RD->getDeclContext());
diff --git a/clang/test/AST/ast-dump-decl.cpp b/clang/test/AST/ast-dump-decl.cpp
index 849bfbee2ab21..afb507833d869 100644
--- a/clang/test/AST/ast-dump-decl.cpp
+++ b/clang/test/AST/ast-dump-decl.cpp
@@ -990,3 +990,18 @@ namespace TestInjectedClassName {
// CHECK-NEXT: `-RecordType [[TestInjectedClassName_RT]] 'A' injected
// CHECK-NEXT: `-CXXRecord [[TestInjectedClassName_RD]] 'A'
} // namespace InjectedClassName
+
+namespace TestGH155936 {
+ struct Foo {
+ struct A {
+ struct Foo {};
+ };
+ };
+ // CHECK-LABEL: Dumping TestGH155936:
+ // CHECK: CXXRecordDecl 0x{{.+}} <{{.+}}> line:[[@LINE-6]]:10 struct Foo definition
+ // CHECK: CXXRecordDecl 0x{{.+}} <col:3, col:10> col:10 implicit struct Foo
+ // CHECK: CXXRecordDecl 0x{{.+}} <{{.+}}> line:[[@LINE-7]]:12 struct A definition
+ // CHECK: CXXRecordDecl 0x{{.+}} <col:5, col:12> col:12 implicit struct A
+ // CHECK: CXXRecordDecl 0x{{.+}} <line:[[@LINE-8]]:7, col:19> col:14 struct Foo definition
+ // CHECH: CXXRecordDecl 0x{{.+}} <col:9, col:16> col:16 implicit struct Foo
+} // namspace GH155936
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/65/builds/21926 Here is the relevant piece of the build log for the reference |
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.
Fix an error in the logic meant to handle a redeclaration such as:
In the declaration of ptr, we must introduce a new redeclaration of A in order for it to carry the new attribute. This is a redeclaration of the existing A, but it is only lexically contained in A, still semantically belonging to the TU. This is the same deal as happens with friend declarations, and the logic used to handle that is reused here.
But this was going haywire with a class indirectly nested within a class of the same name.
The fix limits this logic to only apply when the tag use is just a simple reference.
Since this regression was never released, there are no release notes.
Fixes #155936