Audit overridden methods and restore JIT event listener (#739)

Author: elliottslaughter

src/tcompiler.cpp

@@ -114,8 +114,8 @@ struct DisassembleFunctionListener : public JITEventListener {
         }
     }
 
-    virtual void NotifyObjectEmitted(const object::ObjectFile &Obj,
-                                     const RuntimeDyld::LoadedObjectInfo &L) {
+    virtual void notifyObjectLoaded(ObjectKey K, const object::ObjectFile &Obj,
+                                    const RuntimeDyld::LoadedObjectInfo &L) override {
         auto size_map = llvm::object::computeSymbolSizes(Obj);
         for (auto &S : size_map) {
             object::SymbolRef sym = S.first;
@@ -126,34 +126,6 @@ struct DisassembleFunctionListener : public JITEventListener {
     }
 };
 
-class TerraSectionMemoryManager : public SectionMemoryManager {
-public:
-    TerraSectionMemoryManager(TerraCompilationUnit *CU_in, MemoryMapper *MM = nullptr)
-            : SectionMemoryManager(MM) {
-        CU = CU_in;
-    }
-
-    TerraSectionMemoryManager(const TerraSectionMemoryManager &) = delete;
-    void operator=(const TerraSectionMemoryManager &) = delete;
-
-    void notifyObjectLoaded(ExecutionEngine *EE, const object::ObjectFile &obj) override {
-        auto size_map = llvm::object::computeSymbolSizes(obj);
-        for (auto &S : size_map) {
-            object::SymbolRef sym = S.first;
-            auto name = sym.getName();
-            auto type = sym.getType();
-            // printf("notify: %s %d %#010llx\n", cantFail(std::move(name)).data(),
-            // cantFail(std::move(type)), S.second);
-            if (name && type)
-                static_cast<DisassembleFunctionListener *>(CU->jiteventlistener)
-                        ->InitializeDebugData(name.get(), type.get(), S.second);
-        }
-    }
-
-private:
-    TerraCompilationUnit *CU;
-};
-
 static double CurrentTimeInSeconds() {
 #ifdef _WIN32
     static uint64_t freq = 0;
@@ -479,11 +451,12 @@ static void InitializeJIT(TerraCompilationUnit *CU) {
                     CodeGenOptLevel::Aggressive
 #endif
                     )
-            .setMCJITMemoryManager(std::make_unique<TerraSectionMemoryManager>(CU));
+            .setMCJITMemoryManager(std::make_unique<SectionMemoryManager>());
 
     CU->ee = eb.create();
     if (!CU->ee) terra_reporterror(CU->T, "llvm: %s\n", err.c_str());
     CU->jiteventlistener = new DisassembleFunctionListener(CU);
+    CU->ee->RegisterJITEventListener(CU->jiteventlistener);
 }
 
 int terra_compilerinit(struct terra_State *T) {

src/tcwrapper.cpp

@@ -581,49 +581,73 @@ class CodeGenProxy : public ASTConsumer {
             : CG(CG_), Visitor(result, TT, livenessfunction) {}
     CodeGenerator *CG;
     IncludeCVisitor Visitor;
-    virtual ~CodeGenProxy() {}
-    virtual void Initialize(ASTContext &Context) {
+    virtual ~CodeGenProxy() override {}
+    virtual void Initialize(ASTContext &Context) override {
         Visitor.SetContext(&Context);
         CG->Initialize(Context);
     }
-    virtual bool HandleTopLevelDecl(DeclGroupRef D) {
+    virtual bool HandleTopLevelDecl(DeclGroupRef D) override {
         for (DeclGroupRef::iterator b = D.begin(), e = D.end(); b != e; ++b)
             Visitor.TraverseDecl(*b);
         return CG->HandleTopLevelDecl(D);
     }
-    virtual void HandleInterestingDecl(DeclGroupRef D) { CG->HandleInterestingDecl(D); }
-    virtual void HandleTranslationUnit(ASTContext &Ctx) {
+    virtual void HandleInlineFunctionDefinition(FunctionDecl *D) override {
+        CG->HandleInlineFunctionDefinition(D);
+    }
+    virtual void HandleInterestingDecl(DeclGroupRef D) override {
+        CG->HandleInterestingDecl(D);
+    }
+    virtual void HandleTranslationUnit(ASTContext &Ctx) override {
         Decl *Decl = Visitor.GetLivenessFunction();
         DeclGroupRef R = DeclGroupRef::Create(Ctx, &Decl, 1);
         CG->HandleTopLevelDecl(R);
         CG->HandleTranslationUnit(Ctx);
     }
-    virtual void HandleTagDeclDefinition(TagDecl *D) { CG->HandleTagDeclDefinition(D); }
-    virtual void HandleCXXImplicitFunctionInstantiation(FunctionDecl *D) {
+    virtual void HandleTagDeclDefinition(TagDecl *D) override {
+        CG->HandleTagDeclDefinition(D);
+    }
+    virtual void HandleTagDeclRequiredDefinition(const TagDecl *D) override {
+        CG->HandleTagDeclRequiredDefinition(D);
+    }
+    virtual void HandleCXXImplicitFunctionInstantiation(FunctionDecl *D) override {
         CG->HandleCXXImplicitFunctionInstantiation(D);
     }
-    virtual void HandleTopLevelDeclInObjCContainer(DeclGroupRef D) {
+    virtual void HandleTopLevelDeclInObjCContainer(DeclGroupRef D) override {
         CG->HandleTopLevelDeclInObjCContainer(D);
     }
-    virtual void CompleteTentativeDefinition(VarDecl *D) {
+    virtual void CompleteTentativeDefinition(VarDecl *D) override {
         CG->CompleteTentativeDefinition(D);
     }
-    virtual void HandleCXXStaticMemberVarInstantiation(VarDecl *D) {
+#if LLVM_VERSION < 190
+    virtual void CompleteExternalDeclaration(VarDecl *D) override {
+        CG->CompleteExternalDeclaration(D);
+    }
+#else
+    virtual void CompleteExternalDeclaration(DeclaratorDecl *D) override {
+        CG->CompleteExternalDeclaration(D);
+    }
+#endif
+    virtual void AssignInheritanceModel(CXXRecordDecl *RD) override {
+        CG->AssignInheritanceModel(RD);
+    }
+    virtual void HandleCXXStaticMemberVarInstantiation(VarDecl *D) override {
         CG->HandleCXXStaticMemberVarInstantiation(D);
     }
-    virtual void HandleVTable(CXXRecordDecl *RD) { CG->HandleVTable(RD); }
-    virtual ASTMutationListener *GetASTMutationListener() {
+    virtual void HandleVTable(CXXRecordDecl *RD) override { CG->HandleVTable(RD); }
+    virtual ASTMutationListener *GetASTMutationListener() override {
         return CG->GetASTMutationListener();
     }
-    virtual ASTDeserializationListener *GetASTDeserializationListener() {
+    virtual ASTDeserializationListener *GetASTDeserializationListener() override {
         return CG->GetASTDeserializationListener();
     }
-    virtual void PrintStats() { CG->PrintStats(); }
+    virtual void PrintStats() override { CG->PrintStats(); }
 
-    virtual void HandleImplicitImportDecl(ImportDecl *D) {
+    virtual void HandleImplicitImportDecl(ImportDecl *D) override {
         CG->HandleImplicitImportDecl(D);
     }
-    virtual bool shouldSkipFunctionBody(Decl *D) { return CG->shouldSkipFunctionBody(D); }
+    virtual bool shouldSkipFunctionBody(Decl *D) override {
+        return CG->shouldSkipFunctionBody(D);
+    }
 };
 
 class LuaProvidedFile : public llvm::vfs::File {

src/tllvmutil.cpp

@@ -67,7 +67,7 @@ class PassManagerWrapper : public PassManagerBase {
 public:
     PassManagerBase *PM;
     PassManagerWrapper(PassManagerBase *PM_) : PM(PM_) {}
-    virtual void add(Pass *P) {
+    virtual void add(Pass *P) override {
         if (P->getPotentialPassManagerType() > PMT_CallGraphPassManager ||
             P->getAsImmutablePass() != NULL)
             PM->add(P);