fix bugs revealed during testing

Author: spall

clang/lib/CodeGen/CGBuiltin.cpp

@@ -18703,13 +18703,13 @@ case Builtin::BI__builtin_hlsl_elementwise_isinf: {
 
     // if cond is a bool emit a select instruction
     if (TCond->isIntegerTy(1))
-      return Builder.CreateSelect(OpCond, OpTrue, OpFalse);
+      return Builder.CreateSelect(OpCond, OpTrue, OpFalse, "hlsl.select");
 
     // if cond is a vector of bools lower to a shufflevector
     // todo check if that true and false are vectors
     // todo check that the size of true and false and cond are the same
     if (TCond->isVectorTy() &&
-	E->getArg(0)->getType()->getAs<VectorType>()->isBooleanType()) {
+	E->getArg(0)->getType()->getAs<VectorType>()->getElementType()->isBooleanType()) {
       assert(OpTrue->getType()->isVectorTy() && OpFalse->getType()->isVectorTy() &&
 	     "Select's second and third operands must be vectors if first operand is a vector.");
 
@@ -18723,15 +18723,18 @@ case Builtin::BI__builtin_hlsl_elementwise_isinf: {
       assert(N == VecTyFalse->getNumElements() &&
 	     N == E->getArg(0)->getType()->getAs<VectorType>()->getNumElements() &&
 	     "Select requires vectors to be of the same size.");
-      
-      llvm::SmallVector<Value *> Mask;
+
+      llvm::Value *Result = llvm::PoisonValue::get(llvm::FixedVectorType::get(IntTy, N));
       for (unsigned I = 0; I < N; I++) {
 	Value *Index = ConstantInt::get(IntTy, I);
 	Value *IndexBool = Builder.CreateExtractElement(OpCond, Index);
-	Mask.push_back(Builder.CreateSelect(IndexBool, Index, ConstantInt::get(IntTy, I + N)));
+	Value *TVal = Builder.CreateExtractElement(OpTrue, Index);
+	Value *FVal = Builder.CreateExtractElement(OpFalse, Index);
+	Value *IndexSelect = Builder.CreateSelect(IndexBool, TVal, FVal);
+	Result = Builder.CreateInsertElement(Result, IndexSelect, Index); 
       }
-      
-      return Builder.CreateShuffleVector(OpTrue, OpFalse, BuildVector(Mask));
+
+      return Result;
     }
 
     llvm_unreachable("Select requires a bool or vector of bools as its first operand.");

clang/lib/Headers/hlsl/hlsl_intrinsics.h

@@ -1613,8 +1613,8 @@ double4 saturate(double4);
 /// \param TrueVal The Value returned if Cond is true.
 /// \param FalseVal The Value returned if Cond is false.
 
+template <typename T>
 _HLSL_BUILTIN_ALIAS(__builtin_hlsl_select)
-template<typename T>
 T select(bool, T, T);
 
 /// \fn vector<T,Sz> select(vector<bool,Sz> Conds, vector<T,Sz> TrueVals, vector<T,Sz>, FalseVals)
@@ -1623,8 +1623,8 @@ T select(bool, T, T);
 /// \param TrueVals The vector values are chosen from when conditions are true.
 /// \param FalseVals The vector values are chosen from when conditions are false.
 
+template <typename T, int Sz>
 _HLSL_BUILTIN_ALIAS(__builtin_hlsl_select)
-template<typename T, int Sz>
 vector<T,Sz> select(vector<bool,Sz>, vector<T,Sz>, vector<T,Sz>);
 
 //===----------------------------------------------------------------------===//

clang/lib/Sema/SemaHLSL.cpp

@@ -1120,7 +1120,7 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
     } else { // first operand is not a bool or a vector of bools.
       SemaRef.Diag(TheCall->getArg(0)->getBeginLoc(),
 		   diag::err_typecheck_convert_incompatible)
-	<< TheCall->getArg(0)->getType() << SemaRef.Context.getBOOLType()
+	<< TheCall->getArg(0)->getType() << getASTContext().BoolTy
 	<< 1 << 0 << 0;
       SemaRef.Diag(TheCall->getArg(0)->getBeginLoc(),
 		   diag::err_builtin_non_vector_type)