Store state

Author: vgvassilev

clang/include/clang/AST/ASTContext.h

@@ -1071,6 +1071,8 @@ class ASTContext : public RefCountedBase<ASTContext> {
   Module *getCurrentNamedModule() const { return CurrentCXXNamedModule; }
 
   TranslationUnitDecl *getTranslationUnitDecl() const {
+    assert(TUDecl->getMostRecentDecl() == TUDecl &&
+           "The active TU is not current one!");
     return TUDecl->getMostRecentDecl();
   }
   void addTranslationUnitDecl() {

clang/include/clang/Interpreter/Interpreter.h

@@ -140,6 +140,14 @@ class Interpreter {
 public:
   virtual ~Interpreter();
 
+  class SynthesizingCodeRAII {
+
+  };
+
+  SynthesizingCodeRAII EnterCodeSynthesisScope() {
+
+  }
+
   static llvm::Expected<std::unique_ptr<Interpreter>>
   create(std::unique_ptr<CompilerInstance> CI);
   static llvm::Expected<std::unique_ptr<Interpreter>>
@@ -187,6 +195,8 @@ class Interpreter {
 
   std::unique_ptr<llvm::Module> GenModule();
 
+  
+
 private:
   size_t getEffectivePTUSize() const;
   void markUserCodeStart();

clang/lib/Interpreter/IncrementalExecutor.cpp

@@ -68,10 +68,6 @@ IncrementalExecutor::IncrementalExecutor(llvm::orc::ThreadSafeContext &TSC,
 
 IncrementalExecutor::~IncrementalExecutor() {}
 
-llvm::Error IncrementalExecutor::addModule(std::unique_ptr<llvm::Module> &M) {
-  return Jit->addIRModule({std::move(M), TSCtx});
-}
-
 llvm::Error IncrementalExecutor::addModule(PartialTranslationUnit &PTU) {
   llvm::orc::ResourceTrackerSP RT =
       Jit->getMainJITDylib().createResourceTracker();

clang/lib/Interpreter/IncrementalExecutor.h

@@ -52,7 +52,6 @@ class IncrementalExecutor {
                       llvm::orc::LLJITBuilder &JITBuilder, llvm::Error &Err);
   ~IncrementalExecutor();
 
-  llvm::Error addModule(std::unique_ptr<llvm::Module> &M);
   llvm::Error addModule(PartialTranslationUnit &PTU);
   llvm::Error removeModule(PartialTranslationUnit &PTU);
   llvm::Error runCtors() const;

clang/lib/Interpreter/Interpreter.cpp

@@ -410,7 +410,6 @@ llvm::Error Interpreter::CreateExecutor() {
 
 void Interpreter::ResetExecutor() { IncrExecutor.reset(); }
 
-
 llvm::Error Interpreter::ExecuteModule(std::unique_ptr<llvm::Module> &M) {
   if (!IncrExecutor) {
     auto Err = CreateExecutor();

clang/lib/Interpreter/ValuePrinter.cpp

@@ -115,11 +115,9 @@ static std::string PrintEnum(const Value &V) {
       IsFirst = false;
     }
   }
-
-  llvm::SmallString<24> ApStr;
-  AP.toString(ApStr, /*Radix=*/10);
-
-  SS << " : " << PrintQualType(Ctx, ED->getIntegerType()) << " " << ApStr;
+  llvm::SmallString<64> APStr;
+  AP.toString(APStr, /*Radix=*/10);
+  SS << " : " << PrintQualType(Ctx, ED->getIntegerType()) << " "  << APStr;
   return Str;
 }
 
@@ -279,10 +277,15 @@ static llvm::Expected<llvm::orc::ExecutorAddr> CompileDecl(Interpreter &Interp,
   ASTConsumer &Consumer = Interp.getCompilerInstance()->getASTConsumer();
   Consumer.HandleTopLevelDecl(DeclGroupRef(D));
   Interp.getCompilerInstance()->getSema().PerformPendingInstantiations();
-  Consumer.HandleTranslationUnit(Interp.getASTContext());
+  ASTContext &C = Interp.getASTContext();
+  TranslationUnitDecl *TUPart = C.getTranslationUnitDecl();
+  assert(!TUPart->containsDecl(D) && "Decl already added!");
+  TUPart->addDecl(D);
+  Consumer.HandleTranslationUnit(C);
 
   if (std::unique_ptr<llvm::Module> M = Interp.GenModule()) {
-    if (llvm::Error Err = Interp.ExecuteModule(M))
+    PartialTranslationUnit PTU = {TUPart, std::move(M)};
+    if (llvm::Error Err = Interp.Execute(PTU))
       return Err;
     ASTNameGenerator ASTNameGen(Interp.getASTContext());
     llvm::Expected<llvm::orc::ExecutorAddr> AddrOrErr =