diff --git a/clang/lib/AST/ItaniumMangle.cpp b/clang/lib/AST/ItaniumMangle.cpp
index e3f91d6624b91148f0de6f88ff4b26fea1173189..b49cf99ddefee31581b4061ba37278fbf2f277f7 100644
--- a/clang/lib/AST/ItaniumMangle.cpp
+++ b/clang/lib/AST/ItaniumMangle.cpp
@@ -1500,8 +1500,7 @@ void CXXNameMangler::mangleUnqualifiedName(
     if (const CXXRecordDecl *A = dyn_cast<const CXXRecordDecl>(GD.getDecl()))
     {
       // todo: if class info is signed, then we must mangle also the name of non polymorphic classes.
-      isPac = langOptions.PointerAuthMangleClass
-        && (!A->hasDefinition() || A->isPolymorphic()) && !A->isNoPac();
+      isPac = langOptions.PointerAuthMangleClass && !A->isNoPac();
     }
   }
   if (pauth_func)