Skip to content

Commit ddcbe4d

Browse files
authored
[backports-release-1.11]: Revert "fix null comparisons for non-standard address spaces (#58837)" (#59445)
This reverts commit 3b04664 (which backports #58837 to 1.11.x). For more details, see #59336 (comment) and #59336 (comment). Targets `backports-release-1.11` (#59336).
1 parent 562699a commit ddcbe4d

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

src/cgutils.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,17 +1395,10 @@ static void undef_var_error_ifnot(jl_codectx_t &ctx, Value *ok, jl_sym_t *name,
13951395
ctx.builder.SetInsertPoint(ifok);
13961396
}
13971397

1398-
// ctx.builder.CreateIsNotNull(v) lowers incorrectly in non-standard
1399-
// address spaces where null is not zero
1400-
// TODO: adapt to https://github.com/llvm/llvm-project/pull/131557 once merged
14011398
static Value *null_pointer_cmp(jl_codectx_t &ctx, Value *v)
14021399
{
14031400
++EmittedNullchecks;
1404-
Type *T = v->getType();
1405-
return ctx.builder.CreateICmpNE(
1406-
v,
1407-
ctx.builder.CreateAddrSpaceCast(
1408-
Constant::getNullValue(ctx.builder.getPtrTy(0)), T));
1401+
return ctx.builder.CreateIsNotNull(v);
14091402
}
14101403

14111404

0 commit comments

Comments
 (0)