Resolve #824 (comment) and #824 (comment)

vgvassilev · Mar 26, 2024 · d0b7cb6 · d0b7cb6
1 parent 4a60371
commit d0b7cb6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git a/include/clad/Differentiator/Compatibility.h b/include/clad/Differentiator/Compatibility.h
@@ -21,6 +21,14 @@ namespace clad_compat {
 using namespace clang;
 using namespace llvm;
 
+//Clang 18 ArrayType::Normal -> ArraySizeModifier::Normal
+
+#if LLVM_VERSION_MAJOR < 18
+#define ArrayType_Normal ArrayType::Normal
+#else
+#define ArrayType_Normal ArraySizeModifier::Normal
+#endif
+
 // Compatibility helper function for creation UnresolvedLookupExpr.
 // Clang-18 extra argument knowndependent.
 //FIXME: Knowndependent set to false temporarily until known value found for initialisation.
@@ -63,7 +71,7 @@ static inline Stmt* UnresolvedLookupExpr_Create(const ASTContext &Ctx,
                                        // OverloadExpr, so we are safe.
                                        Args,
                                        Begin,
-                                       End
+                                       End,
                                        KnownDependent
                                        );
   #endif

diff --git a/lib/Differentiator/CladUtils.cpp b/lib/Differentiator/CladUtils.cpp
@@ -269,21 +269,12 @@ namespace clad {
       // Copied and adapted from clang::Sema::ActOnStringLiteral.
       QualType CharTyConst = C.CharTy.withConst();
       QualType
-      #if CLANG_VERSION_MAJOR < 18
           StrTy = clad_compat::getConstantArrayType(C, CharTyConst,
                                                     llvm::APInt(/*numBits=*/32,
                                                                 str.size() + 1),
                                                     /*SizeExpr=*/nullptr,
-                                                    /*ASM=*/ArrayType::Normal,
+                                                    /*ASM=*/ArrayType_Normal,
                                                     /*IndexTypeQuals*/ 0);
-      #else
-          StrTy = clad_compat::getConstantArrayType(C, CharTyConst,
-                                                    llvm::APInt(/*numBits=*/32,
-                                                                str.size() + 1),
-                                                    /*SizeExpr=*/nullptr,
-                                                    /*ASM=*/ArraySizeModifier::Normal,
-                                                    /*IndexTypeQuals*/ 0);
-      #endif
       StringLiteral* SL = StringLiteral::Create(C, str,
                                                 /*Kind=*/clad_compat::StringKind_Ordinary,
                                                 /*Pascal=*/false, StrTy, noLoc);

diff --git a/lib/Differentiator/HessianModeVisitor.cpp b/lib/Differentiator/HessianModeVisitor.cpp
@@ -36,23 +36,13 @@ namespace clad {
   static const StringLiteral* CreateStringLiteral(ASTContext& C,
                                                   std::string str) {
     QualType CharTyConst = C.CharTy.withConst();
-    #if CLANG_VERSION_MAJOR < 18
-      QualType StrTy =
-          clad_compat::getConstantArrayType(C, CharTyConst,
+    QualType StrTy =
+        clad_compat::getConstantArrayType(C, CharTyConst,
                                           llvm::APInt(/*numBits=*/32,
                                                       str.size() + 1),
                                           /*SizeExpr=*/nullptr,
-                                          /*ASM=*/ArrayType::Normal,
+                                          /*ASM=*/ArrayType_Normal,
                                           /*IndexTypeQuals*/ 0);
-    #else
-      QualType StrTy =
-          clad_compat::getConstantArrayType(C, CharTyConst,
-                                          llvm::APInt(/*numBits=*/32,
-                                                      str.size() + 1),
-                                          /*SizeExpr=*/nullptr,
-                                          /*ASM=*/ArraySizeModifier::Normal,
-                                          /*IndexTypeQuals*/ 0);      
-    #endif
     const StringLiteral* SL =
         StringLiteral::Create(C, str, /*Kind=*/clad_compat::StringKind_Ordinary,
                               /*Pascal=*/false, StrTy, noLoc);