Add variant for InstantiateTemplate

Author: Gnimuc

lib/Interpreter/CppInterOp.cpp

@@ -3008,10 +3008,11 @@ namespace Cpp {
     return InstantiateTemplate(TemplateD, TLI, S);
   }
 
-  TCppScope_t InstantiateTemplate(TCppScope_t tmpl,
+  TCppScope_t InstantiateTemplate(compat::Interpreter& I, TCppScope_t tmpl,
                                   const TemplateArgInfo* template_args,
                                   size_t template_args_size) {
-    ASTContext &C = getASTContext();
+    auto& S = I.getSema();
+    auto& C = S.getASTContext();
 
     llvm::SmallVector<TemplateArgument> TemplateArgs;
     TemplateArgs.reserve(template_args_size);
@@ -3032,9 +3033,16 @@ namespace Cpp {
 
     // We will create a new decl, push a transaction.
 #ifdef USE_CLING
-    cling::Interpreter::PushTransactionRAII RAII(&getInterp());
+    cling::Interpreter::PushTransactionRAII RAII(&I);
 #endif
-    return InstantiateTemplate(TmplD, TemplateArgs, getSema());
+    return InstantiateTemplate(TmplD, TemplateArgs, S);
+  }
+
+  TCppScope_t InstantiateTemplate(TCppScope_t tmpl,
+                                  const TemplateArgInfo* template_args,
+                                  size_t template_args_size) {
+    return InstantiateTemplate(getInterp(), tmpl, template_args,
+                               template_args_size);
   }
 
   void GetClassTemplateInstantiationArgs(TCppScope_t templ_instance,