Rebase and add assertion in ValueCleanup()

Author: SahilPatidar

clang/include/clang/Interpreter/Value.h

@@ -325,7 +325,7 @@ class REPL_EXTERNAL_VISIBILITY Value final {
   const StrValue &asStr() const { return const_cast<Value *>(this)->asStr(); }
 
 public:
-  // ---- Query helpers ----
+  // ---- BuiltinKind Query helpers ----
   bool hasBuiltinThis(BuiltinKind K) const {
     if (isBuiltin())
       return asBuiltin().getKind() == K;
@@ -451,16 +451,16 @@ class REPL_EXTERNAL_VISIBILITY Value final {
   void destroy() {
     switch (VKind) {
     case K_Builtin:
-      reinterpret_cast<Builtins *>(&Data)->~Builtins();
+      ((Builtins *)(char *)&Data)->~Builtins();
       break;
     case K_Array:
-      reinterpret_cast<ArrValue *>(&Data)->~ArrValue();
+      ((ArrValue *)(char *)&Data)->~ArrValue();
       break;
     case K_Pointer:
-      reinterpret_cast<PtrValue *>(&Data)->~PtrValue();
+      ((PtrValue *)(char *)&Data)->~PtrValue();
       break;
     case K_Str:
-      reinterpret_cast<StrValue *>(&Data)->~StrValue();
+      ((StrValue *)(char *)&Data)->~StrValue();
       break;
     default:
       break;
@@ -525,7 +525,7 @@ class ValueResultManager {
   ASTContext &Ctx;
   llvm::orc::MemoryAccess &MemAcc;
   Value LastVal;
-  llvm::DenseMap<ValueId, clang::QualType> IdToType;
+  llvm::DenseMap<ValueId, QualType> IdToType;
   llvm::DenseMap<ValueId, ValueCleanup> IdToValCleanup;
 };
 

clang/lib/Interpreter/Interpreter.cpp

@@ -302,9 +302,6 @@ Interpreter::Interpreter(std::unique_ptr<CompilerInstance> Instance,
         return;
       }
   }
-
-  ValMgr = ValueResultManager::Create(IncrExecutor->GetExecutionEngine(),
-                                      getASTContext());
 }
 
 Interpreter::~Interpreter() {
@@ -676,9 +673,11 @@ llvm::Error Interpreter::CreateExecutor(JITConfig Config) {
   Executor =
       std::make_unique<IncrementalExecutor>(*TSCtx, *JITBuilder, Config, Err);
 #endif
-  if (!Err)
+  if (!Err) {
     IncrExecutor = std::move(Executor);
-
+    ValMgr = ValueResultManager::Create(IncrExecutor->GetExecutionEngine(),
+                                        getASTContext());
+  }
   return Err;
 }
 

clang/lib/Interpreter/Value.cpp

@@ -239,8 +239,14 @@ void Value::print(llvm::raw_ostream &Out, ASTContext &Ctx) const {
 
 void ValueCleanup::operator()(Value &V) {
   using namespace llvm;
+
+  if (!V.isPointer() || V.getAddr() != 0)
+    return;
+
   LLVM_DEBUG(dbgs() << "ValueCleanup: destroying value at Addr=" << V.getAddr()
                     << ", Type=" << V.getType().getAsString() << "\n");
+  assert(!DtorWrapperFn.isNull() &&
+         "Expected valid destructor wrapper function address, but found null");
   if (ObjDtor) {
     auto ObjDtorAddrOrErr = ObjDtor(V.getType());
     if (ObjDtorAddrOrErr && !ObjDtorAddrOrErr->isNull()) {
@@ -260,6 +266,9 @@ void ValueCleanup::operator()(Value &V) {
     }
   }
 
+  assert(!DtorFn.isNull() &&
+         "Expected valid destructor function address, but found null");
+
   Error E = Error::success();
   orc::ExecutorAddr Addr(V.getAddr());
   LLVM_DEBUG(dbgs() << "ValueCleanup: calling raw destructor, Addr="