Move family of MakeError functions to C++

src/js/string.js

 // Copyright 2012 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.
 
 (function(global, utils) {
 
 %CheckIsBootstrapping();
 
 // -------------------------------------------------------------------
 // Imports
 
 var ArrayIndexOf;
 var ArrayJoin;
 var GlobalRegExp = global.RegExp;
 var GlobalString = global.String;
 var IsRegExp;
-var MakeRangeError;
-var MakeTypeError;
 var MaxSimple;
 var MinSimple;
 var RegExpInitialize;
 var matchSymbol = utils.ImportNow("match_symbol");
 var replaceSymbol = utils.ImportNow("replace_symbol");
 var searchSymbol = utils.ImportNow("search_symbol");
 var splitSymbol = utils.ImportNow("split_symbol");
 
 utils.Import(function(from) {
   ArrayIndexOf = from.ArrayIndexOf;
   ArrayJoin = from.ArrayJoin;
   IsRegExp = from.IsRegExp;
-  MakeRangeError = from.MakeRangeError;
-  MakeTypeError = from.MakeTypeError;
   MaxSimple = from.MaxSimple;
   MinSimple = from.MinSimple;
   RegExpInitialize = from.RegExpInitialize;
 });
 
 //-------------------------------------------------------------------
 
 // ECMA-262, section 15.5.4.6
 function StringConcat(other /* and more */) {  // length == 1
   "use strict";
@@ skipping 88 matching lines @@
 // proper functionality.
 function StringNormalize(formArg) {  // length == 0
   CHECK_OBJECT_COERCIBLE(this, "String.prototype.normalize");
   var s = TO_STRING(this);
 
   var form = IS_UNDEFINED(formArg) ? 'NFC' : TO_STRING(formArg);
 
   var NORMALIZATION_FORMS = ['NFC', 'NFD', 'NFKC', 'NFKD'];
   var normalizationForm = %_Call(ArrayIndexOf, NORMALIZATION_FORMS, form);
   if (normalizationForm === -1) {
-    throw MakeRangeError(kNormalizationForm,
+    throw %make_range_error(kNormalizationForm,
                          %_Call(ArrayJoin, NORMALIZATION_FORMS, ', '));
   }
 
   return s;
 }
 
 %FunctionSetLength(StringNormalize, 0);
 
 
 // This has the same size as the RegExpLastMatchInfo array, and can be used
@@ skipping 424 matching lines @@
   return "<sup>" + TO_STRING(this) + "</sup>";
 }
 
 // ES6, section 21.1.3.13
 function StringRepeat(count) {
   CHECK_OBJECT_COERCIBLE(this, "String.prototype.repeat");
 
   var s = TO_STRING(this);
   var n = TO_INTEGER(count);
 
-  if (n < 0 || n === INFINITY) throw MakeRangeError(kInvalidCountValue);
+  if (n < 0 || n === INFINITY) throw %make_range_error(kInvalidCountValue);
 
   // Early return to allow an arbitrarily-large repeat of the empty string.
   if (s.length === 0) return "";
 
   // The maximum string length is stored in a smi, so a longer repeat
   // must result in a range error.
-  if (n > %_MaxSmi()) throw MakeRangeError(kInvalidCountValue);
+  if (n > %_MaxSmi()) throw %make_range_error(kInvalidCountValue);
 
   var r = "";
   while (true) {
     if (n & 1) r += s;
     n >>= 1;
     if (n === 0) return r;
     s += s;
   }
 }
 
 
 // ES6 draft 04-05-14, section 21.1.3.18
 function StringStartsWith(searchString, position) {  // length == 1
   CHECK_OBJECT_COERCIBLE(this, "String.prototype.startsWith");
 
   var s = TO_STRING(this);
 
   if (IsRegExp(searchString)) {
-    throw MakeTypeError(kFirstArgumentNotRegExp, "String.prototype.startsWith");
+    throw %make_type_error(kFirstArgumentNotRegExp, "String.prototype.startsWith");
   }
 
   var ss = TO_STRING(searchString);
   var pos = TO_INTEGER(position);
 
   var s_len = s.length;
   var start = MinSimple(MaxSimple(pos, 0), s_len);
   var ss_len = ss.length;
   if (ss_len + start > s_len) {
     return false;
   }
 
   return %_SubString(s, start, start + ss_len) === ss;
 }
 
 %FunctionSetLength(StringStartsWith, 1);
 
 
 // ES6 draft 04-05-14, section 21.1.3.7
 function StringEndsWith(searchString, position) {  // length == 1
   CHECK_OBJECT_COERCIBLE(this, "String.prototype.endsWith");
 
   var s = TO_STRING(this);
 
   if (IsRegExp(searchString)) {
-    throw MakeTypeError(kFirstArgumentNotRegExp, "String.prototype.endsWith");
+    throw %make_type_error(kFirstArgumentNotRegExp, "String.prototype.endsWith");
   }
 
   var ss = TO_STRING(searchString);
   var s_len = s.length;
   var pos = !IS_UNDEFINED(position) ? TO_INTEGER(position) : s_len
 
   var end = MinSimple(MaxSimple(pos, 0), s_len);
   var ss_len = ss.length;
   var start = end - ss_len;
   if (start < 0) {
     return false;
   }
 
   return %_SubString(s, start, start + ss_len) === ss;
 }
 
 %FunctionSetLength(StringEndsWith, 1);
 
 
 // ES6 draft 04-05-14, section 21.1.3.6
 function StringIncludes(searchString, position) {  // length == 1
   CHECK_OBJECT_COERCIBLE(this, "String.prototype.includes");
 
   var string = TO_STRING(this);
 
   if (IsRegExp(searchString)) {
-    throw MakeTypeError(kFirstArgumentNotRegExp, "String.prototype.includes");
+    throw %make_type_error(kFirstArgumentNotRegExp, "String.prototype.includes");
   }
 
   searchString = TO_STRING(searchString);
   var pos = TO_INTEGER(position);
 
   var stringLength = string.length;
   if (pos < 0) pos = 0;
   if (pos > stringLength) pos = stringLength;
   var searchStringLength = searchString.length;
 
@@ skipping 108 matching lines @@
   to.StringLastIndexOf = StringLastIndexOf;
   to.StringMatch = StringMatchJS;
   to.StringReplace = StringReplace;
   to.StringSlice = StringSlice;
   to.StringSplit = StringSplitJS;
   to.StringSubstr = StringSubstr;
   to.StringSubstring = StringSubstring;
 });
 
 })