Remove conflicting ISO646 definitions

Add empty _Differentiation module

Author: texasmichelle

include/swift/SIL/SILBuiltinVisitor.h

@@ -23,6 +23,12 @@
 #include "swift/SIL/SILInstruction.h"
 #include <type_traits>
 
+// SWIFT_ENABLE_TENSORFLOW
+#undef and
+#undef or
+#undef xor
+// SWIFT_ENABLE_TENSORFLOW END
+
 namespace swift {
 
 template <typename ImplClass, typename ValueRetTy = void>

lib/AST/Builtins.cpp

@@ -30,6 +30,12 @@
 #include "llvm/Support/ManagedStatic.h"
 #include <tuple>
 
+// SWIFT_ENABLE_TENSORFLOW
+#undef and
+#undef or
+#undef xor
+// SWIFT_ENABLE_TENSORFLOW END
+
 using namespace swift;
 
 struct BuiltinExtraInfoTy {

lib/IRGen/GenBuiltin.cpp

@@ -34,6 +34,12 @@
 #include "IRGenModule.h"
 #include "LoadableTypeInfo.h"
 
+// SWIFT_ENABLE_TENSORFLOW
+#undef and
+#undef or
+#undef xor
+// SWIFT_ENABLE_TENSORFLOW END
+
 using namespace swift;
 using namespace irgen;
 

lib/SIL/IR/SILModule.cpp

@@ -32,6 +32,13 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/YAMLTraits.h"
 #include <functional>
+
+// SWIFT_ENABLE_TENSORFLOW
+#undef and
+#undef or
+#undef xor
+// SWIFT_ENABLE_TENSORFLOW END
+
 using namespace swift;
 using namespace Lowering;
 

lib/SILGen/SILGenBuiltin.cpp

@@ -29,6 +29,12 @@
 #include "swift/SIL/SILArgument.h"
 #include "swift/SIL/SILUndef.h"
 
+// SWIFT_ENABLE_TENSORFLOW
+#undef and
+#undef or
+#undef xor
+// SWIFT_ENABLE_TENSORFLOW END
+
 using namespace swift;
 using namespace Lowering;
 

lib/SILOptimizer/Analysis/SimplifyInstruction.cpp

@@ -27,6 +27,12 @@
 #include "swift/SILOptimizer/Analysis/ValueTracking.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
 
+// SWIFT_ENABLE_TENSORFLOW
+#undef and
+#undef or
+#undef xor
+// SWIFT_ENABLE_TENSORFLOW END
+
 using namespace swift;
 using namespace swift::PatternMatch;
 

stdlib/public/Differentiation/Empty.swift

@@ -1,3 +1,4 @@
 // SWIFT_ENABLE_TENSORFLOW
 // Empty Swift file, only for tensorflow branch.
 // See explanation in stdlib/public/Differentiation/CMakeLists.txt.
+public struct _Differentiation { }