Fix CHECK-failure caused by constant folding code.

mihaimaruseac · tensorflower-gardener · commit be7b286d40bc · 2021-11-15T14:06:41.000-08:00
We're losing a `const` qualifier here, but unless we get to use more `StatusOr` objects, this is the best alternative.

PiperOrigin-RevId: 410072241
Change-Id: I69535c91490f0d23facb9587d2ff59db0782cda6
diff --git a/tensorflow/core/grappler/optimizers/constant_folding.cc b/tensorflow/core/grappler/optimizers/constant_folding.cc
@@ -1017,7 +1017,12 @@ bool ConstantFolding::IsFoldableUncached(
       }
     }
     for (const auto& output_prop : output_props) {
-      const PartialTensorShape output_shape(output_prop.shape());
+      PartialTensorShape output_shape;
+      if (!PartialTensorShape::BuildPartialTensorShape(output_prop.shape(),
+                                                       &output_shape)
+               .ok()) {
+        return false;
+      }
       if (output_shape.IsFullyDefined()) {
         const int64_t num_bytes =
             output_shape.num_elements() * DataTypeSize(output_prop.dtype());

Original file line number	Diff line number	Diff line change
`@@ -1017,7 +1017,12 @@ bool ConstantFolding::IsFoldableUncached(`
`1017`	`1017`	`}`
`1018`	`1018`	`}`
`1019`	`1019`	`for (const auto& output_prop : output_props) {`
`1020`		`- const PartialTensorShape output_shape(output_prop.shape());`
	`1020`	`+ PartialTensorShape output_shape;`
	`1021`	`+ if (!PartialTensorShape::BuildPartialTensorShape(output_prop.shape(),`
	`1022`	`+ &output_shape)`
	`1023`	`+ .ok()) {`
	`1024`	`+ return false;`
	`1025`	`+ }`
`1021`	`1026`	`if (output_shape.IsFullyDefined()) {`
`1022`	`1027`	`const int64_t num_bytes =`
`1023`	`1028`	`output_shape.num_elements() * DataTypeSize(output_prop.dtype());`