From 65ff57c4d4f1aeb94a5a8a59a8a1685c52ca8256 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Sat, 30 Aug 2025 18:07:17 -0400 Subject: [PATCH] Revert "fix null comparisons for non-standard address spaces (#58837)" This reverts commit 3b04664577713059bee663fb3d1cd37080a7ff8e. --- src/cgutils.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/cgutils.cpp b/src/cgutils.cpp index 180c8fdfb0021..405103076bd75 100644 --- a/src/cgutils.cpp +++ b/src/cgutils.cpp @@ -1395,17 +1395,10 @@ static void undef_var_error_ifnot(jl_codectx_t &ctx, Value *ok, jl_sym_t *name, ctx.builder.SetInsertPoint(ifok); } -// ctx.builder.CreateIsNotNull(v) lowers incorrectly in non-standard -// address spaces where null is not zero -// TODO: adapt to https://github.com/llvm/llvm-project/pull/131557 once merged static Value *null_pointer_cmp(jl_codectx_t &ctx, Value *v) { ++EmittedNullchecks; - Type *T = v->getType(); - return ctx.builder.CreateICmpNE( - v, - ctx.builder.CreateAddrSpaceCast( - Constant::getNullValue(ctx.builder.getPtrTy(0)), T)); + return ctx.builder.CreateIsNotNull(v); }