Changeset 247845 in webkit

Timestamp:

Jul 25, 2019 4:55:45 PM (5 years ago)

Author:

Ross Kirsling

Message:

Legacy numeric literals should not permit separators or BigInt
​https://bugs.webkit.org/show_bug.cgi?id=199984

Reviewed by Keith Miller.

JSTests:

• stress/big-int-literals.js:
• stress/numeric-literal-separators.js:

Source/JavaScriptCore:

• parser/Lexer.cpp:

(JSC::Lexer<T>::parseOctal):
(JSC::Lexer<T>::parseDecimal):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/big-int-literals.js (modified) (2 diffs)
• JSTests/stress/numeric-literal-separators.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Lexer.cpp (modified) (8 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2019-07-25  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Legacy numeric literals should not permit separators or BigInt
+        https://bugs.webkit.org/show_bug.cgi?id=199984
+
+        Reviewed by Keith Miller.
+
+        * stress/big-int-literals.js:
+        * stress/numeric-literal-separators.js:
+
 2019-07-25  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/JSTests/stress/big-int-literals.js

@@ -17 +17 @@
 // Test 0 conversions
 let n = 0n;
-assert(n === 0n);
-
-n = 00n;
 assert(n === 0n);
 
@@ -106 +103 @@
 assertThrowSyntaxError("10E20n");
 assertThrowSyntaxError("--10n");
+assertThrowSyntaxError("00n");
+assertThrowSyntaxError("01n");
+assertThrowSyntaxError("09n");

trunk/JSTests/stress/numeric-literal-separators.js

@@ -95 +95 @@
 shouldThrow('1e-2_', SyntaxError);
 shouldThrow('1e-2__2', SyntaxError);
+
+shouldThrow('01_1', SyntaxError);
+shouldThrow('01_9', SyntaxError);
+shouldThrow('09_1', SyntaxError);
+shouldThrow('0100_001', SyntaxError);
+shouldThrow('0100_009', SyntaxError);
+shouldThrow('0900_001', SyntaxError);
+shouldThrow('010000000000_1', SyntaxError);
+shouldThrow('010000000000_9', SyntaxError);
+shouldThrow('090000000000_1', SyntaxError);

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-07-25  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Legacy numeric literals should not permit separators or BigInt
+        https://bugs.webkit.org/show_bug.cgi?id=199984
+
+        Reviewed by Keith Miller.
+
+        * parser/Lexer.cpp:
+        (JSC::Lexer<T>::parseOctal):
+        (JSC::Lexer<T>::parseDecimal):
+
 2019-07-25  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -1626 +1626 @@
 {
     ASSERT(isASCIIOctalDigit(m_current));
+    ASSERT(!m_buffer8.size() || (m_buffer8.size() == 1 && m_buffer8[0] == '0'));
+    bool isLegacyLiteral = m_buffer8.size();
 
     // Optimization: most octal values fit into 4 bytes.
@@ -1637 +1639 @@
     do {
         if (m_current == '_') {
-            if (UNLIKELY(!isASCIIOctalDigit(peek(1))))
+            if (UNLIKELY(!isASCIIOctalDigit(peek(1)) || isLegacyLiteral))
                 return WTF::nullopt;
 
@@ -1657 +1659 @@
     while (isASCIIOctalDigitOrSeparator(m_current)) {
         if (m_current == '_') {
-            if (UNLIKELY(!isASCIIOctalDigit(peek(1))))
+            if (UNLIKELY(!isASCIIOctalDigit(peek(1)) || isLegacyLiteral))
                 return WTF::nullopt;
 
@@ -1667 +1669 @@
     }
 
-    if (UNLIKELY(Options::useBigInt() && m_current == 'n'))
+    if (UNLIKELY(Options::useBigInt() && m_current == 'n') && !isLegacyLiteral)
         return NumberParseResult { makeIdentifier(m_buffer8.data(), m_buffer8.size()) };
 
@@ -1680 +1682 @@
 {
     ASSERT(isASCIIDigit(m_current) || m_buffer8.size());
+    bool isLegacyLiteral = m_buffer8.size() && isASCIIDigitOrSeparator(m_current);
 
     // Optimization: most decimal values fit into 4 bytes.
@@ -1695 +1698 @@
         do {
             if (m_current == '_') {
-                if (UNLIKELY(!isASCIIDigit(peek(1))))
+                if (UNLIKELY(!isASCIIDigit(peek(1)) || isLegacyLiteral))
                     return WTF::nullopt;
 
@@ -1716 +1719 @@
     while (isASCIIDigitOrSeparator(m_current)) {
         if (m_current == '_') {
-            if (UNLIKELY(!isASCIIDigit(peek(1))))
+            if (UNLIKELY(!isASCIIDigit(peek(1)) || isLegacyLiteral))
                 return WTF::nullopt;
 
@@ -1726 +1729 @@
     }
     
-    if (UNLIKELY(Options::useBigInt() && m_current == 'n'))
+    if (UNLIKELY(Options::useBigInt() && m_current == 'n' && !isLegacyLiteral))
         return NumberParseResult { makeIdentifier(m_buffer8.data(), m_buffer8.size()) };