Skip to content

Commit fbb6d5e

Browse files
committed
Fix x64 errors
1 parent 5c6e3c0 commit fbb6d5e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/mono/mono/mini/mini-llvm.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ sig_to_llvm_sig_full (EmitContext *ctx, MonoMethodSignature *sig, LLVMCallInfo *
15931593
ret_type = LLVMStructType (members, 1, FALSE);
15941594
} else if (cinfo->ret.pair_storage [0] == LLVMArgNone && cinfo->ret.pair_storage [1] == LLVMArgNone) {
15951595
/* Empty struct */
1596-
ret_type = LLVMVoidType ();
1596+
ret_type = LLVMStructType (NULL, 0, FALSE);
15971597
} else if (cinfo->ret.pair_storage [0] == LLVMArgInIReg && cinfo->ret.pair_storage [1] == LLVMArgInIReg) {
15981598
LLVMTypeRef members [2];
15991599

@@ -4950,6 +4950,9 @@ process_call (EmitContext *ctx, MonoBasicBlock *bb, LLVMBuilderRef *builder_ref,
49504950
/* Empty struct */
49514951
break;
49524952

4953+
if (LLVMTypeOf (lcall) == LLVMStructType (NULL, 0, FALSE))
4954+
break;
4955+
49534956
if (!addresses [ins->dreg])
49544957
addresses [ins->dreg] = build_alloca_address (ctx, sig->ret);
49554958

0 commit comments

Comments
 (0)