AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-21 19:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv-diff: Fix asserts in ComparePreambleInstructions() (#4872)

Browse Source 
These asserts are not valid for string literals, which may
contain several words:
  assert(a_operand.words.size() == 1);
  assert(b_operand.words.size() == 1);

It looks like they only make sense for the default case, which
assumes that both operands contain a single word.

Running a debug version of spirv-diff on any shader containing
a string literal will hit the original asserts.
This commit is contained in:
jeremyg-lunarg 2022-08-04 10:44:15 -06:00 committed by GitHub
parent 08c542d344
commit b362d2b7d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/diff/diff.cpp
View File

@ -758,9 +758,6 @@ int Differ::ComparePreambleInstructions(const opt::Instruction* a,
return 1;
}
assert(a_operand.words.size() == 1);
assert(b_operand.words.size() == 1);
switch (a_operand.type) {
case SPV_OPERAND_TYPE_ID:
// Don't compare ids, there can't be multiple instances of the
@ -781,6 +778,9 @@ int Differ::ComparePreambleInstructions(const opt::Instruction* a,
}
default:
// Expect literal values to match.
assert(a_operand.words.size() == 1);
assert(b_operand.words.size() == 1);
if (a_operand.words[0] < b_operand.words[0]) {
return -1;
}