self review + respond to pr comments

Author: spall

clang/lib/Headers/hlsl.h

@@ -23,6 +23,7 @@
 // HLSL standard library function declarations/definitions.
 #include "hlsl/hlsl_alias_intrinsics.h"
 #include "hlsl/hlsl_intrinsics.h"
+#include "hlsl/hlsl_compat_overloads.h"
 
 #if defined(__clang__)
 #pragma clang diagnostic pop

clang/lib/Headers/hlsl/hlsl_alias_intrinsics.h

@@ -9,8 +9,6 @@
 #ifndef _HLSL_HLSL_ALIAS_INTRINSICS_H_
 #define _HLSL_HLSL_ALIAS_INTRINSICS_H_
 
-#include "hlsl_compat_overloads.h"
-
 namespace hlsl {
 
 // Note: Functions in this file are sorted alphabetically, then grouped by base

clang/lib/Sema/SemaHLSL.cpp

@@ -2042,6 +2042,7 @@ static bool CheckVectorElementCallArgs(Sema *S, CallExpr *TheCall) {
 }
 
 static bool CheckAllArgsHaveSameType(Sema *S, CallExpr *TheCall) {
+  assert(TheCall->getNumArgs() > 1);
   QualType ArgTy0 = TheCall->getArg(0)->getType();
 
   for (unsigned I = 1, N = TheCall->getNumArgs(); I < N; ++I) {

clang/test/CodeGenHLSL/builtins/clamp.hlsl

@@ -173,3 +173,23 @@ double4 test_clamp_double4_mismatch(double4 p0, double p1) { return clamp(p0, p0
 // CHECK: define [[FNATTRS]] [[FFNATTRS]] <4 x double> {{.*}}test_clamp_double4_mismatch2
 // CHECK: call reassoc nnan ninf nsz arcp afn <4 x double> @llvm.[[TARGET]].nclamp.v4f64
 double4 test_clamp_double4_mismatch2(double4 p0, double p1) { return clamp(p0, p1,p0); }
+
+// CHECK: define [[FNATTRS]] <2 x i32> {{.*}}_overloads1
+// CHECK: call <2 x i32> @llvm.[[TARGET]].sclamp.v2i32
+int2 test_overloads1(int2 p0, float2 p1, uint p2) { return clamp(p0, p1, p2); }
+
+// CHECK: define [[FNATTRS]] [[FFNATTRS]] <2 x float> {{.*}}test_overloads2
+// CHECK: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.[[TARGET]].nclamp.v2f32
+float2 test_overloads2(float2 p0, uint p1, int2 p2) { return clamp(p0, p1, p2); }
+
+// CHECK: define [[FNATTRS]] <3 x i32> {{.*}}test_overloads3
+// CHECK: call <3 x i32> @llvm.[[TARGET]].uclamp.v3i32
+uint3 test_overloads3(uint3 p0, int p1, float p2) { return clamp(p0, p1, p2); }
+
+// CHECK: define [[FNATTRS]] [[FFNATTRS]] <4 x double> {{.*}}test_overloads4
+// CHECK: call reassoc nnan ninf nsz arcp afn <4 x double> @llvm.[[TARGET]].nclamp.v4f64
+double4 test_overloads4(double4 p0, float4 p1, int4 p2) { return clamp(p0, p1, p2); }
+
+// CHECK: define [[FNATTRS]] i32 {{.*}}test_overloads5
+// CHECK: call i32 @llvm.[[TARGET]].sclamp.i32(
+int test_overloads5(int p0, uint p1, double p2) { return clamp(p0, p1, p2); }

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

@@ -20,6 +20,26 @@ float2 test_clamp_no_second_arg(float2 p0) {
   // expected-error@-1 {{no matching function for call to 'clamp'}}
 }
 
+float test_scalar_first_arg(float p0, float2 p1) {
+  return clamp(p0, p1, p1);
+  // expected-error@-1 {{call to 'clamp' is ambiguous}}
+}
+
+float test_scalar_first_arg2(float p0, float2 p1) {
+  return clamp(p0, p0, p1);
+  // expected-error@-1 {{call to 'clamp' is ambiguous}}
+}
+
+float2 test_scalar_first_arg3(float p0, float2 p1) {
+  return clamp(p0, p0, p1);
+  // expected-error@-1 {{call to 'clamp' is ambiguous}}
+}
+
+float3 test_thing(float3 p0, float2 p1) {
+  return clamp(p0, p0, p1);
+  // expected-error@-1 {{cannot initialize return object of type 'float3' (aka 'vector<float, 3>') with an rvalue of type 'vector<float, 2>' (vector of 2 'float' values)}}
+}
+
 float2 test_clamp_vector_size_mismatch(float3 p0, float2 p1) {
   return clamp(p0, p0, p1);
   // expected-warning@-1 {{implicit conversion truncates vector: 'float3' (aka 'vector<float, 3>') to 'vector<float, 2>' (vector of 2 'float' values)}}