clean up switch statement, remove bad comments

Author: bob80905

clang/lib/Sema/SemaDeclAttr.cpp

@@ -7387,45 +7387,37 @@ static void DiagnoseHLSLResourceRegType(Sema &S, SourceLocation &ArgLoc,
   }
   switch (DeclResourceClass) {
   case llvm::hlsl::ResourceClass::SRV: {
-    if (Slot[0] != 't')
-      S.Diag(ArgLoc, diag::err_hlsl_mismatching_register_resource_type_and_name)
-          << Slot.substr(0, 1) << VarTy
-          << (unsigned)llvm::hlsl::ResourceClass::SRV;
+    if (Slot[0] == 't')
+      return;
     break;
   }
   case llvm::hlsl::ResourceClass::UAV: {
-    if (Slot[0] != 'u')
-      S.Diag(ArgLoc, diag::err_hlsl_mismatching_register_resource_type_and_name)
-          << Slot.substr(0, 1) << VarTy
-          << (unsigned)llvm::hlsl::ResourceClass::UAV;
+    if (Slot[0] == 'u')
+      return;
     break;
   }
   case llvm::hlsl::ResourceClass::CBuffer: {
-    if (Slot[0] != 'b')
-      S.Diag(ArgLoc, diag::err_hlsl_mismatching_register_resource_type_and_name)
-          << Slot.substr(0, 1) << VarTy
-          << (unsigned)llvm::hlsl::ResourceClass::CBuffer;
+    if (Slot[0] == 'b')
+      return;
     break;
   }
   case llvm::hlsl::ResourceClass::TBuffer: {
-    if (Slot[0] != 't')
-      S.Diag(ArgLoc, diag::err_hlsl_mismatching_register_resource_type_and_name)
-          << Slot.substr(0, 1) << VarTy
-          << (unsigned)llvm::hlsl::ResourceClass::TBuffer;
+    if (Slot[0] == 't')
+      return;
     break;
   }
   case llvm::hlsl::ResourceClass::Sampler: {
-    if (Slot[0] != 's')
-      S.Diag(ArgLoc, diag::err_hlsl_mismatching_register_resource_type_and_name)
-          << Slot.substr(0, 1) << VarTy
-          << (unsigned)llvm::hlsl::ResourceClass::Sampler;
+    if (Slot[0] == 's')
+      return;
     break;
   }
   case llvm::hlsl::ResourceClass::Invalid: {
     llvm_unreachable("Resource class should be valid.");
     break;
   }
   }
+  S.Diag(ArgLoc, diag::err_hlsl_mismatching_register_resource_type_and_name)
+      << Slot.substr(0, 1) << VarTy << (unsigned)DeclResourceClass;
 }
 
 static void handleHLSLResourceBindingAttr(Sema &S, Decl *D,

clang/test/SemaHLSL/resource_binding_attr_error_mismatch.hlsl

@@ -1,10 +1,9 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -o - -fsyntax-only %s -verify
 
-// the below will cause an llvm unreachable, because RWBuffers don't have resource attributes yet
+
 // expected-error@+1  {{invalid register name prefix 'b' for register resource type 'RWBuffer' (expected 'u')}}
 RWBuffer<int> a : register(b2, space1);
 
-// the below will cause an llvm unreachable, because RWBuffers don't have resource attributes yet
 // expected-error@+1  {{invalid register name prefix 't' for register resource type 'RWBuffer' (expected 'u')}}
 RWBuffer<int> b : register(t2, space1);