Skip to content

Commit 1895bee

Browse files
igormunkinigormunkin
authored
Fix HasValue misuse for LLVM codegen (#10111)
1 parent 367fdb9 commit 1895bee

13 files changed

+21
-21
lines changed

‎ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ class TBlockCombineAllWrapperCodegenBase {
520520
const auto work = BasicBlock::Create(context, "work", ctx.Func);
521521
const auto over = BasicBlock::Create(context, "over", ctx.Func);
522522

523-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
523+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
524524
block = make;
525525

526526
const auto ptrType = PointerType::getUnqual(StructType::get(context));
@@ -927,7 +927,7 @@ class THashedWrapperCodegenBase {
927927
const auto fill = BasicBlock::Create(context, "fill", ctx.Func);
928928
const auto over = BasicBlock::Create(context, "over", ctx.Func);
929929

930-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
930+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
931931
block = make;
932932

933933
const auto ptrType = PointerType::getUnqual(StructType::get(context));

‎ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ using TBaseComputation = TStatefulWideFlowCodegeneratorNode<TCompressBlocks>;
343343
const auto fill = BasicBlock::Create(context, "fill", ctx.Func);
344344
const auto over = BasicBlock::Create(context, "over", ctx.Func);
345345

346-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
346+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
347347
block = make;
348348

349349
const auto ptrType = PointerType::getUnqual(StructType::get(context));

‎ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ using TChunkedArrayIndex = std::vector<IArrayBuilder::TArrayDataItem>;
115115
const auto fill = BasicBlock::Create(context, "fill", ctx.Func);
116116
const auto over = BasicBlock::Create(context, "over", ctx.Func);
117117

118-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
118+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
119119
block = make;
120120

121121
llvm::Value* trunc;

‎ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ using TBaseComputation = TStatefulWideFlowCodegeneratorNode<TWideToBlocksWrapper
149149
const auto over = BasicBlock::Create(context, "over", ctx.Func);
150150
const auto second_cond = BasicBlock::Create(context, "second_cond", ctx.Func);
151151

152-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
152+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
153153
block = make;
154154

155155
const auto ptrType = PointerType::getUnqual(StructType::get(context));
@@ -402,7 +402,7 @@ using TBaseComputation = TStatefulFlowCodegeneratorNode<TFromBlocksWrapper>;
402402
const auto init = BasicBlock::Create(context, "init", ctx.Func);
403403
const auto done = BasicBlock::Create(context, "done", ctx.Func);
404404

405-
BranchInst::Create(work, make, HasValue(statePtr, block), block);
405+
BranchInst::Create(make, work, IsInvalid(statePtr, block), block);
406406
block = make;
407407

408408
const auto ptrType = PointerType::getUnqual(StructType::get(context));
@@ -586,7 +586,7 @@ using TBaseComputation = TStatefulWideFlowCodegeneratorNode<TWideFromBlocksWrapp
586586
const auto work = BasicBlock::Create(context, "work", ctx.Func);
587587
const auto over = BasicBlock::Create(context, "over", ctx.Func);
588588

589-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
589+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
590590
block = make;
591591

592592
const auto ptrType = PointerType::getUnqual(StructType::get(context));
@@ -1041,7 +1041,7 @@ using TBaseComputation = TStatefulWideFlowCodegeneratorNode<TBlockExpandChunkedW
10411041
const auto fill = BasicBlock::Create(context, "fill", ctx.Func);
10421042
const auto over = BasicBlock::Create(context, "over", ctx.Func);
10431043

1044-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
1044+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
10451045
block = make;
10461046

10471047
const auto ptrType = PointerType::getUnqual(StructType::get(context));

‎ydb/library/yql/minikql/comp_nodes/mkql_combine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class TCombineCoreFlowWrapper: public std::conditional_t<IsMultiRowState,
272272
const auto main = BasicBlock::Create(context, "main", ctx.Func);
273273
const auto more = BasicBlock::Create(context, "more", ctx.Func);
274274

275-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
275+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
276276
block = make;
277277

278278
const auto ptrType = PointerType::getUnqual(StructType::get(context));

‎ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ using TBaseComputation = TStatefulWideFlowCodegeneratorNode<TExtendWideFlowWrapp
113113
const auto over = BasicBlock::Create(context, "over", ctx.Func);
114114
const auto done = BasicBlock::Create(context, "done", ctx.Func);
115115

116-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
116+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
117117
block = make;
118118

119119
const auto ptrType = PointerType::getUnqual(StructType::get(context));
@@ -259,7 +259,7 @@ class TExtendFlowWrapper : public TStatefulFlowCodegeneratorNode<TExtendFlowWrap
259259
const auto over = BasicBlock::Create(context, "over", ctx.Func);
260260
const auto done = BasicBlock::Create(context, "done", ctx.Func);
261261

262-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
262+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
263263
block = make;
264264

265265
const auto ptrType = PointerType::getUnqual(StructType::get(context));

‎ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ class TGraceJoinWrapper : public TStatefulWideFlowCodegeneratorNode<TGraceJoinWr
10851085
const auto make = BasicBlock::Create(context, "make", ctx.Func);
10861086
const auto main = BasicBlock::Create(context, "main", ctx.Func);
10871087

1088-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
1088+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
10891089
block = make;
10901090

10911091
const auto ptrType = PointerType::getUnqual(StructType::get(context));

‎ydb/library/yql/minikql/comp_nodes/mkql_join.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ class TWideCommonJoinCoreWrapper : public TStatefulWideFlowCodegeneratorNode<TWi
12011201
const auto make = BasicBlock::Create(context, "make", ctx.Func);
12021202
const auto main = BasicBlock::Create(context, "main", ctx.Func);
12031203

1204-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
1204+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
12051205

12061206
block = make;
12071207

‎ydb/library/yql/minikql/comp_nodes/mkql_switch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ class TSwitchFlowWrapper : public TStatefulFlowCodegeneratorNode<TSwitchFlowWrap
393393
const auto exit = BasicBlock::Create(context, "exit", ctx.Func);
394394
const auto result = PHINode::Create(valueType, Handlers.size() + 2U, "result", exit);
395395

396-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
396+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
397397
block = make;
398398

399399
const auto ptrType = PointerType::getUnqual(StructType::get(context));

‎ydb/library/yql/minikql/comp_nodes/mkql_wide_combine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ using TBaseComputation = TStatefulWideFlowCodegeneratorNode<TWideCombinerWrapper
900900
const auto main = BasicBlock::Create(context, "main", ctx.Func);
901901
const auto more = BasicBlock::Create(context, "more", ctx.Func);
902902

903-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
903+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
904904
block = make;
905905

906906
const auto ptrType = PointerType::getUnqual(StructType::get(context));
@@ -1329,7 +1329,7 @@ using TBaseComputation = TStatefulWideFlowCodegeneratorNode<TWideLastCombinerWra
13291329
const auto main = BasicBlock::Create(context, "main", ctx.Func);
13301330
const auto more = BasicBlock::Create(context, "more", ctx.Func);
13311331

1332-
BranchInst::Create(main, make, HasValue(statePtr, block), block);
1332+
BranchInst::Create(make, main, IsInvalid(statePtr, block), block);
13331333
block = make;
13341334

13351335
const auto ptrType = PointerType::getUnqual(StructType::get(context));

0 commit comments

Comments
 (0)