Merge pull request JuliaLang#9581 from JuliaLang/teh/user_code

More robust detection of user code
jiahao · Jan 4, 2015 · 6331ea3 · 6331ea3
2 parents d8a1363 + 0dcaba4
commit 6331ea3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -3734,7 +3734,7 @@ static Function *emit_function(jl_lambda_info_t *lam, bool cstyle)
  ctx.f = f;
 
  // step 5. set up debug info context and create first basic block
- bool in_user_code = lam->module != jl_base_module && lam->module != jl_core_module;
+ bool in_user_code = !is_submodule(jl_base_module, lam->module);
  bool do_coverage = jl_compileropts.code_coverage == JL_LOG_ALL || (jl_compileropts.code_coverage == JL_LOG_USER && in_user_code);
  bool do_malloc_log = jl_compileropts.malloc_log == JL_LOG_ALL || (jl_compileropts.malloc_log == JL_LOG_USER && in_user_code);
  jl_value_t *stmt = jl_cellref(stmts,0);

diff --git a/src/dump.c b/src/dump.c
@@ -338,7 +338,7 @@ static void jl_update_all_fptrs()
  delayed_fptrs = NULL;
 }
 
-static int is_submodule(jl_module_t *parent, jl_module_t *child)
+int is_submodule(jl_module_t *parent, jl_module_t *child)
 {
  while (1) {
  if (parent == child)

diff --git a/src/julia.h b/src/julia.h
@@ -806,6 +806,7 @@ STATIC_INLINE jl_function_t *jl_get_function(jl_module_t *m, const char *name)
 }
 DLLEXPORT void jl_module_run_initializer(jl_module_t *m);
 jl_function_t *jl_module_call_func(jl_module_t *m);
+int is_submodule(jl_module_t *parent, jl_module_t *child);
 
 // eq hash tables
 DLLEXPORT jl_array_t *jl_eqtable_put(jl_array_t *h, void *key, void *val);