Refactor code and headers

Author: SahilPatidar

clang/include/clang/Interpreter/Value.h

@@ -32,10 +32,9 @@
 
 #ifndef LLVM_CLANG_INTERPRETER_VALUE_H
 #define LLVM_CLANG_INTERPRETER_VALUE_H
+
 #include "llvm/ADT/FunctionExtras.h"
 #include "llvm/Config/llvm-config.h" // for LLVM_BUILD_LLVM_DYLIB, LLVM_BUILD_SHARED_LIBS
-#include "llvm/ExecutionEngine/Orc/LLJIT.h"
-#include "llvm/ExecutionEngine/Orc/MemoryAccess.h"
 #include "llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h"
 #include "llvm/Support/Compiler.h"
 #include <cassert>
@@ -48,7 +47,11 @@
 
 namespace llvm {
 class raw_ostream;
-
+namespace orc {
+class ExecutionSession;
+class LLJIT;
+class MemoryAccess;
+} // namespace orc
 } // namespace llvm
 
 namespace clang {
@@ -393,6 +396,9 @@ class REPL_EXTERNAL_VISIBILITY Value final {
     assert(!Cleanup.has_value());
     Cleanup.emplace(std::move(VC));
   }
+
+  bool hasAttachedCleanup() const { return Cleanup.has_value(); }
+
   void clear() {
     if (Cleanup.has_value())
       (*Cleanup)(*this);

clang/lib/Interpreter/InterpreterValuePrinter.cpp

@@ -22,6 +22,7 @@
 #include "clang/Sema/Lookup.h"
 #include "clang/Sema/Sema.h"
 
+#include "llvm/ExecutionEngine/Orc/LLJIT.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/raw_ostream.h"
 
@@ -680,10 +681,6 @@ llvm::Expected<Expr *> Interpreter::convertExprToValue(Expr *E, bool isOOP) {
     if (llvm::Error Err = LookupInterface(ValuePrintingInfo[ClangSendResult],
                                           RunTimeFnTagName[ClangSendResult]))
       return std::move(Err);
-
-    if (llvm::Error Err = LookupInterface(ValuePrintingInfo[ClangDestroyObj],
-                                          RunTimeFnTagName[ClangDestroyObj]))
-      return std::move(Err);
   }
 
   llvm::SmallVector<Expr *, 4> AdjustedArgs;

clang/lib/Interpreter/Value.cpp

@@ -21,9 +21,7 @@
 #include "llvm/ADT/StringExtras.h"
 
 #include "llvm/ExecutionEngine/Orc/Core.h"
-#include "llvm/ExecutionEngine/Orc/ExecutorProcessControl.h"
 #include "llvm/ExecutionEngine/Orc/LLJIT.h"
-#include "llvm/ExecutionEngine/Orc/SelfExecutorProcessControl.h"
 #include "llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h"
 #include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h"