Create the IR instance in the main function

Author: jonas

bindgen/Main.cpp

@@ -49,16 +49,15 @@ int main(int argc, char *argv[]) {
 
     locations.clear();
 
-    ScalaFrontendActionFactory actionFactory(libName);
-
-    int result = Tool.run(&actionFactory);
-
-    IR ir = actionFactory.getIntermediateRepresentation();
-
+    IR ir(libName);
     if (!Package.empty()) {
         ir.setPackageName(Package.getValue());
     }
 
+    ScalaFrontendActionFactory actionFactory(ir);
+
+    int result = Tool.run(&actionFactory);
+
     auto printLoc = PrintHeadersLocation.getValue();
     if (printLoc) {
         for (const auto &location : locations) {

bindgen/visitor/ScalaFrontendAction.cpp

@@ -1,6 +1,6 @@
 #include "ScalaFrontendAction.h"
 
-ScalaFrontendAction::ScalaFrontendAction(IR *ir) : ir(ir) {}
+ScalaFrontendAction::ScalaFrontendAction(IR &ir) : ir(ir) {}
 
 std::unique_ptr<clang::ASTConsumer>
 ScalaFrontendAction::CreateASTConsumer(clang::CompilerInstance &CI,

bindgen/visitor/ScalaFrontendAction.h

@@ -12,14 +12,14 @@
  */
 class ScalaFrontendAction : public clang::ASTFrontendAction {
   public:
-    explicit ScalaFrontendAction(IR *ir);
+    explicit ScalaFrontendAction(IR &ir);
 
     std::unique_ptr<clang::ASTConsumer>
     CreateASTConsumer(clang::CompilerInstance &CI,
                       clang::StringRef file) override;
 
   private:
-    IR *ir;
+    IR &ir;
 };
 
 #endif // SCALA_NATIVE_BINDGEN_SCALAFRONTENDACTION_H

bindgen/visitor/ScalaFrontendActionFactory.cpp

@@ -1,19 +1,13 @@
 #include "ScalaFrontendActionFactory.h"
 #include "ScalaFrontendAction.h"
 
-ScalaFrontendActionFactory::ScalaFrontendActionFactory(std::string libName)
-    : libName(libName), ir(libName) {}
+ScalaFrontendActionFactory::ScalaFrontendActionFactory(IR &ir) : ir(ir) {}
 
 clang::FrontendAction *ScalaFrontendActionFactory::create() {
     if (!ir.libObjEmpty() || ir.hasEnums()) {
         llvm::errs() << "IR is not empty. Please use new instance of "
                         "ScalaFrontendActionFactory.\n";
         llvm::errs().flush();
     }
-    return new ScalaFrontendAction(
-        &ir); // instance will be deleted by LibTooling
-}
-
-const IR &ScalaFrontendActionFactory::getIntermediateRepresentation() const {
-    return ir;
+    return new ScalaFrontendAction(ir);
 }

bindgen/visitor/ScalaFrontendActionFactory.h

@@ -13,16 +13,12 @@
 class ScalaFrontendActionFactory
     : public clang::tooling::FrontendActionFactory {
   public:
-    explicit ScalaFrontendActionFactory(std::string libName);
+    explicit ScalaFrontendActionFactory(IR &ir);
 
     clang::FrontendAction *create() override;
 
-    const IR &getIntermediateRepresentation() const;
-
   private:
-    std::string libName;
-
-    IR ir;
+    IR &ir;
 };
 
 #endif // SCALA_NATIVE_BINDGEN_SCALAFRONTENDACTIONFACTORY_H

bindgen/visitor/TreeConsumer.h

@@ -18,7 +18,7 @@ class TreeConsumer : public clang::ASTConsumer {
     clang::SourceManager &smanager;
 
   public:
-    TreeConsumer(clang::CompilerInstance *CI, IR *ir)
+    TreeConsumer(clang::CompilerInstance *CI, IR &ir)
         : visitor(CI, ir), smanager(CI->getASTContext().getSourceManager()) {}
 
     bool HandleTopLevelDecl(clang::DeclGroupRef DG) override {

bindgen/visitor/TreeVisitor.cpp

@@ -26,7 +26,7 @@ bool TreeVisitor::VisitFunctionDecl(clang::FunctionDecl *func) {
         parameters.emplace_back(pname, ptype);
     }
 
-    ir->addFunction(funcName, parameters, retType, func->isVariadic());
+    ir.addFunction(funcName, parameters, retType, func->isVariadic());
 
     return true;
 }
@@ -47,7 +47,7 @@ bool TreeVisitor::VisitTypedefDecl(clang::TypedefDecl *tpdef) {
 
     std::string type = handleReservedWords(
         typeTranslator.Translate(tpdef->getUnderlyingType()));
-    ir->addTypeDef(name, type);
+    ir.addTypeDef(name, type);
     return true;
 }
 
@@ -70,8 +70,8 @@ bool TreeVisitor::VisitEnumDecl(clang::EnumDecl *enumdecl) {
         enumerators.emplace_back(en->getNameAsString(), value);
     }
 
-    ir->addEnum(name, typeTranslator.Translate(enumdecl->getIntegerType()),
-                enumerators);
+    ir.addEnum(name, typeTranslator.Translate(enumdecl->getIntegerType()),
+               enumerators);
 
     return true;
 }
@@ -116,7 +116,7 @@ void TreeVisitor::handleUnion(clang::RecordDecl *record, std::string name) {
         fields.emplace_back(fname, ftype);
     }
 
-    ir->addUnion(name, fields, maxSize);
+    ir.addUnion(name, fields, maxSize);
 }
 
 void TreeVisitor::handleStruct(clang::RecordDecl *record, std::string name) {
@@ -155,6 +155,6 @@ void TreeVisitor::handleStruct(clang::RecordDecl *record, std::string name) {
         llvm::errs().flush();
     }
 
-    ir->addStruct(name, fields,
-                  astContext->getTypeSize(record->getTypeForDecl()));
+    ir.addStruct(name, fields,
+                 astContext->getTypeSize(record->getTypeForDecl()));
 }

bindgen/visitor/TreeVisitor.h

@@ -22,16 +22,14 @@ class TreeVisitor : public clang::RecursiveASTVisitor<TreeVisitor> {
     clang::ASTContext *astContext;
     TypeTranslator typeTranslator;
     CycleDetection cycleDetection;
-
-    /* pointer to ir that is stored in ScalaFrontendActionFactory */
-    IR *ir;
+    IR &ir;
 
     void handleUnion(clang::RecordDecl *record, std::string name);
 
     void handleStruct(clang::RecordDecl *record, std::string name);
 
   public:
-    TreeVisitor(clang::CompilerInstance *CI, IR *ir)
+    TreeVisitor(clang::CompilerInstance *CI, IR &ir)
         : astContext(&(CI->getASTContext())), typeTranslator(astContext),
           cycleDetection(typeTranslator), ir(ir) {}