cr feedback - update itanium mangling of flags, do not compare wrapped type

Author: hekota

clang/lib/AST/ASTContext.cpp

@@ -11544,10 +11544,12 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS, bool OfBlockPointer,
         LHS->castAs<HLSLAttributedResourceType>();
     const HLSLAttributedResourceType *RHSTy =
         RHS->castAs<HLSLAttributedResourceType>();
+    assert(LHSTy->getWrappedType() == RHSTy->getWrappedType() &&
+           LHSTy->getWrappedType()->isHLSLResourceType() &&
+           "HLSLAttributedResourceType should always wrap __hlsl_resource_t");
 
-    if (LHSTy->getWrappedType() == RHSTy->getWrappedType() &&
-        LHSTy->getContainedType() == RHSTy->getContainedType() &&
-        LHSTy->getAttrs() == RHSTy->getAttrs())
+    if (LHSTy->getAttrs() == RHSTy->getAttrs() &&
+        LHSTy->getContainedType() == RHSTy->getContainedType())
       return LHS;
     return {};
   }

clang/lib/AST/ItaniumMangle.cpp

@@ -4510,14 +4510,15 @@ void CXXNameMangler::mangleType(const HLSLAttributedResourceType *T) {
     Str += "_s";
     break;
   }
-  mangleVendorQualifier(Str);
   if (Attrs.IsROV)
-    mangleVendorQualifier("_ROV");
+    Str += "_ROV";
   if (Attrs.RawBuffer)
-    mangleVendorQualifier("_Raw");
+    Str += "_Raw";
+  if (T->hasContainedType())
+    Str += "_CT";
+  mangleVendorQualifier(Str);
 
-  if (!T->hasContainedType()) {
-    mangleVendorQualifier("__CT");
+  if (T->hasContainedType()) {
     mangleType(T->getContainedType());
   }
   mangleType(T->getWrappedType());