Merge branch 'swift/tensorflow' of github.com:apple/llvm-project into swift/tensorflow-stage

* 'swift/tensorflow' of github.com:apple/llvm-project:
  Remove ISO646 include

Author: ainu-bot

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -402,9 +402,9 @@ template <> struct less<swift::ClusteredBitVector> {
     for (; iL >= 0 && iR >= 0; --iL, --iR) {
       bool bL = lhs[iL];
       bool bR = rhs[iR];
-      if (bL and not bR)
+      if (bL && !bR)
         return false;
-      if (bR and not bL)
+      if (bR && !bL)
         return true;
     }
     return false;

llvm/include/llvm/Support/Threading.h

@@ -19,7 +19,11 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
 #include "llvm/Support/Compiler.h"
+// SWIFT_ENABLE_TENSORFLOW
+#if 0
 #include <ciso646> // So we can check the C++ standard lib macros.
+#endif
+// SWIFT_ENABLE_TENSORFLOW END
 #include <functional>
 
 #if defined(_MSC_VER)