Skip to content

Commit

Permalink
Remove tbaa_decorate from load/stores of local vars described by jl_a…
Browse files Browse the repository at this point in the history
…rrayvar_t.
  • Loading branch information
Arch D. Robison committed Mar 26, 2014
1 parent 34916cf commit fb35af0
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/cgutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,7 @@ static Value *emit_arraylen(Value *t, jl_value_t *ex, jl_codectx_t *ctx)
{
jl_arrayvar_t *av = arrayvar_for(ex, ctx);
if (av!=NULL)
return tbaa_decorate(tbaa_arraylen, builder.CreateLoad(av->len));
return builder.CreateLoad(av->len);
return emit_arraylen_prim(t, expr_type(ex,ctx));
}

Expand All @@ -1298,15 +1298,15 @@ static Value *emit_arrayptr(Value *t, jl_value_t *ex, jl_codectx_t *ctx)
{
jl_arrayvar_t *av = arrayvar_for(ex, ctx);
if (av!=NULL)
return tbaa_decorate(tbaa_arrayptr, builder.CreateLoad(av->dataptr));
return builder.CreateLoad(av->dataptr);
return emit_arrayptr(t);
}

static Value *emit_arraysize(Value *t, jl_value_t *ex, int dim, jl_codectx_t *ctx)
{
jl_arrayvar_t *av = arrayvar_for(ex, ctx);
if (av != NULL && dim <= (int)av->sizes.size())
return tbaa_decorate(tbaa_arraysize, builder.CreateLoad(av->sizes[dim-1]));
return builder.CreateLoad(av->sizes[dim-1]);
return emit_arraysize(t, dim);
}

Expand All @@ -1315,9 +1315,9 @@ static void assign_arrayvar(jl_arrayvar_t &av, Value *ar)
tbaa_decorate(tbaa_arrayptr,builder.CreateStore(builder.CreateBitCast(emit_arrayptr(ar),
av.dataptr->getType()->getContainedType(0)),
av.dataptr));
tbaa_decorate(tbaa_arraylen,builder.CreateStore(emit_arraylen_prim(ar, av.ty), av.len));
builder.CreateStore(emit_arraylen_prim(ar, av.ty), av.len);
for(size_t i=0; i < av.sizes.size(); i++)
tbaa_decorate(tbaa_user, builder.CreateStore(emit_arraysize(ar,i+1), av.sizes[i]));
builder.CreateStore(emit_arraysize(ar,i+1), av.sizes[i]);
}

static Value *data_pointer(Value *x)
Expand Down

0 comments on commit fb35af0

Please sign in to comment.