Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid undefined checks for fields that are always initialized #8827

Merged
merged 2 commits into from
Nov 10, 2014
Merged

Avoid undefined checks for fields that are always initialized #8827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de35c73
Avoid undefined checks for types that are always fully initialized
simonster Oct 27, 2014
2740bc8
Keep track of number of initialized fields and avoid undefined checks
simonster Oct 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ jl_typename_t *jl_new_typename(jl_sym_t *name)
jl_datatype_t *jl_new_abstracttype(jl_value_t *name, jl_datatype_t *super,
jl_tuple_t *parameters)
{
jl_datatype_t *dt = jl_new_datatype((jl_sym_t*)name, super, parameters, jl_null, jl_null, 1, 0);
jl_datatype_t *dt = jl_new_datatype((jl_sym_t*)name, super, parameters, jl_null, jl_null, 1, 0, 0);
dt->pointerfree = 0;
return dt;
}
Expand Down Expand Up @@ -638,7 +638,7 @@ extern int jl_boot_file_loaded;
jl_datatype_t *jl_new_datatype(jl_sym_t *name, jl_datatype_t *super,
jl_tuple_t *parameters,
jl_tuple_t *fnames, jl_tuple_t *ftypes,
int abstract, int mutabl)
int abstract, int mutabl, int ninitialized)
{
jl_datatype_t *t=NULL;
jl_typename_t *tn=NULL;
Expand Down Expand Up @@ -667,6 +667,7 @@ jl_datatype_t *jl_new_datatype(jl_sym_t *name, jl_datatype_t *super,
t->abstract = abstract;
t->mutabl = mutabl;
t->pointerfree = 0;
t->ninitialized = ninitialized;
t->instance = NULL;
t->struct_decl = NULL;
t->size = 0;
Expand Down Expand Up @@ -700,7 +701,7 @@ jl_datatype_t *jl_new_bitstype(jl_value_t *name, jl_datatype_t *super,
jl_tuple_t *parameters, size_t nbits)
{
jl_datatype_t *bt = jl_new_datatype((jl_sym_t*)name, super, parameters,
jl_null, jl_null, 0, 0);
jl_null, jl_null, 0, 0, 0);
bt->size = nbits/8;
bt->alignment = bt->size;
if (bt->alignment > MAX_ALIGN)
Expand Down
10 changes: 7 additions & 3 deletions src/codegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,7 +1489,9 @@ static Value *emit_getfield(jl_value_t *expr, jl_sym_t *name, jl_codectx_t *ctx)
JL_GC_POP();
if (sty->fields[idx].isptr) {
Value *fldv = builder.CreateLoad(builder.CreateBitCast(addr,jl_ppvalue_llvmt));
null_pointer_check(fldv, ctx);
if (idx >= sty->ninitialized) {
null_pointer_check(fldv, ctx);
}
return fldv;
}
else {
Expand All @@ -1512,7 +1514,7 @@ static Value *emit_getfield(jl_value_t *expr, jl_sym_t *name, jl_codectx_t *ctx)
if (jfty == (jl_value_t*)jl_bool_type) {
fldv = builder.CreateTrunc(fldv, T_int1);
}
else if (sty->fields[idx].isptr) {
else if (sty->fields[idx].isptr && idx >= sty->ninitialized) {
null_pointer_check(fldv, ctx);
}
JL_GC_POP();
Expand Down Expand Up @@ -2142,7 +2144,9 @@ static Value *emit_known_call(jl_value_t *ff, jl_value_t **args, size_t nargs,
CreateGEP(builder.
CreateBitCast(strct, jl_ppvalue_llvmt),
builder.CreateAdd(idx,ConstantInt::get(T_size,1)))));
null_pointer_check(fld, ctx);
if (stt->ninitialized != jl_tuple_len(stt->types)) {
null_pointer_check(fld, ctx);
}
JL_GC_POP();
return fld;
}
Expand Down
18 changes: 13 additions & 5 deletions src/dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,12 @@ static void jl_serialize_datatype(ios_t *s, jl_datatype_t *dt)
write_int32(s, dt->size);
int has_instance = !!(dt->instance != NULL);
write_uint8(s, dt->abstract | (dt->mutabl<<1) | (dt->pointerfree<<2) | (has_instance<<3));
if (!dt->abstract && mode != MODE_MODULE && mode != MODE_MODULE_LAMBDAS)
write_int32(s, dt->uid);
if (!dt->abstract) {
write_uint16(s, dt->ninitialized);
if (mode != MODE_MODULE && mode != MODE_MODULE_LAMBDAS) {
write_int32(s, dt->uid);
}
}
if (has_instance)
jl_serialize_value(s, dt->instance);
if (nf > 0) {
Expand Down Expand Up @@ -824,10 +828,14 @@ static jl_value_t *jl_deserialize_datatype(ios_t *s, int pos, jl_value_t **loc)
dt->abstract = flags&1;
dt->mutabl = (flags>>1)&1;
dt->pointerfree = (flags>>2)&1;
if (!dt->abstract && mode != MODE_MODULE && mode != MODE_MODULE_LAMBDAS)
dt->uid = read_int32(s);
else
if (!dt->abstract) {
dt->ninitialized = read_uint16(s);
dt->uid = mode != MODE_MODULE && mode != MODE_MODULE_LAMBDAS ? read_int32(s) : 0;
}
else {
dt->ninitialized = 0;
dt->uid = 0;
}
int has_instance = (flags>>3)&1;
if (has_instance) {
dt->instance = jl_deserialize_value(s, &dt->instance);
Expand Down
2 changes: 1 addition & 1 deletion src/interpreter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ static jl_value_t *eval(jl_value_t *e, jl_value_t **locals, size_t nl)
temp = eval(args[2], locals, nl); // field names
dt = jl_new_datatype((jl_sym_t*)name, jl_any_type, (jl_tuple_t*)para,
(jl_tuple_t*)temp, NULL,
0, args[5]==jl_true ? 1 : 0);
0, args[5]==jl_true ? 1 : 0, jl_unbox_long(args[6]));

jl_binding_t *b = jl_get_binding_wr(jl_current_module, (jl_sym_t*)name);
temp = b->value; // save old value
Expand Down
42 changes: 24 additions & 18 deletions src/jltypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1991,6 +1991,7 @@ static jl_value_t *inst_type_w_(jl_value_t *t, jl_value_t **env, size_t n,
if (tn == jl_array_typename)
ndt->pointerfree = 0;
}
ndt->ninitialized = dt->ninitialized;
if (cacheable) cache_type_((jl_value_t*)ndt);
result = (jl_value_t*)ndt;

Expand Down Expand Up @@ -2926,6 +2927,7 @@ void jl_init_types(void)
// NOTE: types should not really be mutable, but the instance and
// struct_decl fields are basically caches, which are mutated.
jl_datatype_type->mutabl = 1;
jl_datatype_type->ninitialized = 0;

jl_typename_type->name = jl_new_typename(jl_symbol("TypeName"));
jl_typename_type->name->primary = (jl_value_t*)jl_typename_type;
Expand All @@ -2941,6 +2943,7 @@ void jl_init_types(void)
jl_typename_type->abstract = 0;
jl_typename_type->pointerfree = 0;
jl_typename_type->mutabl = 1;
jl_typename_type->ninitialized = 0;

jl_sym_type->name = jl_new_typename(jl_symbol("Symbol"));
jl_sym_type->name->primary = (jl_value_t*)jl_sym_type;
Expand All @@ -2955,18 +2958,19 @@ void jl_init_types(void)
jl_sym_type->abstract = 0;
jl_sym_type->pointerfree = 0;
jl_sym_type->mutabl = 1;
jl_sym_type->ninitialized = 0;

// now they can be used to create the remaining base kinds and types
jl_void_type = jl_new_datatype(jl_symbol("Void"), jl_any_type, jl_null,
jl_null, jl_null, 0, 0);
jl_null, jl_null, 0, 0, 0);
jl_nothing = newstruct(jl_void_type);
jl_void_type->instance = jl_nothing;

jl_uniontype_type = jl_new_datatype(jl_symbol("UnionType"),
jl_type_type, jl_null,
jl_tuple(1, jl_symbol("types")),
jl_tuple(1, jl_tuple_type),
0, 0);
0, 0, 0);

jl_bottom_type = (jl_value_t*)jl_new_struct(jl_uniontype_type, jl_null);

Expand All @@ -2977,7 +2981,7 @@ void jl_init_types(void)
jl_symbol("bound")),
jl_tuple(4, jl_sym_type, jl_type_type,
jl_type_type, jl_any_type),
0, 0);
0, 0, 0);

jl_undef_type = jl_new_abstracttype((jl_value_t*)jl_symbol("Undef"),
jl_any_type, jl_null);
Expand Down Expand Up @@ -3030,7 +3034,7 @@ void jl_init_types(void)
jl_tuple(7, jl_tuple_type, jl_bool_type, jl_bool_type,
jl_tuple_type, jl_any_type,
jl_any_type, jl_any_type),
0, 1);
0, 1, 0);

jl_methtable_type =
jl_new_datatype(jl_symbol("MethodTable"), jl_any_type, jl_null,
Expand All @@ -3041,7 +3045,7 @@ void jl_init_types(void)
jl_tuple(7, jl_sym_type, jl_any_type, jl_any_type,
jl_any_type, jl_any_type, jl_long_type,
jl_any_type),
0, 1);
0, 1, 0);

tv = jl_tuple2(tvar("T"), tvar("N"));
jl_abstractarray_type =
Expand All @@ -3062,9 +3066,10 @@ void jl_init_types(void)
(jl_datatype_t*)
jl_apply_type((jl_value_t*)jl_densearray_type, tv),
tv,
jl_null, jl_null, 0, 1);
jl_null, jl_null, 0, 1, 0);
jl_array_typename = jl_array_type->name;
jl_array_type->pointerfree = 0;
jl_array_type->ninitialized = 0;

jl_array_any_type =
(jl_value_t*)jl_apply_type((jl_value_t*)jl_array_type,
Expand All @@ -3083,42 +3088,42 @@ void jl_init_types(void)
jl_symbol("typ")),
jl_tuple(3, jl_sym_type, jl_array_any_type,
jl_any_type),
0, 1);
0, 1, 0);

jl_linenumbernode_type =
jl_new_datatype(jl_symbol("LineNumberNode"), jl_any_type, jl_null,
jl_tuple(1, jl_symbol("line")),
jl_tuple(1, jl_long_type), 0, 0);
jl_tuple(1, jl_long_type), 0, 0, 1);

jl_labelnode_type =
jl_new_datatype(jl_symbol("LabelNode"), jl_any_type, jl_null,
jl_tuple(1, jl_symbol("label")),
jl_tuple(1, jl_long_type), 0, 0);
jl_tuple(1, jl_long_type), 0, 0, 1);

jl_gotonode_type =
jl_new_datatype(jl_symbol("GotoNode"), jl_any_type, jl_null,
jl_tuple(1, jl_symbol("label")),
jl_tuple(1, jl_long_type), 0, 0);
jl_tuple(1, jl_long_type), 0, 0, 1);

jl_quotenode_type =
jl_new_datatype(jl_symbol("QuoteNode"), jl_any_type, jl_null,
jl_tuple(1, jl_symbol("value")),
jl_tuple(1, jl_any_type), 0, 0);
jl_tuple(1, jl_any_type), 0, 0, 0);

jl_newvarnode_type =
jl_new_datatype(jl_symbol("NewvarNode"), jl_any_type, jl_null,
jl_tuple(1, jl_symbol("name")),
jl_tuple(1, jl_sym_type), 0, 0);
jl_tuple(1, jl_sym_type), 0, 0, 0);

jl_topnode_type =
jl_new_datatype(jl_symbol("TopNode"), jl_any_type, jl_null,
jl_tuple(1, jl_symbol("name")),
jl_tuple(1, jl_sym_type), 0, 0);
jl_tuple(1, jl_sym_type), 0, 0, 0);

jl_module_type =
jl_new_datatype(jl_symbol("Module"), jl_any_type, jl_null,
jl_tuple(2, jl_symbol("name"), jl_symbol("parent")),
jl_tuple(2, jl_sym_type, jl_any_type), 0, 1);
jl_tuple(2, jl_sym_type, jl_any_type), 0, 1, 0);

jl_tupleset(jl_typename_type->types, 1, jl_module_type);

Expand All @@ -3144,13 +3149,13 @@ void jl_init_types(void)
jl_any_type,
jl_sym_type, jl_int32_type,
jl_bool_type),
0, 1);
0, 1, 0);

jl_box_type =
jl_new_datatype(jl_symbol("Box"),
jl_any_type, jl_null,
jl_tuple(1, jl_symbol("contents")),
jl_tuple(1, jl_any_type), 0, 1);
jl_tuple(1, jl_any_type), 0, 1, 0);
jl_box_typename = jl_box_type->name;
jl_box_any_type = (jl_value_t*)jl_box_type;

Expand All @@ -3160,15 +3165,15 @@ void jl_init_types(void)
jl_tuple(2, jl_symbol("parameters"),
jl_symbol("body")),
jl_tuple(2, jl_tuple_type, jl_any_type),
0, 0);
0, 0, 0);

jl_function_type =
jl_new_datatype(jl_symbol("Function"), jl_any_type, jl_null,
jl_tuple(3, jl_symbol("fptr"), jl_symbol("env"),
jl_symbol("code")),
jl_tuple(3, jl_any_type, jl_any_type,
jl_lambda_info_type),
0, 1);
0, 1, 0);

jl_tupleset(jl_method_type->types, 3, jl_function_type);
jl_tupleset(jl_lambda_info_type->types, 6, jl_function_type);
Expand Down Expand Up @@ -3199,6 +3204,7 @@ void jl_init_types(void)
jl_tupleset(jl_datatype_type->types, 7, (jl_value_t*)jl_bool_type);
jl_tupleset(jl_datatype_type->types, 8, (jl_value_t*)jl_bool_type);
jl_tupleset(jl_datatype_type->types, 9, (jl_value_t*)jl_bool_type);
//jl_tupleset(jl_datatype_type->types, 10, jl_int32_type);
jl_tupleset(jl_function_type->types, 0, pointer_void);
jl_tupleset(jl_tvar_type->types, 3, (jl_value_t*)jl_bool_type);

Expand Down
20 changes: 17 additions & 3 deletions src/julia-syntax.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,19 @@
(ctor-def 'function name Tname params bounds '() sig ctor-body body)))
ctor))

;; check if there are any calls to new with fewer than n arguments
(define (ctors-min-initialized expr)
(and (pair? expr)
(min
((pattern-lambda
(call (-/ new) . args)
(length args)) (car expr))
((pattern-lambda
(call (curly (-/ new) . p) . args)
(length args)) (car expr))
(ctors-min-initialized (car expr))
(ctors-min-initialized (cdr expr)))))

;; remove line numbers and nested blocks
(define (flatten-blocks e)
(if (atom? e)
Expand All @@ -876,7 +889,8 @@
(field-types (map decl-type fields))
(defs2 (if (null? defs)
(default-inner-ctors name field-names field-types (null? params))
defs)))
defs))
(min-initialized (min (ctors-min-initialized defs) (length fields))))
(for-each (lambda (v)
(if (not (symbol? v))
(error (string "field name \"" (deparse v) "\" is not a symbol"))))
Expand All @@ -886,7 +900,7 @@
(global ,name) (const ,name)
(composite_type ,name (tuple ,@params)
(tuple ,@(map (lambda (x) `',x) field-names))
,super (tuple ,@field-types) ,mut)
,super (tuple ,@field-types) ,mut ,min-initialized)
(call
(lambda ()
(scope-block
Expand All @@ -905,7 +919,7 @@
,@(map make-assignment params (symbols->typevars params bounds #t))
(composite_type ,name (tuple ,@params)
(tuple ,@(map (lambda (x) `',x) field-names))
,super (tuple ,@field-types) ,mut)))
,super (tuple ,@field-types) ,mut ,min-initialized)))
;; "inner" constructors
(call
(lambda ()
Expand Down
3 changes: 2 additions & 1 deletion src/julia.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ typedef struct _jl_datatype_t {
uint8_t mutabl;
uint8_t pointerfree;
// hidden fields:
int32_t ninitialized;
uint32_t alignment; // strictest alignment over all fields
uint32_t uid;
void *struct_decl; //llvm::Value*
Expand Down Expand Up @@ -625,7 +626,7 @@ DLLEXPORT jl_datatype_t *jl_new_uninitialized_datatype(size_t nfields);
DLLEXPORT jl_datatype_t *jl_new_datatype(jl_sym_t *name, jl_datatype_t *super,
jl_tuple_t *parameters,
jl_tuple_t *fnames, jl_tuple_t *ftypes,
int abstract, int mutabl);
int abstract, int mutabl, int ninitialized);
DLLEXPORT jl_datatype_t *jl_new_bitstype(jl_value_t *name, jl_datatype_t *super,
jl_tuple_t *parameters, size_t nbits);
jl_datatype_t *jl_wrap_Type(jl_value_t *t); // x -> Type{x}
Expand Down
2 changes: 1 addition & 1 deletion src/task.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ void jl_init_tasks(void *stack, size_t ssize)
jl_any_type, jl_sym_type,
jl_any_type, jl_any_type,
jl_any_type, jl_any_type, jl_function_type),
0, 1);
0, 1, 0);
jl_tupleset(jl_task_type->types, 0, (jl_value_t*)jl_task_type);

done_sym = jl_symbol("done");
Expand Down