Remove use of ArrayRef(std::nullopt_t) constructor (#59973)

This is deprecated on LLVM 21 and in almost all cases this could be replaced with a simple `{}` which is both shorter and clearer that it was an array argument expected here. Only exception is constructor of `jl_cgval_t` due to an ambiguity. As far as I can tell, all the places that was replaced has always been taking an `ArrayRef` so this should work on older LLVM versions as well.

Author: yuyichao

src/cgutils.cpp

@@ -308,7 +308,7 @@ void jl_debugcache_t::initialize(Module *m){
  jl_di_func_sig = dbuilder.createSubroutineType(
  dbuilder.getOrCreateTypeArray(diargs));
  jl_di_func_null_sig = dbuilder.createSubroutineType(
- dbuilder.getOrCreateTypeArray(None));
+ dbuilder.getOrCreateTypeArray({}));
 }
 
 static Value *emit_pointer_from_objref(jl_codectx_t &ctx, Value *V)
@@ -580,7 +580,7 @@ static Constant *julia_pgv(jl_codegen_params_t &params, Module *M, const char *c
 // since the load at the new location satisfy the same condition as the original one.
 // Mark the global as constant to LLVM code using our own metadata
 // which is much less likely to be striped.
- gv->setMetadata("julia.constgv", MDNode::get(gv->getContext(), None));
+ gv->setMetadata("julia.constgv", MDNode::get(gv->getContext(), {}));
 assert(localname == gv->getName());
 assert(!gv->hasInitializer());
 return gv;
@@ -698,7 +698,7 @@ static inline Instruction *maybe_mark_load_dereferenceable(Instruction *LI, bool
 if (isa<PointerType>(LI->getType())){
 if (!can_be_null)
 // The `dereferenceable` below does not imply `nonnull` for non addrspace(0) pointers.
- LI->setMetadata(LLVMContext::MD_nonnull, MDNode::get(LI->getContext(), None));
+ LI->setMetadata(LLVMContext::MD_nonnull, MDNode::get(LI->getContext(), {}));
 if (size){
  Metadata *OP = ConstantAsMetadata::get(ConstantInt::get(getInt64Ty(LI->getContext()), size));
  LI->setMetadata(can_be_null ? LLVMContext::MD_dereferenceable_or_null : LLVMContext::MD_dereferenceable,
@@ -1907,7 +1907,7 @@ static Value *emit_typeof(jl_codectx_t &ctx, Value *v, bool maybenull, bool just
  Value *smallp = emit_ptrgep(ctx, prepare_global_in(M, jl_small_typeof_var), tag);
 jl_aliasinfo_t ai = jl_aliasinfo_t::fromTBAA(ctx, ctx.tbaa().tbaa_const);
 auto small = ctx.builder.CreateAlignedLoad(typetag->getType(), smallp, M->getDataLayout().getPointerABIAlignment(0));
- small->setMetadata(LLVMContext::MD_nonnull, MDNode::get(M->getContext(), None));
+ small->setMetadata(LLVMContext::MD_nonnull, MDNode::get(M->getContext(), {}));
 return ai.decorateInst(small);
  });
  });
@@ -2605,8 +2605,7 @@ static jl_cgval_t typed_store(jl_codectx_t &ctx,
 FunctionType::get(StructType::get(elty, elty),{ptr->getType(), ctx.builder.getPtrTy(), ctx.builder.getInt8Ty(), ctx.builder.getInt8Ty()}, true),
 AttributeList::get(elty->getContext(),
 Attributes(elty->getContext(),{Attribute::NoMerge}), // prevent llvm from merging calls to different functions
-AttributeSet(),
- None));
+AttributeSet(),{}));
  SmallVector<Value*,0> Args ={ptr, op, ctx.builder.getInt8((unsigned)Order), ctx.builder.getInt8(SyncScope::System)};
 if (rhs.V)
  Args.push_back(rhs.V);
@@ -3533,7 +3532,7 @@ static Value *emit_genericmemoryptr(jl_codectx_t &ctx, Value *mem, const jl_data
  PointerType *PPT = cast<PointerType>(ctx.types().T_jlgenericmemory->getElementType(1));
  LoadInst *LI = ctx.builder.CreateAlignedLoad(PPT, addr, Align(sizeof(char*)));
  LI->setOrdering(AtomicOrdering::NotAtomic);
- LI->setMetadata(LLVMContext::MD_nonnull, MDNode::get(ctx.builder.getContext(), None));
+ LI->setMetadata(LLVMContext::MD_nonnull, MDNode::get(ctx.builder.getContext(), {}));
 jl_aliasinfo_t aliasinfo = jl_aliasinfo_t::fromTBAA(ctx, ctx.tbaa().tbaa_memoryptr);
  aliasinfo.decorateInst(LI);
  Value *ptr = LI;
@@ -3552,7 +3551,7 @@ static Value *emit_genericmemoryowner(jl_codectx_t &ctx, Value *t)
  Type *T_data = ctx.types().T_jlgenericmemory->getElementType(1);
  LoadInst *LI = ctx.builder.CreateAlignedLoad(T_data, addr, Align(sizeof(char*)));
  LI->setOrdering(AtomicOrdering::NotAtomic);
- LI->setMetadata(LLVMContext::MD_nonnull, MDNode::get(ctx.builder.getContext(), None));
+ LI->setMetadata(LLVMContext::MD_nonnull, MDNode::get(ctx.builder.getContext(), {}));
 jl_aliasinfo_t aliasinfo_mem = jl_aliasinfo_t::fromTBAA(ctx, ctx.tbaa().tbaa_memoryown);
  aliasinfo_mem.decorateInst(LI);
  addr = emit_ptrgep(ctx, m, JL_SMALL_BYTE_ALIGNMENT);

src/codegen.cpp

@@ -625,15 +625,15 @@ static AttributeList get_attrs_noreturn(LLVMContext &C)
 returnAttributeList::get(C,
 Attributes(C,{Attribute::NoReturn}),
 AttributeSet(),
-None);
+{});
 }
 
 static AttributeList get_attrs_basic(LLVMContext &C)
 {
 returnAttributeList::get(C,
 AttributeSet(),
 Attributes(C,{Attribute::NonNull}),
-None);
+{});
 }
 
 static AttributeList get_attrs_box_float(LLVMContext &C, unsigned nbytes)
@@ -649,7 +649,7 @@ static AttributeList get_attrs_box_float(LLVMContext &C, unsigned nbytes)
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 AttributeSet::get(C, RetAttrs),
-None);
+{});
 }
 
 static AttributeList get_attrs_box_sext(LLVMContext &C, unsigned nbytes)
@@ -936,7 +936,7 @@ static const auto jltopeval_func = new JuliaFunction<>{
  [](LLVMContext &C){returnAttributeList::get(C,
 AttributeSet(),
 Attributes(C,{Attribute::NonNull}),
-None)},
+{})},
 };
 staticconstauto jlcopyast_func = new JuliaFunction<>{
 XSTR(jl_copy_ast),
@@ -948,7 +948,7 @@ static const auto jlcopyast_func = new JuliaFunction<>{
  [](LLVMContext &C){returnAttributeList::get(C,
 AttributeSet(),
 Attributes(C,{Attribute::NonNull}),
-None)},
+{})},
 };
 staticconstauto jlapplygeneric_func = new JuliaFunction<>{
 XSTR(jl_apply_generic),
@@ -1052,7 +1052,7 @@ static const auto jlleave_func = new JuliaFunction<>{
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 AttributeSet(),
-None);
+{});
  },
 };
 staticconstauto jlleave_noexcept_func = new JuliaFunction<>{
@@ -1069,7 +1069,7 @@ static const auto jlleave_noexcept_func = new JuliaFunction<>{
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 AttributeSet(),
-None);
+{});
  },
 };
 staticconstauto jl_restore_excstack_func = new JuliaFunction<TypeFnContextAndSizeT>{
@@ -1099,7 +1099,7 @@ static const auto jlegalx_func = new JuliaFunction<TypeFnContextAndSizeT>{
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 AttributeSet(),
-None)},
+{})},
 };
 staticconstauto jl_alloc_obj_func = new JuliaFunction<TypeFnContextAndSizeT>{
 "julia.gc_alloc_obj",
@@ -1122,7 +1122,7 @@ static const auto jl_alloc_obj_func = new JuliaFunction<TypeFnContextAndSizeT>{
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 AttributeSet::get(C, RetAttrs),
-None);
+{});
  },
 };
 staticconstauto jl_alloc_genericmemory_unchecked_func = new JuliaFunction<TypeFnContextAndSizeT>{
@@ -1145,7 +1145,7 @@ static const auto jl_alloc_genericmemory_unchecked_func = new JuliaFunction<Type
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 AttributeSet::get(C, RetAttrs),
-None);
+{});
  },
 };
 staticconstauto jl_newbits_func = new JuliaFunction<>{
@@ -1158,7 +1158,7 @@ static const auto jl_newbits_func = new JuliaFunction<>{
  [](LLVMContext &C){returnAttributeList::get(C,
 AttributeSet(),
 Attributes(C,{Attribute::NonNull}),
-None)},
+{})},
 };
 // `julia.typeof` does read memory, but it is effectively readnone before we lower
 // the allocation function. This is OK as long as we lower `julia.typeof` no later than
@@ -1178,7 +1178,7 @@ static const auto jl_typeof_func = new JuliaFunction<>{
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 Attributes(C,{Attribute::NonNull}),
-None)},
+{})},
 };
 
 staticconstauto jl_write_barrier_func = new JuliaFunction<>{
@@ -1230,7 +1230,7 @@ static const auto jlapplytype_func = new JuliaFunction<>{
 AttributeSet(),
 AttributeSet::get(C, ArrayRef<Attribute>({Attribute::get(C, Attribute::NonNull),
 Attribute::getWithAlignment(C, Align(16))})),
-None);
+{});
  },
 };
 staticconstauto jl_object_id__func = new JuliaFunction<TypeFnContextAndSizeT>{
@@ -1251,7 +1251,7 @@ static const auto setjmp_func = new JuliaFunction<TypeFnContextAndTriple>{
  [](LLVMContext &C){returnAttributeList::get(C,
 Attributes(C,{Attribute::ReturnsTwice}),
 AttributeSet(),
-None)},
+{})},
 };
 staticconstauto memcmp_func = new JuliaFunction<TypeFnContextAndSizeT>{
 XSTR(memcmp),
@@ -1264,7 +1264,7 @@ static const auto memcmp_func = new JuliaFunction<TypeFnContextAndSizeT>{
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 AttributeSet(),
-None)},
+{})},
 // TODO: inferLibFuncAttributes(*memcmp_func, TLI);
 };
 staticconstauto jldlsym_func = new JuliaFunction<>{
@@ -1298,7 +1298,7 @@ static const auto jlgetnthfieldchecked_func = new JuliaFunction<TypeFnContextAnd
  [](LLVMContext &C){returnAttributeList::get(C,
 AttributeSet(),
 Attributes(C,{Attribute::NonNull}),
-None)},
+{})},
 };
 staticconstauto jlfieldindex_func = new JuliaFunction<>{
 XSTR(jl_field_index),
@@ -1315,7 +1315,7 @@ static const auto jlfieldindex_func = new JuliaFunction<>{
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 AttributeSet(),
-None)}, // This function can error if the third argument is 1 so don't do that.
+{})}, // This function can error if the third argument is 1 so don't do that.
 };
 staticconstauto jlfieldisdefinedchecked_func = new JuliaFunction<TypeFnContextAndSizeT>{
 XSTR(jl_field_isdefined_checked),
@@ -1327,7 +1327,7 @@ static const auto jlfieldisdefinedchecked_func = new JuliaFunction<TypeFnContext
  [](LLVMContext &C){returnAttributeList::get(C,
 AttributeSet(),
 Attributes(C,{}),
-None)},
+{})},
 };
 staticconstauto jlgetcfunctiontrampoline_func = new JuliaFunction<>{
 XSTR(jl_get_cfunction_trampoline),
@@ -1349,7 +1349,7 @@ static const auto jlgetcfunctiontrampoline_func = new JuliaFunction<>{
  [](LLVMContext &C){returnAttributeList::get(C,
 AttributeSet(),
 Attributes(C,{Attribute::NonNull}),
-None)},
+{})},
 };
 staticconstauto jlgetabiconverter_func = new JuliaFunction<TypeFnContextAndSizeT>{
 XSTR(jl_get_abi_converter),
@@ -1389,7 +1389,7 @@ static const auto jl_allocgenericmemory = new JuliaFunction<TypeFnContextAndSize
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 AttributeSet::get(C, RetAttrs),
-None)},
+{})},
 };
 #defineBOX_FUNC(ct,at,attrs,nbytes) \
 staticconstauto box_##ct##_func = new JuliaFunction<>{\
@@ -1431,7 +1431,7 @@ static const auto jldnd_func = new JuliaFunction<>{
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 Attributes(C,{}),
-None);
+{});
  },
 };
 
@@ -1466,7 +1466,7 @@ static const auto pointer_from_objref_func = new JuliaFunction<>{
 returnAttributeList::get(C,
 AttributeSet::get(C, FnAttrs),
 Attributes(C,{Attribute::NonNull}),
-None)},
+{})},
 };
 staticconstauto gc_loaded_func = new JuliaFunction<>{
 "julia.gc_loaded",
@@ -1680,7 +1680,7 @@ struct jl_aliasinfo_t{
  MDNode *operand = cast<MDNode>(this->scope->getOperand(0));
 auto scope_name = cast<MDString>(operand->getOperand(0))->getString();
 if (scope_name == "jnoalias_const")
- inst->setMetadata(LLVMContext::MD_invariant_load, MDNode::get(inst->getContext(), None));
+ inst->setMetadata(LLVMContext::MD_invariant_load, MDNode::get(inst->getContext(), {}));
  }
  }
 
@@ -2065,7 +2065,7 @@ jl_aliasinfo_t jl_aliasinfo_t::fromTBAA(jl_codectx_t &ctx, MDNode *tbaa){
 
 static Type *julia_type_to_llvm(jl_codectx_t &ctx, jl_value_t *jt, bool *isboxed = NULL);
 staticjl_returninfo_tget_specsig_function(jl_codegen_params_t &ctx, Module *M, Value *fval, StringRef name, jl_value_t *sig, jl_value_t *jlrettype, bool is_opaque_closure,
- ArrayRef<constchar*> ArgNames=None, unsigned nreq=0);
+ ArrayRef<constchar*> ArgNames={}, unsigned nreq=0);
 staticjl_cgval_temit_expr(jl_codectx_t &ctx, jl_value_t *expr, ssize_t ssaval = -1);
 staticjl_cgval_temit_checked_var(jl_codectx_t &ctx, Value *bp, jl_sym_t *name, jl_value_t *scope, bool isvol, MDNode *tbaa);
 staticjl_cgval_temit_sparam(jl_codectx_t &ctx, size_t i);
@@ -2243,7 +2243,7 @@ static inline jl_cgval_t ghostValue(jl_codectx_t &ctx, jl_value_t *typ)
 if (jl_is_type_type(typ)){
 assert(is_uniquerep_Type(typ));
 // replace T::Type{T} with T, by assuming that T must be a leaftype of some sort
-jl_cgval_tconstant(NULL, true, typ, NULL, best_tbaa(ctx.tbaa(), typ), None);
+jl_cgval_tconstant(NULL, true, typ, NULL, best_tbaa(ctx.tbaa(), typ), ArrayRef<Value*>());
  constant.constant = jl_tparam0(typ);
 if (typ == (jl_value_t*)jl_typeofbottom_type->super)
  constant.isghost = true;
@@ -2267,13 +2267,13 @@ static inline jl_cgval_t mark_julia_const(jl_codectx_t &ctx, jl_value_t *jv)
 if (jl_is_datatype_singleton((jl_datatype_t*)typ))
 returnghostValue(ctx, typ);
  }
-jl_cgval_tconstant(NULL, true, typ, NULL, best_tbaa(ctx.tbaa(), typ), None);
+jl_cgval_tconstant(NULL, true, typ, NULL, best_tbaa(ctx.tbaa(), typ), ArrayRef<Value*>());
  constant.constant = jv;
 return constant;
 }
 
 
-staticinlinejl_cgval_tmark_julia_slot(Value *v, jl_value_t *typ, Value *tindex, MDNode *tbaa, ArrayRef<Value*> inline_roots=None)
+staticinlinejl_cgval_tmark_julia_slot(Value *v, jl_value_t *typ, Value *tindex, MDNode *tbaa, ArrayRef<Value*> inline_roots={})
 {
 // this enables lazy-copying of immutable values and stack or argument slots
 jl_cgval_ttagval(v, false, typ, tindex, tbaa, inline_roots);
@@ -2353,7 +2353,7 @@ static inline jl_cgval_t mark_julia_type(jl_codectx_t &ctx, Value *v, bool isbox
 if (type_is_ghost(T))
 returnghostValue(ctx, typ);
 if (isboxed)
-returnjl_cgval_t(v, isboxed, typ, NULL, best_tbaa(ctx.tbaa(), typ), None);
+returnjl_cgval_t(v, isboxed, typ, NULL, best_tbaa(ctx.tbaa(), typ), ArrayRef<Value*>());
 if (v && v->getType()->isAggregateType()){
 // eagerly put this back onto the stack
 // llvm mem2reg pass will remove this if unneeded
@@ -2414,7 +2414,7 @@ static inline jl_cgval_t update_julia_type(jl_codectx_t &ctx, const jl_cgval_t &
 returnjl_cgval_t();
  }
 if (v.Vboxed && (v.isboxed || alwaysboxed)){
-returnjl_cgval_t(v.Vboxed, true, typ, NULL, best_tbaa(ctx.tbaa(), typ), None);
+returnjl_cgval_t(v.Vboxed, true, typ, NULL, best_tbaa(ctx.tbaa(), typ), ArrayRef<Value*>());
  }
  }
 if (!jl_is_concrete_type(typ))
@@ -2529,7 +2529,7 @@ static jl_cgval_t convert_julia_type_to_union(jl_codectx_t &ctx, const jl_cgval_
  }
 elseif (jl_subtype(v.typ, typ)){
 // convert to a simple isboxed value, since it must be boxed in the new union
-returnjl_cgval_t(boxed(ctx, v), true, typ, new_tindex, best_tbaa(ctx.tbaa(), typ), None);
+returnjl_cgval_t(boxed(ctx, v), true, typ, new_tindex, best_tbaa(ctx.tbaa(), typ), ArrayRef<Value*>());
  }
 else{
 if (!allow_mismatch)
@@ -2792,7 +2792,7 @@ static jl_cgval_t convert_julia_type_to_union(jl_codectx_t &ctx, const jl_cgval_
 if (!computed_new_index_early && isa<Constant>(new_tindex)){
 // no new tindex (it is set to UNION_BOX_MARKER), so the new value must be something boxed in the new union
 // TODO: use ret.Vboxed or box_union directly to set skip instead of emitting a trap?
-returnjl_cgval_t(boxed(ctx, v), true, typ, new_tindex, best_tbaa(ctx.tbaa(), typ), None);
+returnjl_cgval_t(boxed(ctx, v), true, typ, new_tindex, best_tbaa(ctx.tbaa(), typ), ArrayRef<Value*>());
  }
 // some of the values are still unboxed
 setName(ctx.emission_context, new_tindex, "tindex");
@@ -5770,7 +5770,7 @@ static jl_cgval_t emit_varinfo(jl_codectx_t &ctx, jl_varinfo_t &vi, jl_sym_t *va
  Value *tindex = NULL;
 if (vi.pTIndex)
  tindex = ctx.builder.CreateAlignedLoad(getInt8Ty(ctx.builder.getContext()), vi.pTIndex, Align(1), vi.isVolatile);
- v = mark_julia_slot(ssaslot, vi.value.typ, tindex, ctx.tbaa().tbaa_stack, None);
+ v = mark_julia_slot(ssaslot, vi.value.typ, tindex, ctx.tbaa().tbaa_stack);
  }
 if (vi.inline_roots){
  AllocaInst *varslot = vi.inline_roots;
@@ -6734,7 +6734,7 @@ static jl_cgval_t emit_expr(jl_codectx_t &ctx, jl_value_t *expr, ssize_t ssaidx_
  SmallVector<Metadata *, 8> MDs;
 
 // Reserve first location for self reference to the LoopID metadata node.
- TempMDTuple TempNode = MDNode::getTemporary(ctx.builder.getContext(), None);
+ TempMDTuple TempNode = MDNode::getTemporary(ctx.builder.getContext(), {});
  MDs.push_back(TempNode.get());
 
 for (int i = 0, ie = nargs; i < ie; ++i){
@@ -8799,7 +8799,7 @@ static jl_llvm_functions_t
  AllocaInst *roots = sizes.second > 0 ? emit_static_roots(ctx, sizes.second) : nullptr;
 if (bits) bits->setName(jl_symbol_name(s));
 if (roots) roots->setName(StringRef(".roots.") + jl_symbol_name(s));
- varinfo.value = mark_julia_slot(bits, jt, NULL, ctx.tbaa().tbaa_stack, None);
+ varinfo.value = mark_julia_slot(bits, jt, NULL, ctx.tbaa().tbaa_stack, {});
  varinfo.inline_roots = roots;
  varinfo.inline_roots_count = sizes.second;
 alloc_def_flag(ctx, varinfo);

src/llvm-codegen-shared.h

@@ -158,7 +158,7 @@ static inline llvm::Instruction *tbaa_decorate(llvm::MDNode *md, llvm::Instructi
 usingnamespacellvm;
  inst->setMetadata(llvm::LLVMContext::MD_tbaa, md);
 if (llvm::isa<llvm::LoadInst>(inst) && md && md == get_tbaa_const(md->getContext())){
- inst->setMetadata(llvm::LLVMContext::MD_invariant_load, llvm::MDNode::get(md->getContext(), std::nullopt));
+ inst->setMetadata(llvm::LLVMContext::MD_invariant_load, llvm::MDNode::get(md->getContext(), {}));
  }
 return inst;
 }

src/llvm-late-gc-lowering.cpp

@@ -2198,7 +2198,7 @@ bool LateLowerGCFrame::CleanupIR(Function &F, State *S, bool *CFGModified){
  } else{
 // remove all operand bundles
 #if JL_LLVM_VERSION >= 200000
- CallInst *NewCall = CallInst::Create(CI, None, CI->getIterator());
+ CallInst *NewCall = CallInst::Create(CI, {}, CI->getIterator());
 #else
  CallInst *NewCall = CallInst::Create(CI, None, CI);
 #endif