---

yaml
---
r: 311294
b: refs/heads/tensorflow-merge
c: da93d3e
h: refs/heads/master

Author: dan-zheng

[refs]

@@ -1379,7 +1379,7 @@ refs/heads/chase-my-tail: 8bb91443a9e81bbfac92a2621a0af887a1da8dbf
 refs/heads/consider-outer-alternatives: 708bac749ec60a22a79e2eefbe734f9488a7370d
 refs/heads/revert-25740-oops-i-linked-it-again: fdd41aeb682fc488572bdc1cf71b2ff6997ba576
 refs/heads/swift-5.1-branch-06-12-2019: e63b7b2d3b93c48232d386099d0ec525d21d8f8d
-refs/heads/tensorflow-merge: 3da28223a7f04660946a1849b3c48c49e5854894
+refs/heads/tensorflow-merge: da93d3e5a7d92853001c6b5674960d5fa93a415b
 refs/heads/update-checkout-sha-info: 5832743c5c2a842976c42a508a4c6dcceefb0aef
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-12-a: 228f0448d9bb909aacbba4afcb7c600a405d15da
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-14-a: 922861a77b5fc2bf46bc917da70ceb15eef76836

branches/tensorflow-merge/lib/ParseSIL/ParseSIL.cpp

@@ -895,6 +895,7 @@ void SILParser::convertRequirements(SILFunction *F,
 /// - A metatype (the instance type is parsed) ($Float).
 /// - An aggregate ([i32 1, i64 2, f32 3.0]).
 ///   - Aggregates values represent constant arrays/structs/tuples.
+/// - A SIL function reference (@foo : $(Int) -> Int).
 /// Returns true on error.
 static bool parseSymbolicValue(SymbolicValue &value, SILParser &SP,
                                SILBuilder &B) {
@@ -1010,6 +1011,15 @@ static bool parseSymbolicValue(SymbolicValue &value, SILParser &SP,
     value = SymbolicValue::getMetatype(metatype);
     return false;
   }
+  // Handle SIL function references.
+  if (P.Tok.is(tok::at_sign)) {
+    SILFunction *func;
+    SILLocation funcLoc = RegularLocation(P.getEndOfPreviousLoc());
+    if (SP.parseSILFunctionRef(funcLoc, func))
+      return true;
+    value = SymbolicValue::getFunction(func);
+    return false;
+  }
   // Handle aggregate literals.
   if (P.Tok.is(tok::l_square)) {
     SourceLoc lSquareLoc = P.consumeToken(tok::l_square);

branches/tensorflow-merge/lib/SIL/SILPrinter.cpp

@@ -1217,6 +1217,15 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
       *this << SILType::getPrimitiveObjectType(metatype.getInstanceType());
       return;
     }
+    case SymbolicValue::Function: {
+      assert(!v.getFunctionValue().second &&
+             "SILFunction SymbolicValues with protocol conformances cannot be "
+             "printed");
+      auto function = v.getFunctionValue().first;
+      *this << "@" << function->getName();
+      *this << " : $" << function->getLoweredFunctionType();
+      return;
+    }
     case SymbolicValue::Aggregate:
       *this << "[";
       interleave(v.getAggregateValue(), [&](SymbolicValue element) {
@@ -1226,7 +1235,6 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
       });
       *this << "]";
       return;
-    case SymbolicValue::Function:
     case SymbolicValue::UninitMemory:
     case SymbolicValue::Unknown:
       llvm_unreachable("Unimplemented SymbolicValue case");

branches/tensorflow-merge/test/TensorFlow/graph_op_inst.sil

@@ -15,7 +15,8 @@ bb0:
   %2 = graph_op "tf.Dummy"() {float1: f64 3.14, float2: f32 -3.14} : $Tensor<Float>
   %3 = graph_op "tf.Dummy"() {string1: "hello", string2: "world"} : $Tensor<Float>
   %4 = graph_op "tf.Dummy"() {metatype1: $Float, metatype2: $Tensor<Float>} : $Tensor<Float>
-  %5 = graph_op "tf.Dummy"() {array: [[i8 1, i32 -2], [f32 -1.0, $Float]]} : $Tensor<Float>
+  %5 = graph_op "tf.Dummy"() {function1: @chained_op_test : $@convention(thin) (Tensor<Float>, Tensor<Float>) -> Tensor<Float>} : $Tensor<Float>
+  %6 = graph_op "tf.Dummy"() {array: [[i8 1, i32 -2], [f32 -1.0, $Float]]} : $Tensor<Float>
   return %0 : $Tensor<Float>
 }
 
@@ -26,7 +27,8 @@ bb0:
 // CHECK-NEXT:   %2 = graph_op "tf.Dummy"() {float1: f64 0x40091EB851EB851F /* 3.1400000000000001 */, float2: f32 0xC048F5C3 /* -3.1400001 */} : $Tensor<Float>
 // CHECK-NEXT:   %3 = graph_op "tf.Dummy"() {string1: "hello", string2: "world"} : $Tensor<Float>
 // CHECK-NEXT:   %4 = graph_op "tf.Dummy"() {metatype1: $Float, metatype2: $Tensor<Float>} : $Tensor<Float>
-// CHECK-NEXT:   %5 = graph_op "tf.Dummy"() {array: {{\[\[}}i8 1, i32 -2], [f32 0xBF800000 /* -1 */, $Float]]} : $Tensor<Float>
+// CHECK-NEXT:   %5 = graph_op "tf.Dummy"() {function1: @chained_op_test : $@convention(thin) (Tensor<Float>, Tensor<Float>) -> Tensor<Float>} : $Tensor<Float>
+// CHECK-NEXT:   %6 = graph_op "tf.Dummy"() {array: {{\[\[}}i8 1, i32 -2], [f32 0xBF800000 /* -1 */, $Float]]} : $Tensor<Float>
 // CHECK-NEXT:   return %0 : $Tensor<Float>
 // CHECK-NEXT: }