Change internal character set representation in Uri.

Avoid doing computed shifts and parameterizing with
tables, so that all lookups can be with a fixed
base and only do one bit-operation.

Tested: Refactoring, covered by existing tests.
Change-Id: I8c4ffdb0eaef6c26de996ca40d1d697c1ba23bb7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/392943
Reviewed-by: Stephen Adams <[email protected]>
Commit-Queue: Lasse Nielsen <[email protected]>
Reviewed-by: Slava Egorov <[email protected]>
Reviewed-by: Martin Kustermann <[email protected]>

Author: lrhn

sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart

@@ -704,7 +704,7 @@ class _Uri {
   /// that appear in [canonicalTable], and returns the escaped string.
   @patch
   static String _uriEncode(
-    List<int> canonicalTable,
+    int canonicalMask,
     String text,
     Encoding encoding,
     bool spaceToPlus,
@@ -719,8 +719,7 @@ class _Uri {
     var bytes = encoding.encode(text);
     for (int i = 0; i < bytes.length; i++) {
       int byte = bytes[i];
-      if (byte < 128 &&
-          ((canonicalTable[byte >> 4] & (1 << (byte & 0x0f))) != 0)) {
+      if (byte < 128 && ((_charTables.codeUnitAt(byte) & canonicalMask) != 0)) {
         result.writeCharCode(byte);
       } else if (spaceToPlus && byte == _SPACE) {
         result.write('+');

sdk/lib/_internal/js_runtime/lib/core_patch.dart

@@ -692,8 +692,8 @@ class _Uri {
   /// It encodes all characters in the string [text] except for those
   /// that appear in [canonicalTable], and returns the escaped string.
   @patch
-  static String _uriEncode(List<int> canonicalTable, String text,
-      Encoding encoding, bool spaceToPlus) {
+  static String _uriEncode(
+      int canonicalMask, String text, Encoding encoding, bool spaceToPlus) {
     if (identical(encoding, utf8) && _needsNoEncoding.hasMatch(text)) {
       return text;
     }
@@ -704,8 +704,7 @@ class _Uri {
     var bytes = encoding.encode(text);
     for (int i = 0; i < bytes.length; i++) {
       int byte = bytes[i];
-      if (byte < 128 &&
-          ((canonicalTable[byte >> 4] & (1 << (byte & 0x0f))) != 0)) {
+      if (byte < 128 && ((_charTables.codeUnitAt(byte) & canonicalMask) != 0)) {
         result.writeCharCode(byte);
       } else if (spaceToPlus && byte == _SPACE) {
         result.write('+');

sdk/lib/_internal/vm/lib/uri_patch.dart

@@ -34,7 +34,7 @@ class _Uri {
 
   @patch
   static String _uriEncode(
-    List<int> canonicalTable,
+    int canonicalMask,
     String text,
     Encoding encoding,
     bool spaceToPlus,
@@ -48,8 +48,7 @@ class _Uri {
       // Find first character that needs encoding.
       for (; i < text.length; i++) {
         var char = text.codeUnitAt(i);
-        if (char >= 128 ||
-            canonicalTable[char >> 4] & (1 << (char & 0x0f)) == 0) {
+        if (char >= 128 || _charTables.codeUnitAt(char) & canonicalMask == 0) {
           break;
         }
       }
@@ -67,8 +66,7 @@ class _Uri {
     var bytes = encoding.encode(text);
     for (; i < bytes.length; i++) {
       int byte = bytes[i];
-      if (byte < 128 &&
-          ((canonicalTable[byte >> 4] & (1 << (byte & 0x0f))) != 0)) {
+      if (byte < 128 && ((_charTables.codeUnitAt(byte) & canonicalMask) != 0)) {
         result.writeCharCode(byte);
       } else if (spaceToPlus && byte == _SPACE) {
         result.writeCharCode(_PLUS);

sdk/lib/_internal/wasm/lib/uri_patch.dart

@@ -36,8 +36,8 @@ class _Uri {
       }""");
 
   // Matches a String that _uriEncodes to itself regardless of the kind of
-  // component.  This corresponds to [_unreservedTable], i.e. characters that
-  // are not encoded by any encoding table.
+  // component.  This corresponds to `_unreservedMask` table,
+  // i.e. characters that are not encoded by any encoding table.
   static final RegExp _needsNoEncoding = RegExp(r'^[\-\.0-9A-Z_a-z~]*$');
 
   /**
@@ -47,7 +47,7 @@ class _Uri {
    */
   @patch
   static String _uriEncode(
-    List<int> canonicalTable,
+    int canonicalMask,
     String text,
     Encoding encoding,
     bool spaceToPlus,
@@ -62,8 +62,7 @@ class _Uri {
     var bytes = encoding.encode(text);
     for (int i = 0; i < bytes.length; i++) {
       int byte = bytes[i];
-      if (byte < 128 &&
-          ((canonicalTable[byte >> 4] & (1 << (byte & 0x0f))) != 0)) {
+      if (byte < 128 && ((_charTables.codeUnitAt(byte) & canonicalMask) != 0)) {
         result.writeCharCode(byte);
       } else if (spaceToPlus && byte == _SPACE) {
         result.write('+');