Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 11:15:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1478587 - Switch on the numeric type underlying CharT, not on CharT itself, in a couple switches in TokenStreamSpecific::getTokenInternal. r=arai

Browse Source 
--HG--
extra : rebase_source : 36bfc02d5b222f3ada5908f5d104fcf6237df2c1
This commit is contained in:
Jeff Walden 2018-07-25 20:11:15 -07:00
parent 826ea7fdec
commit f9b90795e5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/frontend/TokenStream.cpp
View File

@ -2543,7 +2543,10 @@ TokenStreamSpecific<CharT, AnyCharsAccess>::getTokenInternal(TokenKind* const tt
#ifdef DEBUG
simpleKind = TokenKind::Limit; // sentinel value for code after switch
#endif
switch (static_cast<CharT>(unit)) {
// The block a ways above eliminated all non-ASCII, so cast to the
// smallest type possible to assist the C++ compiler.
switch (AssertedCast<uint8_t>(CodeUnitValue(toCharT(unit)))) {
case '.':
unit = getCodeUnit();
if (IsAsciiDigit(unit)) {
@ -2752,7 +2755,7 @@ TokenStreamSpecific<CharT, AnyCharsAccess>::getTokenInternal(TokenKind* const tt
ungetCodeUnit(unit);
error(JSMSG_ILLEGAL_CHARACTER);
return badToken();
} // switch (static_cast<CharT>(unit))
} // switch (AssertedCast<uint8_t>(CodeUnitValue(toCharT(unit))))
MOZ_ASSERT(simpleKind != TokenKind::Limit,
"switch-statement should have set |simpleKind| before "
@ -2865,7 +2868,9 @@ TokenStreamSpecific<CharT, AnyCharsAccess>::getStringOrTemplateToken(char untilC
continue;
}
switch (static_cast<CharT>(unit)) {
// The block above eliminated all non-ASCII, so cast to the
// smallest type possible to assist the C++ compiler.
switch (AssertedCast<uint8_t>(CodeUnitValue(toCharT(unit)))) {
case 'b': unit = '\b'; break;
case 'f': unit = '\f'; break;
case 'n': unit = '\n'; break;
@ -3062,7 +3067,7 @@ TokenStreamSpecific<CharT, AnyCharsAccess>::getStringOrTemplateToken(char untilC
unit = char16_t(val);
break;
} // default
}
} // switch (AssertedCast<uint8_t>(CodeUnitValue(toCharT(unit))))
if (!this->charBuffer.append(unit))
return false;