From 122b86d07433f811fd5e19e64ac8e2826ca33361 Mon Sep 17 00:00:00 2001
From: Sven van Haastregt <sven.vanhaastregt@arm.com>
Date: Mon, 17 Jun 2019 10:06:34 +0000
Subject: [PATCH] Recommit [OpenCL] Move OpenCLBuiltins.td and remove unused
 include

Reland r363242 after fixing an issue with the tablegen dependence.

Patch by Pierre Gondois and Sven van Haastregt.

Differential revision: https://reviews.llvm.org/D62849

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@363541 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/clang/Basic/CMakeLists.txt                  | 6 ------
 lib/Sema/CMakeLists.txt                             | 8 ++++++++
 {include/clang/Basic => lib/Sema}/OpenCLBuiltins.td | 0
 lib/Sema/SemaLookup.cpp                             | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)
 rename {include/clang/Basic => lib/Sema}/OpenCLBuiltins.td (100%)

diff --git a/include/clang/Basic/CMakeLists.txt b/include/clang/Basic/CMakeLists.txt
index e26e683b9a..15bed5adec 100644
--- a/include/clang/Basic/CMakeLists.txt
+++ b/include/clang/Basic/CMakeLists.txt
@@ -41,12 +41,6 @@ clang_tablegen(AttrHasAttributeImpl.inc -gen-clang-attr-has-attribute-impl
   TARGET ClangAttrHasAttributeImpl
   )
 
-clang_tablegen(OpenCLBuiltins.inc
-  -I ${CMAKE_CURRENT_SOURCE_DIR}/../../ -gen-clang-opencl-builtins
-  SOURCE OpenCLBuiltins.td
-  TARGET ClangOpenCLBuiltinsImpl
-  )
-
 # ARM NEON
 clang_tablegen(arm_neon.inc -gen-arm-neon-sema
   SOURCE arm_neon.td
diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
index 1684e2a1ca..742343583d 100644
--- a/lib/Sema/CMakeLists.txt
+++ b/lib/Sema/CMakeLists.txt
@@ -9,6 +9,11 @@ if (MSVC)
   set_source_files_properties(SemaTemplate.cpp PROPERTIES COMPILE_FLAGS /bigobj)
 endif()
 
+clang_tablegen(OpenCLBuiltins.inc -gen-clang-opencl-builtins
+  SOURCE OpenCLBuiltins.td
+  TARGET ClangOpenCLBuiltinsImpl
+  )
+
 add_clang_library(clangSema
   AnalysisBasedWarnings.cpp
   CodeCompleteConsumer.cpp
@@ -59,6 +64,9 @@ add_clang_library(clangSema
   SemaType.cpp
   TypeLocBuilder.cpp
 
+  DEPENDS
+  ClangOpenCLBuiltinsImpl
+
   LINK_LIBS
   clangAST
   clangAnalysis
diff --git a/include/clang/Basic/OpenCLBuiltins.td b/lib/Sema/OpenCLBuiltins.td
similarity index 100%
rename from include/clang/Basic/OpenCLBuiltins.td
rename to lib/Sema/OpenCLBuiltins.td
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 7643a06a82..086f90f5e9 100644
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -46,7 +46,7 @@
 #include <utility>
 #include <vector>
 
-#include "clang/Basic/OpenCLBuiltins.inc"
+#include "OpenCLBuiltins.inc"
 
 using namespace clang;
 using namespace sema;
-- 
2.50.1