Merge branch 'i7945' of github.com:s-perron/DirectXShaderCompiler into devshFixes

Author: AnastaZIuk

tools/clang/lib/SPIRV/SpirvEmitter.cpp

@@ -6899,6 +6899,7 @@ SpirvInstruction *SpirvEmitter::doUnaryOperator(const UnaryOperator *expr) {
 }
 
 spv::Op SpirvEmitter::translateOp(BinaryOperator::Opcode op, QualType type) {
+  type = type.getDesugaredType(astContext);
   const bool isSintType = isSintOrVecMatOfSintType(type);
   const bool isUintType = isUintOrVecMatOfUintType(type);
   const bool isFloatType = isFloatOrVecMatOfFloatType(type);

tools/clang/test/CodeGenSPIRV/binary-op-sugar.hlsl

@@ -0,0 +1,21 @@
+// RUN: %dxc -spirv -T lib_6_8 %s -fcgl | FileCheck %s
+
+enum LuminairePlanesSymmetry : uint
+{
+    ISOTROPIC = 0u,
+    NO_LATERAL_SYMMET
+};
+
+using symmetry_t = LuminairePlanesSymmetry;
+const symmetry_t symmetry;
+
+[numthreads(1,1,1)]
+[shader("compute")]
+void main(uint3 id : SV_DispatchThreadID)
+{
+// CHECK: [[AC:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int %_Globals %int_0
+// CHECK: [[LHS:%[0-9]+]] = OpLoad %int [[AC]]
+// CHECK: [[RHS:%[0-9]+]] = OpLoad %int %ISOTROPIC
+// CHECK: OpIEqual %bool [[LHS]] [[RHS]]
+  const uint i0 = (symmetry == symmetry_t::ISOTROPIC) ? 0u : 1u;
+}