address Chris

Author: bob80905

clang/lib/Sema/SemaExprCXX.cpp

@@ -5718,7 +5718,7 @@ static bool EvaluateUnaryTypeTrait(Sema &Self, TypeTrait UTT,
 
   case UTT_IsTypedResourceElementCompatible:
     assert(Self.getLangOpts().HLSL &&
-           "line vector layout compatible types are HLSL-only feature");
+           "typed resource element compatible types are an HLSL-only feature");
     if (Self.RequireCompleteType(TInfo->getTypeLoc().getBeginLoc(), T,
                                  diag::err_incomplete_type))
       return false;

clang/lib/Sema/SemaHLSL.cpp

@@ -2176,25 +2176,25 @@ bool SemaHLSL::IsTypedResourceElementCompatible(clang::QualType QT) {
 
   assert(QTTypes.size() > 0 &&
          "expected at least one constituent type from non-null type");
-  QualType FirstQT = QTTypes[0];
+  QualType FirstQT = SemaRef.Context.getCanonicalType(QTTypes[0]);
 
   // element count cannot exceed 4
   if (QTTypes.size() > 4)
     return false;
 
   for (QualType TempQT : QTTypes) {
     // ensure homogeneity
-    if (TempQT != FirstQT)
+    if (!getASTContext().hasSameUnqualifiedType(FirstQT, TempQT))
       return false;
+  }
 
-    if (const BuiltinType *BT = TempQT->getAs<BuiltinType>()) {
-      if (BT->isBooleanType() || BT->isEnumeralType())
-        return false;
+  if (const BuiltinType *BT = FirstQT->getAs<BuiltinType>()) {
+    if (BT->isBooleanType() || BT->isEnumeralType())
+      return false;
 
-      // Check if it is an array type.
-      if (TempQT->isArrayType())
-        return false;
-    }
+    // Check if it is an array type.
+    if (FirstQT->isArrayType())
+      return false;
   }
 
   // if the loop above completes without returning, then

clang/test/SemaHLSL/Types/Traits/IsTypedResourceElementCompatible.hlsl

@@ -99,3 +99,11 @@ _Static_assert(__builtin_hlsl_is_typed_resource_element_compatible(SimpleTemplat
 _Static_assert(__builtin_hlsl_is_typed_resource_element_compatible(SimpleTemplate<float>), "");
 
 
+typedef int myInt;
+
+struct TypeDefTest {
+    int x;
+    myInt y;
+};
+
+_Static_assert(__builtin_hlsl_is_typed_resource_element_compatible(TypeDefTest), "");

clang/test/SemaHLSL/Types/Traits/IsTypedResourceElementCompatibleErrors.hlsl

@@ -7,4 +7,4 @@ _Static_assert(__builtin_hlsl_is_typed_resource_element_compatible(__hlsl_resour
 struct notComplete;
 // expected-error@+1{{incomplete type 'notComplete' where a complete type is required}}
 _Static_assert(!__builtin_hlsl_is_typed_resource_element_compatible(notComplete), "");
-
+