fix ctor codegen for array new

Author: aaronj0

lib/CppInterOp/CppInterOp.cpp

@@ -2077,7 +2077,7 @@ void make_narg_ctor_with_return(const FunctionDecl* FD, const unsigned N,
       callbuf << "if (nary > 1) {\n";
       indent(callbuf, indent_level);
       callbuf << "(*(" << class_name << "**)ret) = ";
-      callbuf << "(obj) ? new (*(" << class_name << "**)ret) ";
+      callbuf << "(is_arena) ? new (*(" << class_name << "**)ret) ";
       make_narg_ctor(FD, N, typedefbuf, callbuf, class_name, indent_level,
                      true);
 
@@ -2101,7 +2101,7 @@ void make_narg_ctor_with_return(const FunctionDecl* FD, const unsigned N,
     // : new ClassName(args...);
     indent(callbuf, indent_level);
     callbuf << "(*(" << class_name << "**)ret) = ";
-    callbuf << "(obj) ? new (*(" << class_name << "**)ret) ";
+    callbuf << "(is_arena) ? new (*(" << class_name << "**)ret) ";
     make_narg_ctor(FD, N, typedefbuf, callbuf, class_name, indent_level);
 
     callbuf << ": new ";
@@ -2629,9 +2629,14 @@ int get_wrapper_code(compat::Interpreter& I, const FunctionDecl* FD,
          "__attribute__((annotate(\"__cling__ptrcheck(off)\")))\n"
          "extern \"C\" void ";
   buf << wrapper_name;
-  buf << "(void* obj, unsigned long nargs, void** args, void* ret, unsigned "
-         "long nary)\n"
-         "{\n";
+  if (Cpp::IsConstructor(FD)) {
+    buf << "(void* ret, unsigned long nary, unsigned long nargs, void** args, "
+           "int is_arena)\n"
+           "{\n";
+  } else
+    buf << "(void* obj, unsigned long nargs, void** args, void* ret)\n"
+           "{\n";
+
   ++indent_level;
   if (min_args == num_params) {
     // No parameters with defaults.