Switch validate to use explicit diag() method. (#1750)

This CL changes validate.cpp to use diag providing an explicit
instruction. This changes the result of the function end checks to not
output a disassembly anymore as printing the last line of the module
didn't seem to make sense.

2 files changed, 8 insertions, 9 deletions

diff --git a/source/val/validate.cpp b/source/val/validate.cpp
index 9a16ba27..7971a9a3 100644
--- a/source/val/validate.cpp
+++ b/source/val/validate.cpp
@@ -250,11 +250,11 @@ spv_result_t ValidateBinaryUsingContextAndValidationState(
     return error;
 
   if (!vstate->has_memory_model_specified())
-    return vstate->diag(SPV_ERROR_INVALID_LAYOUT)
+    return vstate->diag(SPV_ERROR_INVALID_LAYOUT, nullptr)
            << "Missing required OpMemoryModel instruction.";
 
   if (vstate->in_function_body())
-    return vstate->diag(SPV_ERROR_INVALID_LAYOUT)
+    return vstate->diag(SPV_ERROR_INVALID_LAYOUT, nullptr)
            << "Missing OpFunctionEnd at end of module.";
 
   // TODO(umar): Add validation checks which require the parsing of the entire
@@ -268,7 +268,7 @@ spv_result_t ValidateBinaryUsingContextAndValidationState(
               bind(&ValidationState_t::getIdName, std::ref(*vstate), _1));
 
     auto id_str = ss.str();
-    return vstate->diag(SPV_ERROR_INVALID_ID)
+    return vstate->diag(SPV_ERROR_INVALID_ID, nullptr)
            << "The following forward referenced IDs have not been defined:\n"
            << id_str.substr(0, id_str.size() - 1);
   }
@@ -295,13 +295,14 @@ spv_result_t ValidateBinaryUsingContextAndValidationState(
   // OpFunctionCall instruction.
   if (vstate->entry_points().empty() &&
       !vstate->HasCapability(SpvCapabilityLinkage)) {
-    return vstate->diag(SPV_ERROR_INVALID_BINARY)
+    return vstate->diag(SPV_ERROR_INVALID_BINARY, nullptr)
            << "No OpEntryPoint instruction was found. This is only allowed if "
               "the Linkage capability is being used.";
   }
   for (const auto& entry_point : vstate->entry_points()) {
     if (vstate->IsFunctionCallTarget(entry_point)) {
-      return vstate->diag(SPV_ERROR_INVALID_BINARY)
+      return vstate->diag(SPV_ERROR_INVALID_BINARY,
+                          vstate->FindDef(entry_point))
              << "A function (" << entry_point
              << ") may not be targeted by both an OpEntryPoint instruction and "
                 "an OpFunctionCall instruction.";
diff --git a/test/val/val_layout_test.cpp b/test/val/val_layout_test.cpp
index 76eb1848..b7ddbb58 100644
--- a/test/val/val_layout_test.cpp
+++ b/test/val/val_layout_test.cpp
@@ -398,8 +398,7 @@ OpReturn
   CompileSuccessfully(s);
   ASSERT_EQ(SPV_ERROR_INVALID_LAYOUT, ValidateInstructions());
   EXPECT_THAT(getDiagnosticString(),
-              StrEq("Missing OpFunctionEnd at end of module.\n"
-                    "  OpReturn\n"));
+              StrEq("Missing OpFunctionEnd at end of module."));
 }
 
 TEST_F(ValidateLayout, MissingFunctionEndForFunctionPrototype) {
@@ -415,8 +414,7 @@ OpMemoryModel Logical GLSL450
   CompileSuccessfully(s);
   ASSERT_EQ(SPV_ERROR_INVALID_LAYOUT, ValidateInstructions());
   EXPECT_THAT(getDiagnosticString(),
-              StrEq("Missing OpFunctionEnd at end of module.\n"
-                    "  %3 = OpFunction %void None %2\n"));
+              StrEq("Missing OpFunctionEnd at end of module."));
 }
 
 using ValidateOpFunctionParameter = spvtest::ValidateBase<int>;