check only for aux builtins, expect fail in failing test

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

clang/include/clang/Basic/Builtins.h

@@ -74,7 +74,6 @@ struct Info {
   const char *Features;
   HeaderDesc Header;
   LanguageID Langs;
-  bool operator==(const Info &Other) const;
 };
 
 /// Holds information about both target-independent and
@@ -269,10 +268,6 @@ class Context {
   /// for AuxTarget).
   unsigned getAuxBuiltinID(unsigned ID) const { return ID - TSRecords.size(); }
 
-  // Return true if the AuxBuiltin ID represents a target-specific builtin that
-  // is always unsupported on the default target.
-  bool isAuxBuiltinIDAlwaysUnsupportedOnDefaultTarget(unsigned ID) const;
-
   /// Returns true if this is a libc/libm function without the '__builtin_'
   /// prefix.
   static bool isBuiltinFunc(llvm::StringRef Name);

clang/lib/Basic/Builtins.cpp

@@ -41,14 +41,6 @@ static constexpr Builtin::Info BuiltinInfo[] = {
 #include "clang/Basic/Builtins.inc"
 };
 
-bool Builtin::Info::operator==(const Builtin::Info &Other) const {
-  auto StrCompare = [](StringRef A, StringRef B) { return A == B; };
-  return Name == Other.Name && StrCompare(Type, Other.Type) &&
-         StrCompare(Attributes, Other.Attributes) &&
-         StrCompare(Features, Other.Features) && Header.ID == Other.Header.ID &&
-         Langs == Other.Langs;
-}
-
 const Builtin::Info &Builtin::Context::getRecord(unsigned ID) const {
   if (ID < Builtin::FirstTSBuiltin)
     return BuiltinInfo[ID];
@@ -191,17 +183,6 @@ unsigned Builtin::Context::getRequiredVectorWidth(unsigned ID) const {
   return Width;
 }
 
-bool Builtin::Context::isAuxBuiltinIDAlwaysUnsupportedOnDefaultTarget(
-    unsigned ID) const {
-  assert(isAuxBuiltinID(ID) && "Expected aux target builtin ID");
-  const auto &Record = getRecord(ID);
-  for (const auto &MainTargetBuiltin : TSRecords)
-    if (Record == MainTargetBuiltin)
-      return false;
-
-  return true;
-}
-
 bool Builtin::Context::isLike(unsigned ID, unsigned &FormatIdx,
                               bool &HasVAListArg, const char *Fmt) const {
   assert(Fmt && "Not passed a format string");

clang/lib/Lex/PPMacroExpansion.cpp

@@ -1819,18 +1819,8 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
             // usual allocation and deallocation functions. Required by libc++
             return 201802;
           default:
-            // We may get here because of aux builtins which may not be
-            // supported on the default target, for example if we have an X86
-            // specific builtin and the current target is SPIR-V. Sometimes we
-            // rely on __has_builtin returning true when passed a builtin that
-            // is not supported on the default target due to LangOpts but is
-            // supported on the aux target. See
-            // test/Headers/__cpuidex_conflict.c for an example. If the builtin
-            // is an aux builtin and it can never be supported on the default
-            // target, __has_builtin should return false.
-            if (getBuiltinInfo().isAuxBuiltinID(BuiltinID) &&
-                getBuiltinInfo().isAuxBuiltinIDAlwaysUnsupportedOnDefaultTarget(
-                    BuiltinID))
+            // __has_builtin should return false for aux builtins.
+            if (getBuiltinInfo().isAuxBuiltinID(BuiltinID))
               return false;
             return Builtin::evaluateRequiredTargetFeatures(
                 getBuiltinInfo().getRequiredFeatures(BuiltinID),

clang/test/Headers/__cpuidex_conflict.c

@@ -3,7 +3,10 @@
 // RUN: %clang_cc1 %s -ffreestanding -fms-extensions -fms-compatibility \
 // RUN:  -fms-compatibility-version=19.00 -triple x86_64-pc-windows-msvc -emit-llvm -o -
 // %clang_cc1 %s -ffreestanding -triple x86_64-w64-windows-gnu -fms-extensions -emit-llvm -o -
-// RUN: %clang_cc1 %s -ffreestanding -fopenmp -fopenmp-is-target-device -aux-triple x86_64-unknown-linux-gnu
+//
+// TODO(boomanaiden154)
+// See https://github.com/llvm/llvm-project/pull/121839
+// RUN: not %clang_cc1 %s -ffreestanding -fopenmp -fopenmp-is-target-device -aux-triple x86_64-unknown-linux-gnu
 
 typedef __SIZE_TYPE__ size_t;