Attempt to resolve #824 (comment)

vgvassilev · Mar 26, 2024 · 10ce4fc · 10ce4fc
1 parent 35ec9b2
commit 10ce4fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/include/clad/Differentiator/Compatibility.h b/include/clad/Differentiator/Compatibility.h
@@ -21,6 +21,16 @@ namespace clad_compat {
 using namespace clang;
 using namespace llvm;
 
+//Clang 18 ActOnLambdaExpr lost argument
+static inline Stmt* ActOnLambdaExpr_Create(clang::sema* S,SourceLocation StartLoc, Stmt *Body)
+{
+#if LLVM_VERSION_MAJOR < 18
+   return S.ActOnLambdaExpr(StartLoc, Body, V.getCurrentScope()).get();
+#else
+   return S.ActOnLambdaExpr(StartLoc, Body).get();
+#endif
+}
+
 //Clang 18 ArrayType::Normal -> ArraySizeModifier::Normal
 
 #if LLVM_VERSION_MAJOR < 18

diff --git a/include/clad/Differentiator/VisitorBase.h b/include/clad/Differentiator/VisitorBase.h
@@ -191,13 +191,7 @@ namespace clad {
       V.beginBlock();
       func();
       clang::CompoundStmt* body = V.endBlock();
-      #if CLANG_VERSION_MAJOR > 17
-        clang::Expr* lambda =
-            S.ActOnLambdaExpr(noLoc, body).get();
-      #else
-        clang::Expr* lambda =
-            S.ActOnLambdaExpr(noLoc, body, V.getCurrentScope()).get();
-      #endif // CLANG_VERSION_MAJOR > 17
+      clang::Expr* lambda = ActOnLambdaExpr_Create(S,SourceLocation StartLoc, Stmt *Body);
       V.endScope();
       return S.ActOnCallExpr(V.getCurrentScope(), lambda, noLoc, {}, noLoc)
           .get();