[clang] Fix cast for injected types in case name lookup for dependent bases #119024
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
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Vladislav Belov (vbe-sc) ChangesAn assertion failure occurs in Clang when attempting to compile such an example: template <typename, typename, bool> struct MozPromise {
class Private;
private:
int mMagic4 = 42;
};
template <typename ResolveValueT, typename RejectValueT, bool IsExclusive>
struct MozPromise<ResolveValueT, RejectValueT, IsExclusive>::Private : MozPromise {
void SetTaskPriority() { mMagic4 ; }
};Output: The reason is in the incorrect way of casting types when searching for names in base classes return Specifier->getType()->castAs<RecordType>()->getDecl()->getCanonicalDecl() == BaseRecord;It loses injected types for template class names. This patch provides fix for such cases Full diff: https://github.com/llvm/llvm-project/pull/119024.diff 1 Files Affected:
diff --git a/clang/lib/AST/CXXInheritance.cpp b/clang/lib/AST/CXXInheritance.cpp
index 10b8d524ff8978..74848696963e99 100644
--- a/clang/lib/AST/CXXInheritance.cpp
+++ b/clang/lib/AST/CXXInheritance.cpp
@@ -368,8 +368,8 @@ bool CXXRecordDecl::FindBaseClass(const CXXBaseSpecifier *Specifier,
const CXXRecordDecl *BaseRecord) {
assert(BaseRecord->getCanonicalDecl() == BaseRecord &&
"User data for FindBaseClass is not canonical!");
- return Specifier->getType()->castAs<RecordType>()->getDecl()
- ->getCanonicalDecl() == BaseRecord;
+ return (cast<CXXRecordDecl>(Specifier->getType()->getAsRecordDecl())
+ ->getCanonicalDecl()) == BaseRecord;
}
bool CXXRecordDecl::FindVirtualBaseClass(const CXXBaseSpecifier *Specifier,
@@ -378,8 +378,8 @@ bool CXXRecordDecl::FindVirtualBaseClass(const CXXBaseSpecifier *Specifier,
assert(BaseRecord->getCanonicalDecl() == BaseRecord &&
"User data for FindBaseClass is not canonical!");
return Specifier->isVirtual() &&
- Specifier->getType()->castAs<RecordType>()->getDecl()
- ->getCanonicalDecl() == BaseRecord;
+ (cast<CXXRecordDecl>(Specifier->getType()->getAsRecordDecl())
+ ->getCanonicalDecl()) == BaseRecord;
}
static bool isOrdinaryMember(const NamedDecl *ND) {
@@ -692,7 +692,7 @@ AddIndirectPrimaryBases(const CXXRecordDecl *RD, ASTContext &Context,
"Cannot get indirect primary bases for class with dependent bases.");
const CXXRecordDecl *BaseDecl =
- cast<CXXRecordDecl>(I.getType()->castAs<RecordType>()->getDecl());
+ cast<CXXRecordDecl>(I.getType()->getAsRecordDecl());
// Only bases with virtual bases participate in computing the
// indirect primary virtual base classes.
@@ -714,7 +714,7 @@ CXXRecordDecl::getIndirectPrimaryBases(CXXIndirectPrimaryBaseSet& Bases) const {
"Cannot get indirect primary bases for class with dependent bases.");
const CXXRecordDecl *BaseDecl =
- cast<CXXRecordDecl>(I.getType()->castAs<RecordType>()->getDecl());
+ cast<CXXRecordDecl>(I.getType()->getAsRecordDecl());
// Only bases with virtual bases participate in computing the
// indirect primary virtual base classes.
|
vbe-sc
force-pushed
the
vb-sc/clang-dependent-lookup-cast-fix
branch
from
9c501fc to
e3fd6b1
Compare
|
@erichkeane, @cor3ntin, could you, please, take a look at this fix? |
cor3ntin
changed the title
cor3ntin
reviewed
Dec 7, 2024
clang/lib/AST/CXXInheritance.cpp
Outdated
Comment on lines
371
to
372
| return (cast<CXXRecordDecl>(Specifier->getType()->getAsRecordDecl()) | ||
| ->getCanonicalDecl()) == BaseRecord; |
There was a problem hiding this comment.
You do not need the outer parentheses here
vbe-sc
force-pushed
the
vb-sc/clang-dependent-lookup-cast-fix
branch
from
e3fd6b1 to
ce758d5
Compare
Yes, you are right |
|
@glandium, this is the fix for your example. Please, feel free to contact if you have any more troubles with this patch |
erichkeane
reviewed
Dec 9, 2024
| @@ -368,8 +368,8 @@ bool CXXRecordDecl::FindBaseClass(const CXXBaseSpecifier *Specifier, | |||
| const CXXRecordDecl *BaseRecord) { | |||
| assert(BaseRecord->getCanonicalDecl() == BaseRecord && | |||
| "User data for FindBaseClass is not canonical!"); | |||
| return Specifier->getType()->castAs<RecordType>()->getDecl() | |||
| ->getCanonicalDecl() == BaseRecord; | |||
| return cast<CXXRecordDecl>(Specifier->getType()->getAsRecordDecl()) | |||
There was a problem hiding this comment.
why this instead of:
Specifier->getType()->getAsCXXRecordDecl() ??
Same question throughout this patch.
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.
An assertion failure occurs in Clang when attempting to compile such an example:
Output:
The reason is in the incorrect way of casting types when searching for names in base classes
It loses injected types for template class names.
This patch provides fix for such cases