Check for error status after NodeBuilder::Finalize.

Fixes #5871
Change: 141475958

tensorflow/cc/framework/cc_op_gen.cc

@@ -695,6 +695,7 @@ string OpInfo::GetConstructorBody() const {
   strings::StrAppend(&body, "  ", scope_str, ".UpdateBuilder(&builder);\n");
   strings::StrAppend(&body, "  ", scope_str, ".UpdateStatus(builder.Finalize(",
                      scope_str, ".graph(), &ret));\n");
+  strings::StrAppend(&body, "  ", return_on_error, "\n");
 
   // TODO(b/28152992): Enable this code-path once we have converted
   // all python shape functions to call their C++ versions.

tensorflow/cc/framework/cc_ops_test.cc

@@ -238,4 +238,15 @@ TEST(CCOpTest, EmptyConst) {
   EXPECT_FALSE(root.status().ok());
 }
 
+TEST(CCOpTest, InvalidFinalize) {
+  Scope root = Scope::NewRootScope();
+  auto read_up_to =
+      ops::ReaderReadUpTo(root, Variable(root, {}, DT_STRING),
+                          Variable(root, {}, DT_STRING), static_cast<int32>(2));
+  EXPECT_FALSE(root.status().ok());
+  auto err_msg = root.status().error_message();
+  EXPECT_NE(err_msg.find("'num_records' passed int32 expected int64"),
+            string::npos);
+}
+
 }  // namespace tensorflow