Index: clang/lib/Sema/SemaExpr.cpp
===================================================================
--- clang/lib/Sema/SemaExpr.cpp
+++ clang/lib/Sema/SemaExpr.cpp
@@ -2693,19 +2693,35 @@
   // spuriously dependent expression if we're inside a dependent
   // instance method.
   if (!R.empty() && (*R.begin())->isCXXClassMember()) {
-    bool MightBeImplicitMember;
-    if (!IsAddressOfOperand)
-      MightBeImplicitMember = true;
-    else if (!SS.isEmpty())
-      MightBeImplicitMember = false;
-    else if (R.isOverloadedResult())
-      MightBeImplicitMember = false;
-    else if (R.isUnresolvableResult())
-      MightBeImplicitMember = true;
-    else
-      MightBeImplicitMember = isa<FieldDecl>(R.getFoundDecl()) ||
-                              isa<IndirectFieldDecl>(R.getFoundDecl()) ||
-                              isa<MSPropertyDecl>(R.getFoundDecl());
+    bool MightBeImplicitMember = true, CheckField = true;
+    if (IsAddressOfOperand) {
+      if (!SS.isEmpty())
+        MightBeImplicitMember = false;
+      else if (R.isOverloadedResult())
+        MightBeImplicitMember = false;
+      else if (R.isUnresolvableResult()) {
+        MightBeImplicitMember = true;
+        CheckField = false;
+      }
+    }
+    if (MightBeImplicitMember && CheckField) {
+      if (R.isSingleResult() && (isa<FieldDecl>(R.getFoundDecl()) ||
+                                 isa<IndirectFieldDecl>(R.getFoundDecl()) ||
+                                 isa<MSPropertyDecl>(R.getFoundDecl()))) {
+        if (auto Class = dyn_cast_or_null<CXXRecordDecl>(
+                (*R.begin())->getDeclContext())) {
+          for (auto Curr = S->getLookupEntity(); Curr && !Curr->isFileContext();
+               Curr = Curr->getParent()) {
+            if (auto ThisClass = dyn_cast_or_null<CXXRecordDecl>(Curr)) {
+              if ((MightBeImplicitMember = ThisClass->Equals(Class) ||
+                                           ThisClass->isDerivedFrom(Class)))
+                break;
+            }
+          }
+        }
+      } else if (IsAddressOfOperand)
+        MightBeImplicitMember = false;
+    }
 
     if (MightBeImplicitMember)
       return BuildPossibleImplicitMemberExpr(SS, TemplateKWLoc,
Index: clang/test/SemaCXX/decltype.cpp
===================================================================
--- clang/test/SemaCXX/decltype.cpp
+++ clang/test/SemaCXX/decltype.cpp
@@ -101,6 +101,27 @@
   template<class T> void foo(decltype(T(LP1{ .p1 = g1, .p1.x[1] = 'x' }))) {}
 }
 
+namespace GH58674 {
+  struct Foo {
+    float value_;
+  };
+
+  template <typename T>
+  struct Animal{};
+
+  template <typename T>
+  class Cat : Animal<T> {
+  public:
+    void meow() {
+      using okay = decltype(Foo::value_);
+    }
+  };
+
+  void bar() {
+      Cat<void>{}.meow();
+  }
+}
+
 template<typename>
 class conditional {
 };