code review

Author: MythreyaK

clang-tools-extra/clangd/unittests/RenameTests.cpp

@@ -2483,7 +2483,7 @@ TEST(RenameTest, RenameWithExplicitObjectPararameter) {
         return self.[[memb^er]];
       }
       int normal() {
-        return [[memb^er]];
+        return this->[[mem^ber]] + [[memb^er]];
       }
     };
   )cpp"};

clang/lib/Sema/HeuristicResolver.cpp

@@ -321,12 +321,14 @@ std::vector<const NamedDecl *> HeuristicResolverImpl::resolveMemberExpr(
   // Try resolving the member inside the expression's base type.
   Expr *Base = ME->isImplicitAccess() ? nullptr : ME->getBase();
   QualType BaseType = ME->getBaseType();
+  BaseType = simplifyType(BaseType, Base, ME->isArrow());
 
-  if (auto Type = ExplicitMemberHeuristic(Base); !Type.isNull()) {
-    BaseType = Type;
+  if (BaseType->isUndeducedAutoType() || BaseType->isTemplateTypeParmType()) {
+    if (auto Type = ExplicitMemberHeuristic(Base); !Type.isNull()) {
+      BaseType = Type;
+    }
   }
 
-  BaseType = simplifyType(BaseType, Base, ME->isArrow());
   return resolveDependentMember(BaseType, ME->getMember(), NoFilter);
 }