AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-12-28 02:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
dan sinclair 2018-07-31 14:53:10 -04:00 committed by GitHub
parent a9d8fceec9
commit b7afe4e7ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/val/validate.cpp
View File

@ -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.";

6
test/val/val_layout_test.cpp
View File

@ -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>;