squash this commit with the previous commit

fix ExternalInterpreterTest
`Cpp::UseExternalInterpreter` expects `Cpp::Interpreter` (clang-repl) or `cling::Interpreter` (cling). Account for this and update the test to reflect the same.

Author: Vipul-Cariappa

lib/CppInterOp/CppInterOp.cpp

@@ -3445,6 +3445,7 @@ bool DeleteInterpreter(TInterp_t I /*=nullptr*/) {
 
   if (!I) {
     auto foundAST = find_interpreter_in_map(sInterpreters->back().get());
+    assert(foundAST != sInterpreterASTMap->end());
     sInterpreterASTMap->erase(foundAST);
     sInterpreters->pop_back();
     return true;
@@ -3455,6 +3456,7 @@ bool DeleteInterpreter(TInterp_t I /*=nullptr*/) {
     return false; // failure
 
   auto foundAST = find_interpreter_in_map((*found).get());
+  assert(foundAST != sInterpreterASTMap->end());
   sInterpreterASTMap->erase(foundAST);
   sInterpreters->erase(found);
   return true;

lib/CppInterOp/CppInterOpInterpreter.h

@@ -140,12 +140,11 @@ namespace Cpp {
 /// CppInterOp Interpreter
 ///
 class Interpreter {
-private:
   std::unique_ptr<clang::Interpreter> inner;
 
+public:
   Interpreter(std::unique_ptr<clang::Interpreter> CI) : inner(std::move(CI)) {}
 
-public:
   static std::unique_ptr<Interpreter>
   create(int argc, const char* const* argv, const char* llvmdir = nullptr,
          const std::vector<std::shared_ptr<clang::ModuleFileExtension>>&

unittests/CppInterOp/InterpreterTest.cpp

@@ -88,19 +88,9 @@ TEST(InterpreterTest, DeleteInterpreter) {
 
   EXPECT_EQ(I3, Cpp::GetInterpreter()) << "I3 is not active";
 
-  auto* D1 = Cpp::TakeInterpreter();
-  EXPECT_EQ(D1, I3);
-
-  Cpp::UseExternalInterpreter(D1);
-
   EXPECT_TRUE(Cpp::DeleteInterpreter(nullptr));
   EXPECT_EQ(I2, Cpp::GetInterpreter());
 
-  auto* D2 = Cpp::TakeInterpreter(I2);
-  EXPECT_EQ(I2, D2);
-
-  Cpp::UseExternalInterpreter(D2);
-
   auto* I4 = reinterpret_cast<void*>(static_cast<std::uintptr_t>(~0U));
   EXPECT_FALSE(Cpp::DeleteInterpreter(I4));
 
@@ -341,7 +331,9 @@ if (llvm::sys::RunningOnValgrind())
   // Create the interpreter instance.
   std::unique_ptr<clang::Interpreter> I =
       ExitOnErr(clang::Interpreter::create(std::move(CI)));
-  auto ExtInterp = I.get();
+
+  auto CPPI = Cpp::Interpreter(std::move(I));
+  auto ExtInterp = &CPPI;
 #endif // CPPINTEROP_USE_REPL
 
 #ifdef CPPINTEROP_USE_CLING
@@ -358,12 +350,9 @@ if (llvm::sys::RunningOnValgrind())
 
   EXPECT_NE(ExtInterp, nullptr);
 
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-#ifndef _WIN32 // Windows seems to fail to die...
-    EXPECT_DEATH(Cpp::UseExternalInterpreter(ExtInterp), "sInterpreter already in use!");
-#endif // _WIN32
-#endif
-  EXPECT_TRUE(Cpp::GetInterpreter()) << "External Interpreter not set";
+  Cpp::UseExternalInterpreter(ExtInterp);
+  EXPECT_EQ(ExtInterp, Cpp::GetInterpreter());
+  EXPECT_EQ(ExtInterp, Cpp::TakeInterpreter(ExtInterp));
 
 #ifndef CPPINTEROP_USE_CLING
   I.release();