Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 08:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 4abbfab77d40 (bug 1440309) for spidermonkey build crashes a=backout

Browse Source
This commit is contained in:
arthur.iakab 2018-02-27 13:26:31 +02:00
parent 9bffb6aa72
commit 14d9332462
4 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/builtin/SelfHostingDefines.h
View File

@ -23,9 +23,6 @@
// NB: keep this in sync with the copy in vm/ArgumentsObject.h.
#define MAX_ARGS_LENGTH (500 * 1000)
// NB: keep this in sync with the copy in vm/String.h.
#define MAX_STRING_LENGTH ((1 << 28) - 1)
// Spread non-empty argument list of up to 15 elements.
#define SPREAD(v, n) SPREAD_##n(v)
#define SPREAD_1(v) v[0]

25
js/src/builtin/String.js
View File

@ -68,7 +68,8 @@ function String_generic_match(thisValue, regexp) {
* A helper function implementing the logic for both String.prototype.padStart
* and String.prototype.padEnd as described in ES7 Draft March 29, 2016
*/
function String_pad(maxLength, fillString, padEnd) {
function String_pad(maxLength, fillString, padEnd = false) {
// Steps 1-2.
RequireObjectCoercible(this);
let str = ToString(this);
@ -82,28 +83,21 @@ function String_pad(maxLength, fillString, padEnd) {
return str;
// Steps 6-7.
assert(fillString !== undefined, "never called when fillString is undefined");
let filler = ToString(fillString);
let filler = fillString === undefined ? " " : ToString(fillString);
// Step 8.
if (filler === "")
return str;
// Throw an error if the final string length exceeds the maximum string
// length. Perform this check early so we can use int32 operations below.
if (intMaxLength > MAX_STRING_LENGTH)
ThrowRangeError(JSMSG_RESULTING_STRING_TOO_LARGE);
// Step 9.
let fillLen = intMaxLength - strLen;
// Step 10.
// Perform an int32 division to ensure String_repeat is not called with a
// double to avoid repeated bailouts in ToInteger.
let truncatedStringFiller = callFunction(String_repeat, filler,
(fillLen / filler.length) | 0);
fillLen / filler.length);
truncatedStringFiller += Substring(filler, 0, fillLen % filler.length);
truncatedStringFiller += callFunction(String_substr, filler, 0,
fillLen % filler.length);
// Step 11.
if (padEnd === true)
@ -509,14 +503,11 @@ function String_repeat(count) {
if (n < 0)
ThrowRangeError(JSMSG_NEGATIVE_REPETITION_COUNT);
// Inverted condition to handle |Infinity * 0 = NaN| correctly.
if (!(n * S.length <= MAX_STRING_LENGTH))
if (!(n * S.length < (1 << 28)))
ThrowRangeError(JSMSG_RESULTING_STRING_TOO_LARGE);
// Communicate |n|'s possible range to the compiler.
assert((MAX_STRING_LENGTH & (MAX_STRING_LENGTH + 1)) === 0,
"MAX_STRING_LENGTH can be used as a bitmask");
n = n & MAX_STRING_LENGTH;
n = n & ((1 << 28) - 1);
// Steps 8-9.
var T = "";

6
js/src/vm/Interpreter.cpp
View File

@ -1683,11 +1683,11 @@ js::ReportInNotObjectError(JSContext* cx, HandleValue lref, int lindex,
HandleValue rref, int rindex)
{
auto uniqueCharsFromString = [](JSContext* cx, HandleValue ref) -> UniqueChars {
static const size_t MaxStringLength = 16;
static const size_t MAX_STRING_LENGTH = 16;
RootedString str(cx, ref.toString());
if (str->length() > MaxStringLength) {
if (str->length() > MAX_STRING_LENGTH) {
StringBuffer buf(cx);
if (!buf.appendSubstring(str, 0, MaxStringLength))
if (!buf.appendSubstring(str, 0, MAX_STRING_LENGTH))
return nullptr;
if (!buf.append("..."))
return nullptr;

7
js/src/vm/SelfHosting.cpp
View File

@ -42,7 +42,6 @@
#include "js/CharacterEncoding.h"
#include "js/Date.h"
#include "js/Wrapper.h"
#include "vm/ArgumentsObject.h"
#include "vm/Compression.h"
#include "vm/GeneratorObject.h"
#include "vm/Interpreter.h"
@ -3195,9 +3194,3 @@ js::GetSelfHostedFunctionName(JSFunction* fun)
static_assert(JSString::MAX_LENGTH <= INT32_MAX,
"StringIteratorNext in builtin/String.js assumes the stored index "
"into the string is an Int32Value");
static_assert(JSString::MAX_LENGTH == MAX_STRING_LENGTH,
"JSString::MAX_LENGTH matches self-hosted constant for maximum string length");
static_assert(ARGS_LENGTH_MAX == MAX_ARGS_LENGTH,
"ARGS_LENGTH_MAX matches self-hosted constant for maximum arguments length");