re-enable generic RegisterJITEventListener for the Julia OrcJIT

the NonOwningBinary class is a special adaptor that behaves like OwningBinary<object::ObjectFile>,
but which expects to be able to reuse the object file and that ownership will be maintained elsewhere
allowing for getObjectForDebug to return the same object to all consumers

Author: vtjnash

src/codegen.cpp

@@ -1410,9 +1410,6 @@ const jl_value_t *jl_dump_function_asm(void *f, int raw_mc)
     }
 
     if (raw_mc) {
-#ifdef LLVM37
-        jl_cleanup_DI(context);
-#endif
         return (jl_value_t*)jl_pchar_to_array((char*)fptr, symsize);
     }
 
@@ -1428,10 +1425,7 @@ const jl_value_t *jl_dump_function_asm(void *f, int raw_mc)
 #endif
             );
 
-#ifdef LLVM37
-    if (isJIT)
-        jl_cleanup_DI(context);
-#else
+#ifndef LLVM37
     fstream.flush();
 #endif
 
@@ -5843,8 +5837,8 @@ extern "C" void jl_init_codegen(void)
     jl_setup_module(m);
     init_julia_llvm_env(m);
 
-#ifndef USE_ORCJIT
-    jl_ExecutionEngine->RegisterJITEventListener(CreateJuliaJITEventListener());
+    jl_ExecutionEngine->RegisterJITEventListener(
+            CreateJuliaJITEventListener());
 #ifdef JL_USE_INTEL_JITEVENTS
     if (jl_using_intel_jitevents)
         jl_ExecutionEngine->RegisterJITEventListener(
@@ -5856,7 +5850,6 @@ extern "C" void jl_init_codegen(void)
         jl_ExecutionEngine->RegisterJITEventListener(
             JITEventListener::createOProfileJITEventListener());
 #endif // JL_USE_OPROFILE_JITEVENTS
-#endif
 
     BOX_F(int8,int8);  UBOX_F(uint8,uint8);
     BOX_F(int16,int16); UBOX_F(uint16,uint16);

src/codegen_internal.h

@@ -27,13 +27,8 @@ extern int jl_DI_for_fptr(uint64_t fptr, uint64_t *symsize, int64_t *slide, int6
 extern bool jl_dylib_DI_for_fptr(size_t pointer, const object::ObjectFile **object, llvm::DIContext **context, int64_t *slide, int64_t *section_slide,
         bool onlySysImg, bool *isSysImg, void **saddr, char **name, char **filename);
 
-#ifdef USE_MCJIT
-extern void jl_cleanup_DI(llvm::DIContext *context);
-#endif
-
 #ifdef USE_ORCJIT
 extern JL_DLLEXPORT void ORCNotifyObjectEmitted(JITEventListener *Listener,
                                       const object::ObjectFile &obj,
-                                      const object::ObjectFile &debugObj,
                                       const RuntimeDyld::LoadedObjectInfo &L);
 #endif

src/debuginfo.cpp

@@ -91,10 +91,8 @@ struct ObjectInfo {
     const object::ObjectFile *object;
     size_t SectionSize;
     ptrdiff_t slide;
-#ifdef LLVM39
+#ifdef LLVM37
     DIContext *context;
-#elif defined(LLVM37)
-    const llvm::LoadedObjectInfo *L;
 #endif
 #if defined(_OS_DARWIN_) && !defined(LLVM37)
     const char *name;
@@ -273,29 +271,25 @@ class JuliaJITEventListener: public JITEventListener
             return NULL;
     }
 #ifdef LLVM36
-
     virtual void NotifyObjectEmitted(const object::ObjectFile &obj,
                                      const RuntimeDyld::LoadedObjectInfo &L)
-    {
-        return _NotifyObjectEmitted(obj,obj,L);
-    }
-
-    virtual void _NotifyObjectEmitted(const object::ObjectFile &obj,
-                                     const object::ObjectFile &debugObj,
-                                     const RuntimeDyld::LoadedObjectInfo &L)
 #else
     virtual void NotifyObjectEmitted(const ObjectImage &obj)
 #endif
     {
         int8_t gc_state = jl_gc_safe_enter();
         uv_rwlock_wrlock(&threadsafe);
         jl_gc_safe_leave(gc_state);
+
 #ifdef LLVM36
+        const object::OwningBinary<object::ObjectFile> &debugObjOwner = L.getObjectForDebug(obj);
+        const object::ObjectFile &debugObj =
+            (debugObjOwner.getBinary() ? *debugObjOwner.getBinary() : obj);
         object::section_iterator Section = debugObj.section_begin();
         object::section_iterator EndSection = debugObj.section_end();
 #else
-        object::section_iterator Section = debugObj.begin_sections();
-        object::section_iterator EndSection = debugObj.end_sections();
+        object::section_iterator Section = obj.begin_sections();
+        object::section_iterator EndSection = obj.end_sections();
 #endif
 
 #ifdef LLVM38
@@ -444,11 +438,7 @@ class JuliaJITEventListener: public JITEventListener
                 ObjectInfo tmp = {&debugObj,
                     (size_t)SectionSize,
                     (ptrdiff_t)(SectionAddr - SectionLoadAddr),
-#ifdef LLVM39
                     new DWARFContextInMemory(debugObj, &L),
-#else
-                    L.clone().release(),
-#endif
                     };
                 objectmap[SectionLoadAddr] = tmp;
                 first = false;
@@ -524,11 +514,6 @@ class JuliaJITEventListener: public JITEventListener
 #endif
             ObjectInfo tmp = {objfile, (size_t)Size,
                 (ptrdiff_t)(SectionAddr - SectionLoadAddr),
-#ifdef LLVM39
-                new DWARFContextInMemory(*objfile, &L),
-#elif defined(LLVM37)
-                L.clone().release(),
-#endif
 #ifdef _OS_DARWIN_
                 strndup(sName.data(), sName.size()),
 #endif
@@ -568,16 +553,6 @@ class JuliaJITEventListener: public JITEventListener
 #endif // USE_MCJIT
 };
 
-#ifdef USE_ORCJIT
-JL_DLLEXPORT void ORCNotifyObjectEmitted(JITEventListener *Listener,
-                                         const object::ObjectFile &obj,
-                                         const object::ObjectFile &debugObj,
-                                         const RuntimeDyld::LoadedObjectInfo &L)
-{
-    ((JuliaJITEventListener*)Listener)->_NotifyObjectEmitted(obj,debugObj,L);
-}
-#endif
-
 extern "C"
 char *jl_demangle(const char *name)
 {
@@ -1045,10 +1020,8 @@ int jl_DI_for_fptr(uint64_t fptr, uint64_t *symsize, int64_t *slide, int64_t *se
             *section_slide = fit->second.slide;
         *object = fit->second.object;
         if (context) {
-#if defined(LLVM39)
+#if defined(LLVM37)
             *context = fit->second.context;
-#elif defined(LLVM37)
-            *context = new DWARFContextInMemory(*fit->second.object, fit->second.L);
 #else
             *context = DIContext::getDWARFContext(*fit->second.object);
 #endif
@@ -1100,13 +1073,6 @@ JL_DLLEXPORT uint64_t jl_get_section_start(uint64_t fptr)
 
 #endif
 
-void jl_cleanup_DI(llvm::DIContext *context)
-{
-#ifndef LLVM39
-    delete context;
-#endif
-}
-
 // Set *name and *filename to either NULL or malloc'd string
 void jl_getFunctionInfo(char **name, char **filename, size_t *line,
                         char **inlinedat_file, size_t *inlinedat_line, jl_lambda_info_t **outer_linfo,
@@ -1130,7 +1096,6 @@ void jl_getFunctionInfo(char **name, char **filename, size_t *line,
     if (jl_DI_for_fptr(pointer, &symsize, &slide, NULL, &object, &context)) {
         *outer_linfo = jl_jit_events->lookupLinfo(pointer);
         lookup_pointer(context, name, line, filename, inlinedat_line, inlinedat_file, pointer+slide, 1, fromC);
-        jl_cleanup_DI(context);
         return;
     }
 #else // !USE_MCJIT