thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect phi node edges in if

Browse Source
This commit is contained in:
pyos 2018-05-10 17:49:25 +03:00
parent 6d2259f2cf
commit c123be1fe4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbms/src/Functions/FunctionsConditional.h
View File

@ -144,8 +144,8 @@ public:
auto * cond = values[i](); auto * cond = values[i]();
if (!null_is_false && types[i]->isNullable()) if (!null_is_false && types[i]->isNullable())
{ {
returns.emplace_back(head, null);
auto * nonnull = llvm::BasicBlock::Create(head->getContext(), "", head->getParent()); auto * nonnull = llvm::BasicBlock::Create(head->getContext(), "", head->getParent());
returns.emplace_back(b.GetInsertBlock(), null);
b.CreateCondBr(b.CreateExtractValue(cond, {1}), join, nonnull); b.CreateCondBr(b.CreateExtractValue(cond, {1}), join, nonnull);
b.SetInsertPoint(nonnull); b.SetInsertPoint(nonnull);
b.CreateCondBr(nativeBoolCast(b, removeNullable(types[i]), b.CreateExtractValue(cond, {0})), then, next); b.CreateCondBr(nativeBoolCast(b, removeNullable(types[i]), b.CreateExtractValue(cond, {0})), then, next);
@ -155,12 +155,13 @@ public:
b.CreateCondBr(nativeBoolCast(b, types[i], cond), then, next); b.CreateCondBr(nativeBoolCast(b, types[i], cond), then, next);
} }
b.SetInsertPoint(then); b.SetInsertPoint(then);
returns.emplace_back(then, nativeCast(b, types[i + 1], values[i + 1](), type)); auto * value = nativeCast(b, types[i + 1], values[i + 1](), type);
returns.emplace_back(b.GetInsertBlock(), value);
b.CreateBr(join); b.CreateBr(join);
b.SetInsertPoint(next); b.SetInsertPoint(next);
head = next;
} }
returns.emplace_back(head, nativeCast(b, types.back(), values.back()(), type)); auto * value = nativeCast(b, types.back(), values.back()(), type);
returns.emplace_back(b.GetInsertBlock(), value);
b.CreateBr(join); b.CreateBr(join);
b.SetInsertPoint(join); b.SetInsertPoint(join);
auto * phi = b.CreatePHI(toNativeType(b, type), returns.size()); auto * phi = b.CreatePHI(toNativeType(b, type), returns.size());