Bug 1478587 - Invoke TokenStreamChars::getNonAsciiCodePointDontNormalize passing CharT lead (not int32_t). r=arai

--HG--
extra : rebase_source : ea3053e8c30c0a529d24fce114208ee3e1215638

js/src/frontend/TokenStream.cpp

@@ -1828,7 +1828,7 @@ TokenStreamSpecific<CharT, AnyCharsAccess>::putIdentInCharBuffer(const CharT* id
             // |restoreNextRawCharAddress| undoes all gets, and this function
             // doesn't update line/column info.
             char32_t cp;
-            if (!getNonAsciiCodePointDontNormalize(unit, &cp))
+            if (!getNonAsciiCodePointDontNormalize(toCharT(unit), &cp))
                 return false;
 
             codePoint = cp;
@@ -2151,7 +2151,7 @@ TokenStreamSpecific<CharT, AnyCharsAccess>::regexpLiteral(TokenStart start, Toke
         MOZ_ASSERT(!this->isAsciiCodePoint(lead));
 
         char32_t codePoint;
-        if (!this->getNonAsciiCodePointDontNormalize(lead, &codePoint))
+        if (!this->getNonAsciiCodePointDontNormalize(this->toCharT(lead), &codePoint))
             return false;
 
         if (MOZ_UNLIKELY(codePoint == unicode::LINE_SEPARATOR ||

js/src/frontend/TokenStream.h

@@ -2315,6 +2315,7 @@ class MOZ_STACK_CLASS TokenStreamSpecific
     using GeneralCharsBase::newSimpleToken;
     using CharsBase::peekCodeUnit;
     // Deliberately don't |using| |sourceUnits| because of bug 1472569.  :-(
+    using CharsBase::toCharT;
     using GeneralCharsBase::ungetCodeUnit;
     using GeneralCharsBase::updateLineInfoForEOL;