[clang][Sema] Handle dependent qualifier in HeuristicResolver::resolveDeclRefExpr() #124515
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: Nathan Ridge (HighCommander4) ChangesFull diff: https://github.com/llvm/llvm-project/pull/124515.diff 2 Files Affected:
diff --git a/clang/lib/Sema/HeuristicResolver.cpp b/clang/lib/Sema/HeuristicResolver.cpp
index e893afed71d268..87c7274e7aefa6 100644
--- a/clang/lib/Sema/HeuristicResolver.cpp
+++ b/clang/lib/Sema/HeuristicResolver.cpp
@@ -262,8 +262,9 @@ std::vector<const NamedDecl *> HeuristicResolverImpl::resolveMemberExpr(
std::vector<const NamedDecl *>
HeuristicResolverImpl::resolveDeclRefExpr(const DependentScopeDeclRefExpr *RE) {
- return resolveDependentMember(QualType(RE->getQualifier()->getAsType(), 0),
- RE->getDeclName(), StaticFilter);
+ return resolveDependentMember(
+ resolveNestedNameSpecifierToType(RE->getQualifier()), RE->getDeclName(),
+ StaticFilter);
}
std::vector<const NamedDecl *>
diff --git a/clang/unittests/Sema/HeuristicResolverTest.cpp b/clang/unittests/Sema/HeuristicResolverTest.cpp
index 2b775b11719ea7..e5cd1254d75422 100644
--- a/clang/unittests/Sema/HeuristicResolverTest.cpp
+++ b/clang/unittests/Sema/HeuristicResolverTest.cpp
@@ -385,6 +385,27 @@ TEST(HeuristicResolver, DeclRefExpr_RespectScope) {
dependentScopeDeclRefExpr(hasDependentName("getPointer")).bind("input"));
}
+TEST(HeuristicResolver, DeclRefExpr_Nested) {
+ std::string Code = R"cpp(
+ struct S {
+ static int Waldo;
+ };
+ template <typename T>
+ struct Meta {
+ using Type = S;
+ };
+ template <typename T>
+ void foo() {
+ Meta<T>::Type::Waldo;
+ }
+ )cpp";
+ // Test resolution of "Waldo" in "Meta<T>::Type::Waldo".
+ expectResolution(
+ Code, &HeuristicResolver::resolveDeclRefExpr,
+ dependentScopeDeclRefExpr(hasDependentName("Waldo")).bind("input"),
+ varDecl(hasName("Waldo")).bind("output"));
+}
+
TEST(HeuristicResolver, DependentNameType) {
std::string Code = R"cpp(
template <typename>
|
|
(This is something I noticed while working on the improvements discussed here. Sending out separately to keep things small and easy to review.) |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/42/builds/2985 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.
No description provided.