Support LLVM 18: changes in ElaboratedTypeKeyword

marxin · Nov 5, 2023 · 07919b7 · 07919b7
1 parent edd7720
commit 07919b7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/clang_delta/ReplaceDependentName.cpp b/clang_delta/ReplaceDependentName.cpp
@@ -120,8 +120,14 @@ void ReplaceDependentName::handleOneElaboratedTypeLoc(
     return;
 
   const ElaboratedType *ET = TLoc.getTypePtr();
+
+#if LLVM_VERSION_MAJOR >= 18
+  if ((ET->getKeyword() != ElaboratedTypeKeyword::Typename) && (ET->getKeyword() != ElaboratedTypeKeyword::None))
+    return;
+#else
   if ((ET->getKeyword() != ETK_Typename) && (ET->getKeyword() != ETK_None))
     return;
+#endif
 
   if (TLoc.getQualifierLoc().getBeginLoc().isInvalid())
     return;
@@ -155,8 +161,14 @@ void ReplaceDependentName::handleOneDependentNameTypeLoc(
   const DependentNameType *DNT = 
     dyn_cast<DependentNameType>(TLoc.getTypePtr());
   TransAssert(DNT && "NULL DependentNameType!");
+
+#if LLVM_VERSION_MAJOR >= 18
+  if (DNT->getKeyword() != ElaboratedTypeKeyword::Typename)
+    return;
+#else
   if (DNT->getKeyword() != ETK_Typename)
     return;
+#endif
 
   std::string Str = "";
   bool Typename = false;

diff --git a/clang_delta/ReplaceDependentTypedef.cpp b/clang_delta/ReplaceDependentTypedef.cpp
@@ -114,7 +114,12 @@ bool ReplaceDependentTypedef::isValidType(const QualType &QT)
   case Type::Elaborated: {
     const ElaboratedType *ETy = dyn_cast<ElaboratedType>(Ty);
     ElaboratedTypeKeyword Keyword = ETy->getKeyword();
+
+#if LLVM_VERSION_MAJOR >= 18
+    return ((Keyword == ElaboratedTypeKeyword::Typename) || (Keyword == ElaboratedTypeKeyword::None));
+#else
     return ((Keyword == ETK_Typename) || (Keyword == ETK_None));
+#endif
   }
 
   default: