OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac/nir: fix integer comparisons with pointers

Browse Source 
If we get a comparison between a pointer and an integer, LLVM
complains if the operands aren't of the same type.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3085
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5397>
This commit is contained in:
Samuel Pitoiset
2020-06-09 08:36:17 +02:00
committed by Marge Bot
parent 24ceb6a594
commit 9b58c4958b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/amd/llvm/ac_nir_to_llvm.c
View File

@@ -170,6 +170,17 @@ static LLVMValueRef emit_int_cmp(struct ac_llvm_context *ctx,
LLVMIntPredicate pred, LLVMValueRef src0, LLVMIntPredicate pred, LLVMValueRef src0,
LLVMValueRef src1) LLVMValueRef src1)
{ {
LLVMTypeRef src0_type = LLVMTypeOf(src0);
LLVMTypeRef src1_type = LLVMTypeOf(src1);
if (LLVMGetTypeKind(src0_type) == LLVMPointerTypeKind &&
LLVMGetTypeKind(src1_type) != LLVMPointerTypeKind) {
src1 = LLVMBuildIntToPtr(ctx->builder, src1, src0_type, "");
} else if (LLVMGetTypeKind(src1_type) == LLVMPointerTypeKind &&
LLVMGetTypeKind(src0_type) != LLVMPointerTypeKind) {
src0 = LLVMBuildIntToPtr(ctx->builder, src0, src1_type, "");
}
LLVMValueRef result = LLVMBuildICmp(ctx->builder, pred, src0, src1, ""); LLVMValueRef result = LLVMBuildICmp(ctx->builder, pred, src0, src1, "");
return LLVMBuildSelect(ctx->builder, result, return LLVMBuildSelect(ctx->builder, result,
LLVMConstInt(ctx->i32, 0xFFFFFFFF, false), LLVMConstInt(ctx->i32, 0xFFFFFFFF, false),