Remove new dummy

lib/Interpreter/CppInterOpInterpreter.h

@@ -148,8 +148,6 @@ class Interpreter {
     llvm::InitializeAllAsmPrinters();
 
     std::vector<const char*> vargs(argv + 1, argv + argc);
-    vargs.push_back("-include");
-    vargs.push_back("new");
     inner = compat::createClangInterpreter(vargs);
   }
 

unittests/CppInterOp/FunctionReflectionTest.cpp

@@ -637,7 +637,8 @@ TEST(FunctionReflectionTest, ExistsFunctionTemplate) {
 TEST(FunctionReflectionTest, InstantiateTemplateFunctionFromString) {
   if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
-  Cpp::CreateInterpreter();
+  std::vector<const char*> interpreter_args = { "-include", "new" };
+  Cpp::CreateInterpreter(interpreter_args);
   std::string code = R"(#include <memory>)";
   Interp->process(code);
   const char* str = "std::make_unique<int,int>";
@@ -1322,8 +1323,9 @@ TEST(FunctionReflectionTest, GetFunctionAddress) {
 #endif
   std::vector<Decl*> Decls, SubDecls;
   std::string code = "int f1(int i) { return i * i; }";
+  std::vector<const char*> interpreter_args = {"-include", "new"};
 
-  GetAllTopLevelDecls(code, Decls);
+  GetAllTopLevelDecls(code, Decls, false, interpreter_args);
 
   testing::internal::CaptureStdout();
   Interp->declare("#include <iostream>");
@@ -1372,7 +1374,9 @@ TEST(FunctionReflectionTest, JitCallAdvanced) {
       } name;
     )";
 
-  GetAllTopLevelDecls(code, Decls);
+  std::vector<const char*> interpreter_args = {"-include", "new"};
+
+  GetAllTopLevelDecls(code, Decls, false, interpreter_args);
   auto *CtorD
     = (clang::CXXConstructorDecl*)Cpp::GetDefaultConstructor(Decls[0]);
   auto Ctor = Cpp::MakeFunctionCallable(CtorD);
@@ -1410,7 +1414,9 @@ TEST(FunctionReflectionTest, GetFunctionCallWrapper) {
     int f1(int i) { return i * i; }
     )";
 
-  GetAllTopLevelDecls(code, Decls);
+  std::vector<const char*> interpreter_args = {"-include", "new"};
+
+  GetAllTopLevelDecls(code, Decls, false, interpreter_args);
 
   Interp->process(R"(
     #include <string>
@@ -1510,7 +1516,7 @@ TEST(FunctionReflectionTest, GetFunctionCallWrapper) {
         };
     )";
 
-  GetAllTopLevelDecls(code1, Decls1);
+  GetAllTopLevelDecls(code1, Decls1, false, interpreter_args);
   ASTContext& C = Interp->getCI()->getASTContext();
 
   std::vector<Cpp::TemplateArgInfo> argument = {C.IntTy.getAsOpaquePtr()};
@@ -1715,8 +1721,8 @@ TEST(FunctionReflectionTest, Construct) {
 #ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
-
-  Cpp::CreateInterpreter();
+  std::vector<const char*> interpreter_args = {"-include", "new"};
+  Cpp::CreateInterpreter(interpreter_args);
 
   Interp->declare(R"(
     #include <new>
@@ -1777,7 +1783,8 @@ TEST(FunctionReflectionTest, ConstructNested) {
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
 
-  Cpp::CreateInterpreter();
+  std::vector<const char*> interpreter_args = {"-include", "new"};
+  Cpp::CreateInterpreter(interpreter_args);
 
   Interp->declare(R"(
     #include <new>
@@ -1837,7 +1844,8 @@ TEST(FunctionReflectionTest, Destruct) {
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
 
-  Cpp::CreateInterpreter();
+  std::vector<const char*> interpreter_args = {"-include", "new"};
+  Cpp::CreateInterpreter(interpreter_args);
 
   Interp->declare(R"(
     #include <new>

unittests/CppInterOp/InterpreterTest.cpp

@@ -86,7 +86,8 @@ TEST(InterpreterTest, Process) {
 #endif
   if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
-  auto* I = Cpp::CreateInterpreter();
+  std::vector<const char*> interpreter_args = { "-include", "new" };
+  auto* I = Cpp::CreateInterpreter(interpreter_args);
   EXPECT_TRUE(Cpp::Process("") == 0);
   EXPECT_TRUE(Cpp::Process("int a = 12;") == 0);
   EXPECT_FALSE(Cpp::Process("error_here;") == 0);

unittests/CppInterOp/ScopeReflectionTest.cpp

@@ -168,7 +168,9 @@ TEST(ScopeReflectionTest, IsBuiltin) {
   //  "int", "unsigned int", "long", "unsigned long", "long long", "unsigned long long",
   //  "float", "double", "long double", "void"}
 
-  Cpp::CreateInterpreter();
+  std::vector<const char*> interpreter_args = { "-include", "new" };
+
+  Cpp::CreateInterpreter(interpreter_args);
   ASTContext &C = Interp->getCI()->getASTContext();
   EXPECT_TRUE(Cpp::IsBuiltin(C.BoolTy.getAsOpaquePtr()));
   EXPECT_TRUE(Cpp::IsBuiltin(C.CharTy.getAsOpaquePtr()));
@@ -503,7 +505,10 @@ TEST(ScopeReflectionTest, GetNamed) {
                         }
                         }
                        )";
-  Cpp::CreateInterpreter();
+
+  std::vector<const char*> interpreter_args = {"-include", "new"};
+
+  Cpp::CreateInterpreter(interpreter_args);
 
   Interp->declare(code);
   Cpp::TCppScope_t ns_N1 = Cpp::GetNamed("N1", nullptr);
@@ -880,7 +885,8 @@ template<typename T> T TrivialFnTemplate() { return T(); }
 TEST(ScopeReflectionTest, InstantiateTemplateFunctionFromString) {
   if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
-  Cpp::CreateInterpreter();
+  std::vector<const char*> interpreter_args = {"-include", "new"};
+  Cpp::CreateInterpreter(interpreter_args);
   std::string code = R"(#include <memory>)";
   Interp->process(code);
   const char* str = "std::make_unique<int,int>";
@@ -1024,6 +1030,8 @@ TEST(ScopeReflectionTest, IncludeVector) {
     #include <vector>
     #include <iostream>
   )";
+  std::vector<const char*> interpreter_args = {"-include", "new"};
+  Cpp::CreateInterpreter(interpreter_args);
   Interp->declare(code);
 }
 

unittests/CppInterOp/TypeReflectionTest.cpp

@@ -550,7 +550,9 @@ TEST(TypeReflectionTest, IsPODType) {
 TEST(TypeReflectionTest, IsSmartPtrType) {
   if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
-  Cpp::CreateInterpreter();
+
+  std::vector<const char*> interpreter_args = {"-include", "new"};
+  Cpp::CreateInterpreter(interpreter_args);
 
   Interp->declare(R"(
     #include <memory>
@@ -588,7 +590,8 @@ TEST(TypeReflectionTest, IsSmartPtrType) {
 }
 
 TEST(TypeReflectionTest, IsFunctionPointerType) {
-  Cpp::CreateInterpreter();
+  std::vector<const char*> interpreter_args = {"-include", "new"};
+  Cpp::CreateInterpreter(interpreter_args);
 
   Interp->declare(R"(
     typedef int (*int_func)(int, int);

unittests/CppInterOp/Utils.cpp

@@ -14,13 +14,16 @@
 
 #include <algorithm>
 #include <string>
+#include <vector>
 
 using namespace clang;
 using namespace llvm;
 
-void TestUtils::GetAllTopLevelDecls(const std::string& code, std::vector<Decl*>& Decls,
-                                    bool filter_implicitGenerated /* = false */) {
-  Cpp::CreateInterpreter();
+void TestUtils::GetAllTopLevelDecls(
+    const std::string& code, std::vector<Decl*>& Decls,
+    bool filter_implicitGenerated /* = false */,
+    const std::vector<const char*>& interpreter_args /* = {} */) {
+  Cpp::CreateInterpreter(interpreter_args);
 #ifdef CPPINTEROP_USE_CLING
   cling::Transaction *T = nullptr;
   Interp->declare(code, &T);

unittests/CppInterOp/Utils.h

@@ -5,6 +5,7 @@
 
 #include "llvm/Support/Valgrind.h"
 #include <memory>
+#include <string>
 #include <vector>
 #include "clang-c/CXCppInterOp.h"
 #include "clang-c/CXString.h"
@@ -17,10 +18,12 @@ namespace clang {
 }
 #define Interp (static_cast<compat::Interpreter*>(Cpp::GetInterpreter()))
 namespace TestUtils {
-  void GetAllTopLevelDecls(const std::string& code, std::vector<clang::Decl*>& Decls,
-                           bool filter_implicitGenerated = false);
-  void GetAllSubDecls(clang::Decl *D, std::vector<clang::Decl*>& SubDecls,
-                      bool filter_implicitGenerated = false);
+void GetAllTopLevelDecls(const std::string& code,
+                         std::vector<clang::Decl*>& Decls,
+                         bool filter_implicitGenerated = false,
+                         const std::vector<const char*>& interpreter_args = {});
+void GetAllSubDecls(clang::Decl* D, std::vector<clang::Decl*>& SubDecls,
+                    bool filter_implicitGenerated = false);
 } // end namespace TestUtils
 
 const char* get_c_string(CXString string);

unittests/CppInterOp/VariableReflectionTest.cpp

@@ -334,6 +334,9 @@ TEST(VariableReflectionTest, VariableOffsetsWithInheritance) {
   if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
 
+  std::vector<const char*> interpreter_args = {"-include", "string"};
+  Cpp::CreateInterpreter(interpreter_args);
+
   Cpp::Declare("#include<string>");
 
 #define Stringify(s) Stringifyx(s)