Skip to content

Commit feb15ec

Browse files
committed
fix select codegen
1 parent ef7de8d commit feb15ec

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

clang/lib/CodeGen/CGHLSLBuiltins.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,12 +604,12 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID,
604604
Value *OpTrue =
605605
RValTrue.isScalar()
606606
? RValTrue.getScalarVal()
607-
: RValTrue.getAggregatePointer(E->getArg(1)->getType(), *this);
607+
: Builder.CreateLoad(RValTrue.getAggregateAddress(), "true_val");
608608
RValue RValFalse = EmitAnyExpr(E->getArg(2));
609609
Value *OpFalse =
610610
RValFalse.isScalar()
611611
? RValFalse.getScalarVal()
612-
: RValFalse.getAggregatePointer(E->getArg(2)->getType(), *this);
612+
: Builder.CreateLoad(RValFalse.getAggregateAddress(), "false_val");
613613
if (auto *VTy = E->getType()->getAs<VectorType>()) {
614614
if (!OpTrue->getType()->isVectorTy())
615615
OpTrue =

clang/test/CodeGenHLSL/builtins/select.hlsl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ int test_select_bool_int(bool cond0, int tVal, int fVal) {
1111

1212
struct S { int a; };
1313
// CHECK-LABEL: test_select_infer
14-
// CHECK: [[SELECT:%.*]] = select i1 {{%.*}}, ptr {{%.*}}, ptr {{%.*}}
15-
// CHECK: store ptr [[SELECT]]
14+
// CHECK: [[TRUE_VAL:%.*]] = load %struct.S, ptr {{%.*}}, align 1
15+
// CHECK: [[FALSE_VAL:%.*]] = load %struct.S, ptr {{%.*}}, align 1
16+
// CHECK: [[SELECT:%.*]] = select i1 {{%.*}}, %struct.S [[TRUE_VAL]], %struct.S [[FALSE_VAL]]
17+
// CHECK: store %struct.S [[SELECT]], ptr {{%.*}}, align 1
1618
// CHECK: ret void
1719
struct S test_select_infer(bool cond0, struct S tVal, struct S fVal) {
1820
return select(cond0, tVal, fVal);

0 commit comments

Comments
 (0)