Remove usage of S.p.charCodeAt from uri.js

src/uri.js

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains support for URI manipulations written in
 // JavaScript.
 
 (function(global, utils) {
 
 "use strict";
@@ skipping 146 matching lines @@
     %_TwoByteSeqStringSetChar(index++, value, result);
   } else {
     %_TwoByteSeqStringSetChar(index++, (value >> 10) + 0xd7c0, result);
     %_TwoByteSeqStringSetChar(index++, (value & 0x3ff) + 0xdc00, result);
   }
   return index;
 }
 
 // ECMA-262, section 15.1.3
 function Encode(uri, unescape) {
+  uri = TO_STRING_INLINE(uri);

[arv (Not doing code reviews), 2015/06/22 21:45:35]

The spec calls this as a first step. This is good for us because now we don't
have to check on every access below.

   var uriLength = uri.length;
   var array = new InternalArray(uriLength);
   var index = 0;
   for (var k = 0; k < uriLength; k++) {
-    var cc1 = uri.charCodeAt(k);
+    var cc1 = %_StringCharCodeAt(uri, k);
     if (unescape(cc1)) {
       array[index++] = cc1;
     } else {
       if (cc1 >= 0xDC00 && cc1 <= 0xDFFF) throw MakeURIError();
       if (cc1 < 0xD800 || cc1 > 0xDBFF) {
         index = URIEncodeSingle(cc1, array, index);
       } else {
         k++;
         if (k == uriLength) throw MakeURIError();
-        var cc2 = uri.charCodeAt(k);
+        var cc2 = %_StringCharCodeAt(uri, k);
         if (cc2 < 0xDC00 || cc2 > 0xDFFF) throw MakeURIError();
         index = URIEncodePair(cc1, cc2, array, index);
       }
     }
   }
 
   var result = %NewString(array.length, NEW_ONE_BYTE_STRING);
   for (var i = 0; i < array.length; i++) {
     %_OneByteSeqStringSetChar(i, array[i], result);
   }
   return result;
 }
 
 // ECMA-262, section 15.1.3
 function Decode(uri, reserved) {
+  uri = TO_STRING_INLINE(uri);
   var uriLength = uri.length;
   var one_byte = %NewString(uriLength, NEW_ONE_BYTE_STRING);
   var index = 0;
   var k = 0;
 
   // Optimistically assume one-byte string.
   for ( ; k < uriLength; k++) {
-    var code = uri.charCodeAt(k);
+    var code = %_StringCharCodeAt(uri, k);
     if (code == 37) {  // '%'
       if (k + 2 >= uriLength) throw MakeURIError();
-      var cc = URIHexCharsToCharCode(uri.charCodeAt(k+1), uri.charCodeAt(k+2));
+      var cc = URIHexCharsToCharCode(%_StringCharCodeAt(uri, k+1),
+                                     %_StringCharCodeAt(uri, k+2));
       if (cc >> 7) break;  // Assumption wrong, two-byte string.
       if (reserved(cc)) {
         %_OneByteSeqStringSetChar(index++, 37, one_byte);  // '%'.
-        %_OneByteSeqStringSetChar(index++, uri.charCodeAt(k+1), one_byte);
-        %_OneByteSeqStringSetChar(index++, uri.charCodeAt(k+2), one_byte);
+        %_OneByteSeqStringSetChar(index++, %_StringCharCodeAt(uri, k+1),
+                                  one_byte);
+        %_OneByteSeqStringSetChar(index++, %_StringCharCodeAt(uri, k+2),
+                                  one_byte);
       } else {
         %_OneByteSeqStringSetChar(index++, cc, one_byte);
       }
       k += 2;
     } else {
       if (code > 0x7f) break;  // Assumption wrong, two-byte string.
       %_OneByteSeqStringSetChar(index++, code, one_byte);
     }
   }
 
   one_byte = %TruncateString(one_byte, index);
   if (k == uriLength) return one_byte;
 
   // Write into two byte string.
   var two_byte = %NewString(uriLength - k, NEW_TWO_BYTE_STRING);
   index = 0;
 
   for ( ; k < uriLength; k++) {
-    var code = uri.charCodeAt(k);
+    var code = %_StringCharCodeAt(uri, k);
     if (code == 37) {  // '%'
       if (k + 2 >= uriLength) throw MakeURIError();
-      var cc = URIHexCharsToCharCode(uri.charCodeAt(++k), uri.charCodeAt(++k));
+      var cc = URIHexCharsToCharCode(%_StringCharCodeAt(uri, ++k),
+                                     %_StringCharCodeAt(uri, ++k));
       if (cc >> 7) {
         var n = 0;
         while (((cc << ++n) & 0x80) != 0) { }
         if (n == 1 || n > 4) throw MakeURIError();
         var octets = new GlobalArray(n);
         octets[0] = cc;
         if (k + 3 * (n - 1) >= uriLength) throw MakeURIError();
         for (var i = 1; i < n; i++) {
-          if (uri.charAt(++k) != '%') throw MakeURIError();
-          octets[i] = URIHexCharsToCharCode(uri.charCodeAt(++k),
-                                            uri.charCodeAt(++k));
+          if (uri[++k] != '%') throw MakeURIError();
+          octets[i] = URIHexCharsToCharCode(%_StringCharCodeAt(uri, ++k),
+                                            %_StringCharCodeAt(uri, ++k));
         }
         index = URIDecodeOctets(octets, two_byte, index);
       } else  if (reserved(cc)) {
         %_TwoByteSeqStringSetChar(index++, 37, two_byte);  // '%'.
-        %_TwoByteSeqStringSetChar(index++, uri.charCodeAt(k - 1), two_byte);
-        %_TwoByteSeqStringSetChar(index++, uri.charCodeAt(k), two_byte);
+        %_TwoByteSeqStringSetChar(index++, %_StringCharCodeAt(uri, k - 1),
+                                  two_byte);
+        %_TwoByteSeqStringSetChar(index++, %_StringCharCodeAt(uri, k),
+                                  two_byte);
       } else {
         %_TwoByteSeqStringSetChar(index++, cc, two_byte);
       }
     } else {
       %_TwoByteSeqStringSetChar(index++, code, two_byte);
     }
   }
 
   two_byte = %TruncateString(two_byte, index);
   return one_byte + two_byte;
@@ skipping 101 matching lines @@
 utils.InstallFunctions(global, DONT_ENUM, [
   "escape", URIEscapeJS,
   "unescape", URIUnescapeJS,
   "decodeURI", URIDecode,
   "decodeURIComponent", URIDecodeComponent,
   "encodeURI", URIEncode,
   "encodeURIComponent", URIEncodeComponent
 ]);
 
 })