AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

skslc now errors on out-of-range shifts

Browse Source 
Bug: oss-fuzz:14043
Change-Id: Iac068faf311f418200ec7049ce67f06e2b8c812d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/219860
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
This commit is contained in:
Ethan Nicholas 2019-06-10 09:56:29 -04:00 committed by Skia Commit-Bot
parent de24185f35
commit feba68a078
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sksl/SkSLIRGenerator.cpp
View File

@ -1523,15 +1523,27 @@ std::unique_ptr<Expression> IRGenerator::constantFold(const Expression& left,
case Token::BITWISEAND: return RESULT(Int, &);
case Token::BITWISEOR: return RESULT(Int, |);
case Token::BITWISEXOR: return RESULT(Int, ^);
case Token::SHL: return RESULT(Int, <<);
case Token::SHR: return RESULT(Int, >>);
case Token::EQEQ: return RESULT(Bool, ==);
case Token::NEQ: return RESULT(Bool, !=);
case Token::GT: return RESULT(Bool, >);
case Token::GTEQ: return RESULT(Bool, >=);
case Token::LT: return RESULT(Bool, <);
case Token::LTEQ: return RESULT(Bool, <=);
default: return nullptr;
case Token::SHL:
if (rightVal >= 0 && rightVal <= 31) {
return RESULT(Int, <<);
}
fErrors.error(right.fOffset, "shift value out of range");
return nullptr;
case Token::SHR:
if (rightVal >= 0 && rightVal <= 31) {
return RESULT(Int, >>);
}
fErrors.error(right.fOffset, "shift value out of range");
return nullptr;
default:
return nullptr;
}
}
if (left.fKind == Expression::kFloatLiteral_Kind &&