Skip to content

Commit

Permalink
Minimal changes needed to un-break package version of sprofile
Browse files Browse the repository at this point in the history
Until #2597 gets resolved, at least these changes are needed for the
0.2 branch of the package to work.
  • Loading branch information
timholy committed Mar 20, 2013
1 parent 5961203 commit 8e1eb44
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion base/repl.jl
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function show_backtrace(io::IO, t)
:(:) #for when client.jl is not yet defined
end
for i = 1:length(t)
lkup = ccall(:jl_lookup_code_address, Any, (Ptr{Void},), t[i])
lkup = ccall(:jl_lookup_code_address, Any, (Ptr{Void}, Bool), t[i], false)
if lkup === ()
continue
end
Expand Down
4 changes: 2 additions & 2 deletions src/task.c
Original file line number Diff line number Diff line change
Expand Up @@ -528,12 +528,12 @@ DLLEXPORT jl_value_t *jl_backtrace_from_here(void)
return (jl_value_t*)bt;
}

DLLEXPORT jl_value_t *jl_lookup_code_address(void *ip)
DLLEXPORT jl_value_t *jl_lookup_code_address(void *ip, int doCframes)
{
const char *func_name;
int line_num;
const char *file_name;
(void)frame_info_from_ip(&func_name, &line_num, &file_name, (size_t)ip, 0);
(void)frame_info_from_ip(&func_name, &line_num, &file_name, (size_t)ip, doCframes);
if (func_name != NULL) {
jl_value_t *r = (jl_value_t*)jl_alloc_tuple(3);
JL_GC_PUSH(&r);
Expand Down

0 comments on commit 8e1eb44

Please sign in to comment.