BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SPV: Fix #1783: Don't do bounds checking for spec-const-expression size

Browse source 
It's okay for symbolic spec-consts, but without constant folding,
not okay when the array size is an expression.
This commit is contained in:
John Kessenich 2019-07-03 09:28:28 -06:00
parent 4b4b41a634
commit 96524f9168
5 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
glslang/MachineIndependent/ParseContextBase.cpp
View file

@ -254,11 +254,17 @@ void TParseContextBase::trackLinkage(TSymbol& symbol)
// Give an error if not.
void TParseContextBase::checkIndex(const TSourceLoc& loc, const TType& type, int& index)
{
const auto sizeIsSpecializationExpression = [&type]() {
return type.containsSpecializationSize() &&
type.getArraySizes()->getOuterNode() != nullptr &&
type.getArraySizes()->getOuterNode()->getAsSymbolNode() == nullptr; };
if (index < 0) {
error(loc, "", "[", "index out of range '%d'", index);
index = 0;
} else if (type.isArray()) {
if (type.isSizedArray() && index >= type.getOuterArraySize()) {
if (type.isSizedArray() && !sizeIsSpecializationExpression() &&
index >= type.getOuterArraySize()) {
error(loc, "", "[", "array index out of range '%d'", index);
index = type.getOuterArraySize() - 1;
}