Make the OpenCL type opt-in, and only use it for non-header and non-lib

X86 builtins.

This minimizes the delta from the non-TableGen and avoids unintended
consequences on other targets.

Author: chandlerc

clang/include/clang/Basic/BuiltinsBase.td

@@ -88,6 +88,8 @@ class Builtin {
   // On some platforms, some functions are actually macros. In that case we need
   // to #undef them.
   bit RequiresUndef = 0;
+  // Enables builtins to generate `long long` outside of OpenCL and `long` inside.
+  bit EnableOpenCLLong = 0;
 }
 
 class CustomEntry {

clang/include/clang/Basic/BuiltinsX86.td

@@ -15,6 +15,7 @@ include "clang/Basic/BuiltinsBase.td"
 class X86Builtin<string prototype> : TargetBuiltin {
   let Spellings = ["__builtin_ia32_" # NAME];
   let Prototype = prototype;
+  let EnableOpenCLLong = 1;
 }
 
 class X86NoPrefixBuiltin<string prototype> : TargetBuiltin {
@@ -29,7 +30,9 @@ class X86LibBuiltin<string prototype> : TargetLibBuiltin {
 
 def rdpmc : X86Builtin<"unsigned long long int(int)">;
 def rdtsc : X86Builtin<"unsigned long long int()">;
-def __rdtsc : X86NoPrefixBuiltin<"unsigned long long int()">;
+def __rdtsc : X86NoPrefixBuiltin<"unsigned long long int()"> {
+  let EnableOpenCLLong = 1;
+}
 def rdtscp : X86Builtin<"unsigned long long int(unsigned int*)">;
 
 // Undefined Values
@@ -1023,7 +1026,7 @@ let Features = "rdpid", Attributes = [NoThrow] in {
   def rdpid : X86Builtin<"unsigned int()">;
 }
 
-let Features = "rdpru", Attributes = [NoThrow] in {
+let Features = "rdpru", Attributes = [NoThrow], EnableOpenCLLong = 0 in {
   def rdpru : X86Builtin<"unsigned long long int(int)">;
 }
 

clang/utils/TableGen/ClangBuiltinsEmitter.cpp

@@ -31,7 +31,8 @@ enum class BuiltinType {
 class PrototypeParser {
 public:
   PrototypeParser(StringRef Substitution, const Record *Builtin)
-      : Loc(Builtin->getFieldLoc("Prototype")), Substitution(Substitution) {
+      : Loc(Builtin->getFieldLoc("Prototype")), Substitution(Substitution),
+        EnableOpenCLLong(Builtin->getValueAsBit("EnableOpenCLLong")) {
     ParsePrototype(Builtin->getValueAsString("Prototype"));
   }
 
@@ -109,7 +110,7 @@ class PrototypeParser {
     } else if (T.consume_back("&")) {
       ParseType(T);
       Type += "&";
-    } else if (T.consume_front("long long")) {
+    } else if (EnableOpenCLLong && T.consume_front("long long")) {
       Type += "O";
       ParseType(T);
     } else if (T.consume_front("long")) {
@@ -202,6 +203,7 @@ class PrototypeParser {
 private:
   SMLoc Loc;
   StringRef Substitution;
+  bool EnableOpenCLLong;
   std::string Type;
 };