Fix uint64_t and builtin tests

Author: KungFuDonkey

clang/lib/CodeGen/CGHLSLBuiltins.cpp

@@ -788,7 +788,7 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID,
   }
   case Builtin::BI__builtin_hlsl_wave_active_bit_or: {
     Value *Op = EmitScalarExpr(E->getArg(0));
-    assert(Op->getType()->hasUnsignedIntegerRepresentation() &&
+    assert(E->getArg(0)->getType()->hasUnsignedIntegerRepresentation() &&
            "Intrinsic WaveActiveBitOr operand must have a unsigned integer representation");
 
     Intrinsic::ID ID = CGM.getHLSLRuntime().getWaveActiveBitOrIntrinsic();

clang/test/CodeGenHLSL/builtins/WaveActiveBitOr.hlsl

@@ -20,12 +20,3 @@ uint test_uint(uint expr) {
 }
 
 // CHECK: declare [[TY]] @llvm.[[ICF]].wave.reduce.or.i32([[TY]]) #[[#attr:]]
-
-// CHECK-LABEL: test_uint64_t
-uint64_t test_uint64_t(uint64_t expr) {
-  // CHECK:  %[[RET:.*]] = call i1 [[TY:.*]] @llvm.[[ICF]].wave.reduce.or.i64([[TY]] %[[#]])
-  // CHECK:  ret [[TY]] %[[RET]]
-  return WaveActiveBitOr(expr);
-}
-
-// CHECK: declare [[TY]] @llvm.[[ICF]].wave.reduce.or.i64([[TY]]) #[[#attr:]]

clang/test/SemaHLSL/BuiltIns/WaveActiveBitOr-errors.hlsl

@@ -10,29 +10,29 @@ uint2 test_too_many_arg(uint2 p0) {
   // expected-error@-1 {{too many arguments to function call, expected 1, have 2}}
 }
 
-bool test_expr_bool_type_check(bool p0) {
+uint test_expr_bool_type_check(bool p0) {
   return __builtin_hlsl_wave_active_bit_or(p0);
   // expected-error@-1 {{invalid operand of type 'bool'}}
 }
 
-float test_expr_float_type_check(float p0) {
+uint test_expr_float_type_check(float p0) {
   return __builtin_hlsl_wave_active_bit_or(p0);
   // expected-error@-1 {{invalid operand of type 'float'}}
 }
 
-bool2 test_expr_bool_vec_type_check(bool2 p0) {
+uint2 test_expr_bool_vec_type_check(bool2 p0) {
   return __builtin_hlsl_wave_active_bit_or(p0);
   // expected-error@-1 {{invalid operand of type 'bool2' (aka 'vector<bool, 2>')}}
 }
 
-float2 test_expr_float_type_check(float2 p0) {
+uint2 test_expr_float_type_check(float2 p0) {
   return __builtin_hlsl_wave_active_bit_or(p0);
   // expected-error@-1 {{invalid operand of type 'float2' (aka 'vector<float, 2>')}}
 }
 
 struct S { float f; };
 
-S test_expr_struct_type_check(S p0) {
+uint test_expr_struct_type_check(S p0) {
   return __builtin_hlsl_wave_active_bit_or(p0);
   // expected-error@-1 {{invalid operand of type 'S' where a scalar or vector is required}}
 }