simplify logic, address chris

Author: bob80905

clang/lib/Sema/SemaHLSL.cpp

@@ -2205,33 +2205,26 @@ bool SemaHLSL::IsTypedResourceElementCompatible(clang::QualType QT) {
     return false;
 
   // UDT types are not allowed
-  clang::QualType CanonicalType = QT.getCanonicalType();
-  if (CanonicalType->getAs<clang::RecordType>()) {
+  if (QT->isRecordType())
     return false;
-  }
-
-  // the only other valid builtin types are scalars or vectors
-  if (const BuiltinType *BT = CanonicalType->getAs<BuiltinType>()) {
-    if (BT->isBooleanType() || BT->isEnumeralType())
-      return false;
 
-    int TotalSizeInBytes = SemaRef.Context.getTypeSize(BT) / 8;
+  if (QT->isBooleanType() || QT->isEnumeralType())
+    return false;
 
-    if (TotalSizeInBytes > 16)
+  // the only other valid builtin types are scalars or vectors
+  if (QT->isArithmeticType()) {
+    if (SemaRef.Context.getTypeSize(QT) / 8 > 16)
       return false;
     return true;
   }
 
-  if (const VectorType *VT = CanonicalType->getAs<VectorType>()) {
+  if (const VectorType *VT = QT->getAs<VectorType>()) {
     int ArraySize = VT->getNumElements();
 
     if (ArraySize > 4)
       return false;
 
-    QualType ElTy = VT->getElementType();
-    int TotalSizeInBytes = (SemaRef.Context.getTypeSize(ElTy) / 8) * ArraySize;
-
-    if (TotalSizeInBytes > 16)
+    if (SemaRef.Context.getTypeSize(QT) / 8 > 16)
       return false;
     return true;
   }

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

@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -fnative-half-type -verify %s
 
 // types must be complete
-_Static_assert(__builtin_hlsl_is_typed_resource_element_compatible(__hlsl_resource_t), "");
+_Static_assert(!__builtin_hlsl_is_typed_resource_element_compatible(__hlsl_resource_t), "");
 
 // expected-note@+1{{forward declaration of 'notComplete'}}
 struct notComplete;