Skip to content

Commit

Permalink
Two LLVM 3.5 fixes
Browse files Browse the repository at this point in the history
- Add forgotten prepare call. Fixes GiovineItalia/Gadfly.jl#368
- Remove an unused variable to silence compiler warning
  • Loading branch information
Keno committed Jul 20, 2014
1 parent 6d424ce commit 3b02d5c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion src/cgutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ static void emit_typecheck(Value *x, jl_value_t *type, const std::string &msg,
if ((jl_is_tuple(type) && type != (jl_value_t*)jl_tuple_type) ||
!jl_is_leaf_type(type)) {
istype = builder.
CreateICmpNE(builder.CreateCall3(jlsubtype_func, x, literal_pointer_val(type),
CreateICmpNE(builder.CreateCall3(prepare_call(jlsubtype_func), x, literal_pointer_val(type),
ConstantInt::get(T_int32,1)),
ConstantInt::get(T_int32,0));
}
Expand Down
1 change: 0 additions & 1 deletion src/debuginfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,6 @@ void jl_getFunctionInfo(const char **name, int *line, const char **filename, siz
// With MCJIT we can get function information directly from the ObjectFile
std::map<size_t, ObjectInfo, revcomp> &objmap = jl_jit_events->getObjectMap();
std::map<size_t, ObjectInfo, revcomp>::iterator it = objmap.lower_bound(pointer);
llvm::object::ObjectFile *Obj = it->second.object;

if (it == objmap.end())
return jl_getDylibFunctionInfo(name,line,filename,pointer,skipC);
Expand Down

0 comments on commit 3b02d5c

Please sign in to comment.