From 76b9d41c6b3cc3424e1c916846a2e12aa25f9fee Mon Sep 17 00:00:00 2001 From: David Salinas Date: Mon, 6 Jun 2022 18:12:50 +0000 Subject: [PATCH] Revert "[HIPIFY][compatibility][fix] LLVM 15.0.0git compatibility support" This reverts commit 7344fda44c4ab15f724bd6861cbe4d6d413bf6a9. Change-Id: I39e737e51dbc3ad60fb133752a63dba37a669137 --- src/HipifyAction.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/HipifyAction.cpp b/src/HipifyAction.cpp index a2b7fb6d..0782aadc 100644 --- a/src/HipifyAction.cpp +++ b/src/HipifyAction.cpp @@ -686,23 +686,13 @@ class PPCallbackProxy : public clang::PPCallbacks { // [ToDo] Remove SWDEV_331863 related guards from CMakeLists.txt and HipifyAction.cpp when the blocker SWDEV_331863 is overcome 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) || (LLVM_VERSION_MAJOR == 15 && SWDEV_331863) - const clang::FileEntry *file, -#else - Optional file, -#endif - StringRef search_path, StringRef relative_path, + const clang::FileEntry *file, StringRef search_path, StringRef relative_path, const clang::Module *imported #if LLVM_VERSION_MAJOR > 6 , clang::SrcMgr::CharacteristicKind FileType #endif ) override { -#if (LLVM_VERSION_MAJOR < 15) || (LLVM_VERSION_MAJOR == 15 && SWDEV_331863) - auto f = file; -#else - auto f = &file->getFileEntry(); -#endif - hipifyAction.InclusionDirective(hash_loc, include_token, file_name, is_angled, filename_range, f, search_path, relative_path, imported); + hipifyAction.InclusionDirective(hash_loc, include_token, file_name, is_angled, filename_range, file, search_path, relative_path, imported); } void PragmaDirective(clang::SourceLocation Loc, clang::PragmaIntroducerKind Introducer) override {