Skip to content

Commit 1b4f67f

Browse files
vtjnashvtjnash
committed
delete unused code from simplevector
Circa #45062 and #46975
1 parent 2949dd5 commit 1b4f67f

File tree

10 files changed

+11
-79
lines changed

10 files changed

+11
-79
lines changed

‎src/builtins.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ static inline size_t get_checked_fieldindex(const char *name, jl_datatype_t *st,
998998
}
999999
if (mutabl && jl_field_isconst(st, idx)) {
10001000
jl_errorf("%s: const field .%s of type %s cannot be changed", name,
1001-
jl_symbol_name((jl_sym_t*)jl_svec_ref(jl_field_names(st), idx)), jl_symbol_name(st->name->name));
1001+
jl_symbol_name((jl_sym_t*)jl_svecref(jl_field_names(st), idx)), jl_symbol_name(st->name->name));
10021002
}
10031003
return idx;
10041004
}
@@ -1767,7 +1767,7 @@ JL_CALLABLE(jl_f__svec_ref)
17671767
if (idx < 1 || idx > len) {
17681768
jl_bounds_error_int((jl_value_t*)s, idx);
17691769
}
1770-
return jl_svec_ref(s, idx-1);
1770+
return jl_svecref(s, idx-1);
17711771
}
17721772

17731773
static int equiv_field_types(jl_value_t *old, jl_value_t *ft)

‎src/ccall.cpp‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ TRANSFORMED_CCALL_STAT(jl_get_current_task);
2727
TRANSFORMED_CCALL_STAT(jl_set_next_task);
2828
TRANSFORMED_CCALL_STAT(jl_sigatomic_begin);
2929
TRANSFORMED_CCALL_STAT(jl_sigatomic_end);
30-
TRANSFORMED_CCALL_STAT(jl_svec_len);
31-
TRANSFORMED_CCALL_STAT(jl_svec_ref);
3230
TRANSFORMED_CCALL_STAT(jl_string_ptr);
3331
TRANSFORMED_CCALL_STAT(jl_symbol_name);
3432
TRANSFORMED_CCALL_STAT(jl_genericmemory_owner);
@@ -1685,61 +1683,6 @@ static jl_cgval_t emit_ccall(jl_codectx_t &ctx, jl_value_t **args, size_t nargs)
16851683
ctx.builder.SetInsertPoint(contBB);
16861684
return ghostValue(ctx, jl_nothing_type);
16871685
}
1688-
else if (is_libjulia_func(jl_svec_len)) {
1689-
++CCALL_STAT(jl_svec_len);
1690-
assert(!isVa && !llvmcall && nccallargs == 1);
1691-
const jl_cgval_t &svecv = argv[0];
1692-
Value *len;
1693-
if (svecv.constant && svecv.typ == (jl_value_t*)jl_simplevector_type) {
1694-
// Check the type as well before we call
1695-
len = ConstantInt::get(ctx.types().T_size, jl_svec_len(svecv.constant));
1696-
}
1697-
else {
1698-
auto ptr = emit_bitcast(ctx, boxed(ctx, svecv), ctx.types().T_size->getPointerTo());
1699-
setName(ctx.emission_context, ptr, "svec_len_ptr");
1700-
len = ctx.builder.CreateAlignedLoad(ctx.types().T_size, ptr, ctx.types().alignof_ptr);
1701-
setName(ctx.emission_context, len, "svec_len");
1702-
// Only mark with TBAA if we are sure about the type.
1703-
// This could otherwise be in a dead branch
1704-
if (svecv.typ == (jl_value_t*)jl_simplevector_type) {
1705-
jl_aliasinfo_t ai = jl_aliasinfo_t::fromTBAA(ctx, ctx.tbaa().tbaa_const);
1706-
ai.decorateInst(cast<Instruction>(len));
1707-
}
1708-
MDBuilder MDB(ctx.builder.getContext());
1709-
auto rng = MDB.createRange(
1710-
Constant::getNullValue(ctx.types().T_size), ConstantInt::get(ctx.types().T_size, INTPTR_MAX / sizeof(void*) - 1));
1711-
cast<LoadInst>(len)->setMetadata(LLVMContext::MD_range, rng);
1712-
}
1713-
JL_GC_POP();
1714-
return mark_or_box_ccall_result(ctx, len, retboxed, rt, unionall, static_rt);
1715-
}
1716-
else if (is_libjulia_func(jl_svec_ref) && argv[1].typ == (jl_value_t*)jl_long_type) {
1717-
++CCALL_STAT(jl_svec_ref);
1718-
assert(lrt == ctx.types().T_prjlvalue);
1719-
assert(!isVa && !llvmcall && nccallargs == 2);
1720-
const jl_cgval_t &svecv = argv[0];
1721-
const jl_cgval_t &idxv = argv[1];
1722-
Value *idx = emit_unbox(ctx, ctx.types().T_size, idxv, (jl_value_t*)jl_long_type);
1723-
idx = ctx.builder.CreateAdd(idx, ConstantInt::get(ctx.types().T_size, 1));
1724-
setName(ctx.emission_context, idx, "svec_idx");
1725-
auto ptr = emit_bitcast(ctx, boxed(ctx, svecv), ctx.types().T_pprjlvalue);
1726-
setName(ctx.emission_context, ptr, "svec_data_ptr");
1727-
Value *slot_addr = ctx.builder.CreateInBoundsGEP(ctx.types().T_prjlvalue,
1728-
decay_derived(ctx, ptr), idx);
1729-
setName(ctx.emission_context, slot_addr, "svec_slot_addr");
1730-
LoadInst *load = ctx.builder.CreateAlignedLoad(ctx.types().T_prjlvalue, slot_addr,
1731-
Align(sizeof(void*)));
1732-
setName(ctx.emission_context, load, "svec_slot");
1733-
load->setAtomic(AtomicOrdering::Unordered);
1734-
// Only mark with TBAA if we are sure about the type.
1735-
// This could otherwise be in a dead branch
1736-
if (svecv.typ == (jl_value_t*)jl_simplevector_type) {
1737-
jl_aliasinfo_t ai = jl_aliasinfo_t::fromTBAA(ctx, ctx.tbaa().tbaa_const);
1738-
ai.decorateInst(load);
1739-
}
1740-
JL_GC_POP();
1741-
return mark_or_box_ccall_result(ctx, load, retboxed, rt, unionall, static_rt);
1742-
}
17431686
else if (is_libjulia_func(jl_string_ptr)) {
17441687
++CCALL_STAT(jl_string_ptr);
17451688
assert(lrt == ctx.types().T_size);

‎src/codegen.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ void setNameWithField(jl_codegen_params_t &params, Value *V, std::function<Strin
211211
} else {
212212
auto flds = jl_field_names(jt);
213213
if (idx < jl_svec_len(flds)) {
214-
auto name = jl_svec_ref(flds, idx);
214+
auto name = jl_svecref(flds, idx);
215215
assert(jl_is_symbol(name));
216216
V->setName(Twine(GetObjName()) + "." + Twine(jl_symbol_name((jl_sym_t*)name)) + suffix);
217217
return;
@@ -3521,7 +3521,7 @@ static bool emit_f_opfield(jl_codectx_t &ctx, jl_cgval_t *ret, jl_value_t *f,
35213521
}
35223522
else if (jl_field_isconst(uty, idx)) {
35233523
std::string msg = fname + ": const field ."
3524-
+ std::string(jl_symbol_name((jl_sym_t*)jl_svec_ref(jl_field_names(uty), idx)))
3524+
+ std::string(jl_symbol_name((jl_sym_t*)jl_svecref(jl_field_names(uty), idx)))
35253525
+ " of type "
35263526
+ std::string(jl_symbol_name(uty->name->name))
35273527
+ " cannot be changed";

‎src/gf.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ int foreach_mtable_in_module(
565565
{
566566
jl_svec_t *table = jl_atomic_load_relaxed(&m->bindings);
567567
for (size_t i = 0; i < jl_svec_len(table); i++) {
568-
jl_binding_t *b = (jl_binding_t*)jl_svec_ref(table, i);
568+
jl_binding_t *b = (jl_binding_t*)jl_svecref(table, i);
569569
if ((void*)b == jl_nothing)
570570
break;
571571
jl_sym_t *name = b->globalref->name;

‎src/jl_exported_funcs.inc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,6 @@
445445
XX(jl_svec2) \
446446
XX(jl_svec_copy) \
447447
XX(jl_svec_fill) \
448-
XX(jl_svec_ref) \
449448
XX(jl_switch) \
450449
XX(jl_switchto) \
451450
XX(jl_symbol) \

‎src/julia_internal.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,10 +1498,6 @@ void typemap_slurp_search(jl_typemap_entry_t *ml, struct typemap_intersection_en
14981498

14991499
// -- simplevector.c -- //
15001500

1501-
// For codegen only.
1502-
JL_DLLEXPORT size_t (jl_svec_len)(jl_svec_t *t) JL_NOTSAFEPOINT;
1503-
JL_DLLEXPORT jl_value_t *jl_svec_ref(jl_svec_t *t JL_PROPAGATES_ROOT, ssize_t i);
1504-
15051501
// check whether the specified number of arguments is compatible with the
15061502
// specified number of parameters of the tuple type
15071503
JL_DLLEXPORT int jl_tupletype_length_compat(jl_value_t *v, size_t nargs) JL_NOTSAFEPOINT;

‎src/module.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// This file is a part of Julia. License is MIT: https://julialang.org/license
2+
//
23

34
/*
45
modules and top-level bindings
@@ -641,7 +642,7 @@ JL_DLLEXPORT void jl_module_using(jl_module_t *to, jl_module_t *from)
641642
// silently override a "using" name. see issue #2054.
642643
jl_svec_t *table = jl_atomic_load_relaxed(&from->bindings);
643644
for (size_t i = 0; i < jl_svec_len(table); i++) {
644-
jl_binding_t *b = (jl_binding_t*)jl_svec_ref(table, i);
645+
jl_binding_t *b = (jl_binding_t*)jl_svecref(table, i);
645646
if ((void*)b == jl_nothing)
646647
break;
647648
if (b->exportp && (jl_atomic_load_relaxed(&b->owner) == b || b->imported)) {
@@ -939,7 +940,7 @@ JL_DLLEXPORT jl_value_t *jl_module_names(jl_module_t *m, int all, int imported)
939940
JL_GC_PUSH1(&a);
940941
jl_svec_t *table = jl_atomic_load_relaxed(&m->bindings);
941942
for (size_t i = 0; i < jl_svec_len(table); i++) {
942-
jl_binding_t *b = (jl_binding_t*)jl_svec_ref(table, i);
943+
jl_binding_t *b = (jl_binding_t*)jl_svecref(table, i);
943944
if ((void*)b == jl_nothing)
944945
break;
945946
jl_sym_t *asname = b->globalref->name;
@@ -996,7 +997,7 @@ JL_DLLEXPORT void jl_clear_implicit_imports(jl_module_t *m)
996997
JL_LOCK(&m->lock);
997998
jl_svec_t *table = jl_atomic_load_relaxed(&m->bindings);
998999
for (size_t i = 0; i < jl_svec_len(table); i++) {
999-
jl_binding_t *b = (jl_binding_t*)jl_svec_ref(table, i);
1000+
jl_binding_t *b = (jl_binding_t*)jl_svecref(table, i);
10001001
if ((void*)b == jl_nothing)
10011002
break;
10021003
if (jl_atomic_load_relaxed(&b->owner) && jl_atomic_load_relaxed(&b->owner) != b && !b->imported)

‎src/simplevector.c‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,3 @@ JL_DLLEXPORT size_t (jl_svec_len)(jl_svec_t *t) JL_NOTSAFEPOINT
9696
{
9797
return jl_svec_len(t);
9898
}
99-
100-
JL_DLLEXPORT jl_value_t *jl_svec_ref(jl_svec_t *t JL_PROPAGATES_ROOT, ssize_t i)
101-
{
102-
jl_value_t *v = jl_svecref(t, (size_t)i);
103-
assert(v != NULL);
104-
return v;
105-
}

‎src/staticdata.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ static void jl_queue_module_for_serialization(jl_serializer_state *s, jl_module_
730730
if (jl_options.strip_metadata) {
731731
jl_svec_t *table = jl_atomic_load_relaxed(&m->bindings);
732732
for (size_t i = 0; i < jl_svec_len(table); i++) {
733-
jl_binding_t *b = (jl_binding_t*)jl_svec_ref(table, i);
733+
jl_binding_t *b = (jl_binding_t*)jl_svecref(table, i);
734734
if ((void*)b == jl_nothing)
735735
break;
736736
jl_sym_t *name = b->globalref->name;

‎src/toplevel.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static jl_value_t *jl_eval_module_expr(jl_module_t *parent_module, jl_expr_t *ex
222222
size_t i;
223223
jl_svec_t *table = jl_atomic_load_relaxed(&newm->bindings);
224224
for (size_t i = 0; i < jl_svec_len(table); i++) {
225-
jl_binding_t *b = (jl_binding_t*)jl_svec_ref(table, i);
225+
jl_binding_t *b = (jl_binding_t*)jl_svecref(table, i);
226226
if ((void*)b != jl_nothing) {
227227
// remove non-exported macros
228228
if (jl_symbol_name(b->name)[0]=='@' &&

0 commit comments

Comments
 (0)