shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix of miscompilation

Browse Source
This commit is contained in:
Christoffer Lerno
2021-10-07 13:53:11 +02:00
parent aca5adebd5
commit 1b086e06f1
3 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/llvm_codegen_expr.c
View File

@@ -1753,7 +1753,7 @@ static void gencontext_emit_logical_and_or(GenContext *c, BEValue *be_value, Exp
// For vector implementation.
// Set up basic blocks, following Cone
LLVMBasicBlockRef start_block = LLVMGetInsertBlock(c->builder);
LLVMBasicBlockRef start_block;
LLVMBasicBlockRef phi_block = llvm_basic_block_new(c, op == BINARYOP_AND ? "and.phi" : "or.phi");
LLVMBasicBlockRef rhs_block = llvm_basic_block_new(c, op == BINARYOP_AND ? "and.rhs" : "or.rhs");

4
src/compiler/sema_expr.c
View File

@@ -4586,8 +4586,8 @@ static void cast_to_max_bit_size(Context *context, Expr *left, Expr *right, Type
return;
}
Type *to = right->type->type_kind < TYPE_U8
? type_int_signed_by_bitsize(bit_size_right)
: type_int_unsigned_by_bitsize(bit_size_right);
? type_int_signed_by_bitsize(bit_size_left)
: type_int_unsigned_by_bitsize(bit_size_left);
bool success = cast_implicit(right, to);
assert(success);
}

37
test/test_suite/statements/comparison_widening.c3t Normal file
View File

@@ -0,0 +1,37 @@
// #target: x64-darwin
func void test1()
{
char a = 1;
int b = 2;
char c = b > a ? 1 : 0;
}
// #expect: comparison_widening.ll
define void @comparison_widening.test1() #0 {
entry:
%a = alloca i8, align 1
%b = alloca i32, align 4
%c = alloca i8, align 1
store i8 1, i8* %a, align 1
store i32 2, i32* %b, align 4
%0 = load i32, i32* %b, align 4
%1 = load i8, i8* %a, align 1
%uiuiext = zext i8 %1 to i32
%gt = icmp sgt i32 %0, %uiuiext
%check = icmp sge i32 %uiuiext, 0
%siui-gt = and i1 %check, %gt
br i1 %siui-gt, label %cond.lhs, label %cond.rhs
cond.lhs: ; preds = %entry
br label %cond.phi
cond.rhs: ; preds = %entry
br label %cond.phi
cond.phi: ; preds = %cond.rhs, %cond.lhs
%val = phi i8 [ 1, %cond.lhs ], [ 0, %cond.rhs ]
store i8 %val, i8* %c, align 1
ret void
}