Another handle_data fix for graph-mode functions.

PiperOrigin-RevId: 198734229

diff --git a/tensorflow/python/framework/function.py b/tensorflow/python/framework/function.py
index 067522201694d64027ebcc7ea500e4771a96ed92..259cab6699f24c993da5657e5886806f0c6f5fc1 100644 (file)
--- a/tensorflow/python/framework/function.py
+++ b/tensorflow/python/framework/function.py
@@ -718,8 +718,12 @@ class _FuncGraph(ops.Graph):
           tensor.dtype, shape=tensor.get_shape(), name=name)
     # pylint: disable=protected-access
     if ops._USE_C_SHAPES:
-      handle_data = c_api.GetResourceHandleShapeAndType(tensor.graph._c_graph,
-                                                        tensor._as_tf_output())
+      if isinstance(tensor, ops.EagerTensor):
+        handle_data = tensor._handle_data
+      else:
+        handle_data = c_api.GetResourceHandleShapeAndType(
+            tensor.graph._c_graph, tensor._as_tf_output())
+
       if handle_data:
         c_api.SetResourceHandleShapeAndType(ph.graph._c_graph,
                                             ph._as_tf_output(),