code review

Author: MythreyaK

clang/lib/Sema/HeuristicResolver.cpp

@@ -305,7 +305,7 @@ std::vector<const NamedDecl *> HeuristicResolverImpl::resolveMemberExpr(
   // check if member expr is in the context of an explicit object method
   // If so, it's safe to assume the templated arg is of type of the record
   const auto ExplicitMemberHeuristic =
-      [&](const Expr *Base) -> std::optional<QualType> {
+      [&](const Expr *Base) -> QualType {
     if (auto *DeclRef = dyn_cast_if_present<DeclRefExpr>(Base)) {
       auto *PrDecl = dyn_cast_if_present<ParmVarDecl>(DeclRef->getDecl());
 
@@ -319,15 +319,15 @@ std::vector<const NamedDecl *> HeuristicResolverImpl::resolveMemberExpr(
       }
     }
 
-    return std::nullopt;
+    return {};
   };
 
   // Try resolving the member inside the expression's base type.
   Expr *Base = ME->isImplicitAccess() ? nullptr : ME->getBase();
   QualType BaseType = ME->getBaseType();
 
-  if (auto Type = ExplicitMemberHeuristic(Base)) {
-    BaseType = *Type;
+  if (auto Type = ExplicitMemberHeuristic(Base); !Type.isNull()) {
+    BaseType = Type;
   }
 
   BaseType = simplifyType(BaseType, Base, ME->isArrow());