[TF] Removed 'HackyTensorflowMigrationSupport'.

include/swift/AST/KnownIdentifiers.def

@@ -118,6 +118,7 @@ IDENTIFIER(withArguments)
 IDENTIFIER(withKeywordArguments)
 
 // SWIFT_ENABLE_TENSORFLOW
+IDENTIFIER(TensorFlow)
 // KeyPathIterable
 IDENTIFIER(AllKeyPaths)
 IDENTIFIER(allKeyPaths)

include/swift/AST/KnownProtocols.def

@@ -83,6 +83,8 @@ PROTOCOL(FloatingPoint)
 PROTOCOL(KeyPathIterable)
 PROTOCOL(TensorArrayProtocol)
 PROTOCOL(TensorGroup)
+PROTOCOL_(TensorFlowDataTypeCompatible)
+PROTOCOL(TensorProtocol)
 PROTOCOL(VectorNumeric)
 PROTOCOL(Differentiable)
 

lib/AST/ASTContext.cpp

@@ -809,19 +809,62 @@ CanType ASTContext::getAnyObjectType() const {
 
 // SWIFT_ENABLE_TENSORFLOW
 
-/// Retrieve the decl for TensorDataType.
+/// Retrieve the decl for TensorFlow.TensorHandle iff the TensorFlow module has
+/// been imported.  Otherwise, this returns null.
+ClassDecl *ASTContext::getTensorHandleDecl() const {
+  if (getImpl().TensorHandleDecl)
+    return getImpl().TensorHandleDecl;
+
+  // See if the TensorFlow module was imported.  If not, return null.
+  auto tfModule = getLoadedModule(Id_TensorFlow);
+  if (!tfModule)
+    return nullptr;
+
+  SmallVector<ValueDecl *, 1> results;
+  tfModule->lookupValue({ }, getIdentifier("TensorHandle"),
+                        NLKind::UnqualifiedLookup, results);
+
+  for (auto result : results)
+    if (auto CD = dyn_cast<ClassDecl>(result))
+      return getImpl().TensorHandleDecl = CD;
+  return nullptr;
+}
+
+/// Retrieve the decl for TensorFlow.TensorShape iff the TensorFlow module has
+/// been imported.  Otherwise, this returns null.
+StructDecl *ASTContext::getTensorShapeDecl() const {
+  if (getImpl().TensorShapeDecl)
+    return getImpl().TensorShapeDecl;
+
+  // See if the TensorFlow module was imported.  If not, return null.
+  auto tfModule = getLoadedModule(Id_TensorFlow);
+  if (!tfModule)
+    return nullptr;
+
+  SmallVector<ValueDecl *, 1> results;
+  tfModule->lookupValue({}, getIdentifier("TensorShape"),
+                        NLKind::UnqualifiedLookup, results);
+
+  for (auto result : results)
+    if (auto CD = dyn_cast<StructDecl>(result))
+      return getImpl().TensorShapeDecl = CD;
+  return nullptr;
+}
+
+/// Retrieve the decl for TensorFlow.TensorDataType iff the TensorFlow module has
+/// been imported.  Otherwise, this returns null.
 StructDecl *ASTContext::getTensorDataTypeDecl() const {
   if (getImpl().TensorDataTypeDecl)
     return getImpl().TensorDataTypeDecl;
 
-  // See if the Stdlib module was imported.  If not, return null.
-  auto stdlibModule = getStdlibModule();
-  if (!stdlibModule)
+  // See if the TensorFlow module was imported.  If not, return null.
+  auto tfModule = getLoadedModule(Id_TensorFlow);
+  if (!tfModule)
     return nullptr;
 
   SmallVector<ValueDecl *, 1> results;
-  stdlibModule->lookupValue({}, getIdentifier("TensorDataType"),
-                            NLKind::UnqualifiedLookup, results);
+  tfModule->lookupValue({}, getIdentifier("TensorDataType"),
+                        NLKind::UnqualifiedLookup, results);
 
   for (auto result : results)
     if (auto CD = dyn_cast<StructDecl>(result))
@@ -905,6 +948,10 @@ ProtocolDecl *ASTContext::getProtocol(KnownProtocolKind kind) const {
   // SWIFT_ENABLE_TENSORFLOW
   case KnownProtocolKind::TensorArrayProtocol:
   case KnownProtocolKind::TensorGroup:
+  case KnownProtocolKind::TensorFlowDataTypeCompatible:
+  case KnownProtocolKind::TensorProtocol:
+    M = getLoadedModule(Id_TensorFlow);
+    break;
   default:
     M = getStdlibModule();
     break;

lib/IRGen/GenMeta.cpp

@@ -4211,6 +4211,8 @@ SpecialProtocol irgen::getSpecialProtocolID(ProtocolDecl *P) {
   case KnownProtocolKind::KeyPathIterable:
   case KnownProtocolKind::TensorArrayProtocol:
   case KnownProtocolKind::TensorGroup:
+  case KnownProtocolKind::TensorFlowDataTypeCompatible:
+  case KnownProtocolKind::TensorProtocol:
   case KnownProtocolKind::VectorNumeric:
   case KnownProtocolKind::Differentiable:
     return SpecialProtocol::None;

stdlib/public/core/CMakeLists.txt

@@ -184,7 +184,6 @@ set(SWIFTLIB_ESSENTIAL
   StringGraphemeBreaking.swift # ORDER DEPENDENCY: Must follow UTF16.swift
   ValidUTF8Buffer.swift
   WriteBackMutableSlice.swift
-  HackyTensorflowMigrationSupport.swift
   MigrationSupport.swift)
 
 set(SWIFTLIB_ESSENTIAL_GYB_SOURCES

stdlib/public/core/GroupInfo.json

@@ -176,9 +176,6 @@
   "AutoDiff": [
     "AutoDiff.swift",
   ],
-  "HackyTensorflowMigrationSupport": [
-    "HackyTensorflowMigrationSupport.swift",
-  ],
   "Optional": [
     "Optional.swift"
   ],

test/Index/Store/unit-one-file-multi-file-invocation.swift

@@ -13,8 +13,8 @@
 
 // CHECK: [[SWIFT]]
 // CHECK: DEPEND START
-// CHECK: Record | system | Swift.String | [[MODULE]] | {{.+}}.swiftmodule_String-{{.*}}
 // CHECK: Record | system | Swift.Math.Floating | [[MODULE]] | {{.+}}.swiftmodule_Math_Floating-{{.*}}
+// CHECK: Record | system | Swift.String | [[MODULE]] | {{.+}}.swiftmodule_String-{{.*}}
 // CHECK: DEPEND END
 
 func test1() {

utils/update_checkout/update-checkout-config.json

@@ -349,7 +349,7 @@
                 "clang-tools-extra": "swift-DEVELOPMENT-SNAPSHOT-2019-05-26-a",
                 "libcxx": "swift-DEVELOPMENT-SNAPSHOT-2019-05-26-a",
                 "tensorflow": "ebc41609e27dcf0998d8970e77a2e1f53e13ac86",
-                "tensorflow-swift-apis": "1d484e1826c7d4efff6d9eb66d6eb6722ce84f12",
+                "tensorflow-swift-apis": "835d1436a01d9261f0467bc2803cc7f6ac56ed80",
                 "indexstore-db": "swift-DEVELOPMENT-SNAPSHOT-2019-05-26-a",
                 "sourcekit-lsp": "swift-DEVELOPMENT-SNAPSHOT-2019-05-26-a"
             }