Code review feedback

tools/clang/lib/CodeGen/CGDebugInfo.cpp

@@ -465,12 +465,6 @@ llvm::DIType *CGDebugInfo::CreateType(const BuiltinType *BT) {
   case BuiltinType::OCLSampler:
   case BuiltinType::OCLEvent:
     llvm_unreachable("No ObjC or OpenCL support");
-  case BuiltinType::LitInt:
-    Encoding = llvm::dwarf::DW_ATE_signed;
-    break;
-  case BuiltinType::LitFloat:
-    Encoding = llvm::dwarf::DW_ATE_float;
-    break;
 #endif // HLSL Change - no ObjC or OpenCL support
 
   case BuiltinType::UChar:
@@ -506,6 +500,7 @@ llvm::DIType *CGDebugInfo::CreateType(const BuiltinType *BT) {
   case BuiltinType::Long:
   case BuiltinType::WChar_S:
   case BuiltinType::LongLong:
+  case BuiltinType::LitInt:
     Encoding = llvm::dwarf::DW_ATE_signed;
     break;
   case BuiltinType::Bool:
@@ -520,6 +515,7 @@ llvm::DIType *CGDebugInfo::CreateType(const BuiltinType *BT) {
   case BuiltinType::Float:
   case BuiltinType::LongDouble:
   case BuiltinType::Double:
+  case BuiltinType::LitFloat:
     Encoding = llvm::dwarf::DW_ATE_float;
     break;
   }

tools/clang/test/HLSLFileCheck/hlsl/template/AddMulOps.hlsl

@@ -1,6 +1,6 @@
 // RUN: %dxc -E main -T ps_6_0 -enable-templates %s | FileCheck %s
 // RUN: %dxc -E main -T ps_6_0 %s -enable-templates -DCHECK_DIAGNOSTICS | FileCheck %s -check-prefix=DIAG
-// RUN: %dxc -E main -T ps_6_0 -enable-templates %s /Zi
+// RUN: %dxc -E main -T ps_6_0 -enable-templates %s /Zi | FileCheck %s
 
 template<typename T>
 T test_add(T t0, T t1) {