Merge pull request #944 from emankov/HIPIFY

[HIPIFY][build][#724][SWDEV_375013][cleanup] Remove `SWDEV_375013` related guards from `CMakeLists.txt` and `HipifyAction.cpp`
ROCm · Jul 10, 2023 · b68c5ee · b68c5ee
2 parents f0a252d + e765a93
commit b68c5ee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -119,12 +119,6 @@ else()
     endif()
 endif()
 
-# [ToDo] Remove SWDEV_375013 related guards from CMakeLists.txt and HipifyAction.cpp along with the LLVM 16.0.0 official release
-option (SWDEV_375013 "Enables SWDEV-375013 blocker workaround for the clang's change https://reviews.llvm.org/D140332" OFF)
-if(SWDEV_375013)
-    add_definitions(-DSWDEV_375013)
-endif()
-
 if(MSVC)
     target_link_libraries(hipify-clang PRIVATE version)
     target_compile_options(hipify-clang PRIVATE ${STD} /Od /GR- /EHs- /EHc-)

diff --git a/src/HipifyAction.cpp b/src/HipifyAction.cpp
@@ -1199,12 +1199,11 @@ class PPCallbackProxy : public clang::PPCallbacks {
 
 public:
   explicit PPCallbackProxy(HipifyAction &action): hipifyAction(action) {}
-  // [ToDo] Remove SWDEV_375013 related guards from CMakeLists.txt and HipifyAction.cpp along with the LLVM 16.0.0 official release
   void InclusionDirective(clang::SourceLocation hash_loc, const clang::Token &include_token,
                           StringRef file_name, bool is_angled, clang::CharSourceRange filename_range,
 #if LLVM_VERSION_MAJOR < 15
                           const clang::FileEntry *file,
-#elif (LLVM_VERSION_MAJOR == 15) || (LLVM_VERSION_MAJOR == 16 && SWDEV_375013)
+#elif LLVM_VERSION_MAJOR == 15
                           Optional<clang::FileEntryRef> file,
 #else
                           clang::OptionalFileEntryRef file,