AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[errors] Improve NotGeneric error message

Browse Source 
This changes the message from

"method_name is not generic"

to

"method_name requires that 'this' be a primitive_name object"

BUG=v8:6206

Review-Url: https://codereview.chromium.org/2814043006
Cr-Original-Commit-Position: refs/heads/master@{#44683}
Committed: 21b104e3b8
Review-Url: https://codereview.chromium.org/2814043006
Cr-Commit-Position: refs/heads/master@{#44713}
This commit is contained in:
jgruber 2017-04-19 01:34:24 -07:00 committed by Commit bot
parent b89ddcf1fc
commit a031ab92ac
7 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/builtins/builtins-function.cc
View File

@ -312,7 +312,8 @@ BUILTIN(FunctionPrototypeToString) {
THROW_NEW_ERROR_RETURN_FAILURE(
isolate, NewTypeError(MessageTemplate::kNotGeneric,
isolate->factory()->NewStringFromAsciiChecked(
"Function.prototype.toString")));
"Function.prototype.toString"),
isolate->factory()->Function_string()));
}
} // namespace internal

15
src/builtins/builtins-number.cc
View File

@ -29,7 +29,8 @@ BUILTIN(NumberPrototypeToExponential) {
THROW_NEW_ERROR_RETURN_FAILURE(
isolate, NewTypeError(MessageTemplate::kNotGeneric,
isolate->factory()->NewStringFromAsciiChecked(
"Number.prototype.toExponential")));
"Number.prototype.toExponential"),
isolate->factory()->Number_string()));
}
double const value_number = value->Number();
@ -72,7 +73,8 @@ BUILTIN(NumberPrototypeToFixed) {
THROW_NEW_ERROR_RETURN_FAILURE(
isolate, NewTypeError(MessageTemplate::kNotGeneric,
isolate->factory()->NewStringFromAsciiChecked(
"Number.prototype.toFixed")));
"Number.prototype.toFixed"),
isolate->factory()->Number_string()));
}
double const value_number = value->Number();
@ -114,7 +116,8 @@ BUILTIN(NumberPrototypeToLocaleString) {
THROW_NEW_ERROR_RETURN_FAILURE(
isolate, NewTypeError(MessageTemplate::kNotGeneric,
isolate->factory()->NewStringFromAsciiChecked(
"Number.prototype.toLocaleString")));
"Number.prototype.toLocaleString"),
isolate->factory()->Number_string()));
}
// Turn the {value} into a String.
@ -135,7 +138,8 @@ BUILTIN(NumberPrototypeToPrecision) {
THROW_NEW_ERROR_RETURN_FAILURE(
isolate, NewTypeError(MessageTemplate::kNotGeneric,
isolate->factory()->NewStringFromAsciiChecked(
"Number.prototype.toPrecision")));
"Number.prototype.toPrecision"),
isolate->factory()->Number_string()));
}
double const value_number = value->Number();
@ -179,7 +183,8 @@ BUILTIN(NumberPrototypeToString) {
THROW_NEW_ERROR_RETURN_FAILURE(
isolate, NewTypeError(MessageTemplate::kNotGeneric,
isolate->factory()->NewStringFromAsciiChecked(
"Number.prototype.toString")));
"Number.prototype.toString"),
isolate->factory()->Number_string()));
}
double const value_number = value->Number();

23
src/code-stub-assembler.cc
View File

@ -2900,10 +2900,27 @@ Node* CodeStubAssembler::ToThisValue(Node* context, Node* value,
BIND(&done_throw);
{
const char* primitive_name = nullptr;
switch (primitive_type) {
case PrimitiveType::kBoolean:
primitive_name = "Boolean";
break;
case PrimitiveType::kNumber:
primitive_name = "Number";
break;
case PrimitiveType::kString:
primitive_name = "String";
break;
case PrimitiveType::kSymbol:
primitive_name = "Symbol";
break;
}
CHECK_NOT_NULL(primitive_name);
// The {value} is not a compatible receiver for this method.
CallRuntime(Runtime::kThrowNotGeneric, context,
HeapConstant(factory()->NewStringFromAsciiChecked(method_name,
TENURED)));
CallRuntime(Runtime::kThrowTypeError, context,
SmiConstant(MessageTemplate::kNotGeneric),
CStringConstant(method_name), CStringConstant(primitive_name));
Unreachable();
}

2
src/messages.h
View File

@ -342,7 +342,7 @@ class ErrorUtils : public AllStatic {
T(NotConstructor, "% is not a constructor") \
T(NotDateObject, "this is not a Date object.") \
T(NotIntlObject, "% is not an i18n object.") \
T(NotGeneric, "% is not generic") \
T(NotGeneric, "% requires that 'this' be a %") \
T(NotIterable, "% is not iterable") \
T(NotPropertyName, "% is not a valid property name") \
T(NotTypedArray, "this is not a typed array.") \

8
src/runtime/runtime-internal.cc
View File

@ -288,14 +288,6 @@ RUNTIME_FUNCTION(Runtime_ThrowNotConstructor) {
isolate, NewTypeError(MessageTemplate::kNotConstructor, object));
}
RUNTIME_FUNCTION(Runtime_ThrowNotGeneric) {
HandleScope scope(isolate);
DCHECK_EQ(1, args.length());
CONVERT_ARG_HANDLE_CHECKED(Object, arg0, 0);
THROW_NEW_ERROR_RETURN_FAILURE(
isolate, NewTypeError(MessageTemplate::kNotGeneric, arg0));
}
RUNTIME_FUNCTION(Runtime_ThrowGeneratorRunning) {
HandleScope scope(isolate);
DCHECK_EQ(0, args.length());

1
src/runtime/runtime.h
View File

@ -322,7 +322,6 @@ namespace internal {
F(ThrowNonCallableInInstanceOfCheck, 0, 1) \
F(ThrowNonObjectInInstanceOfCheck, 0, 1) \
F(ThrowNotConstructor, 1, 1) \
F(ThrowNotGeneric, 1, 1) \
F(ThrowRangeError, -1 /* >= 1 */, 1) \
F(ThrowReferenceError, 1, 1) \
F(ThrowStackOverflow, 0, 1) \

42
test/mjsunit/messages.js
View File

@ -192,33 +192,33 @@ test(function() {
}, "this is not a Date object.", TypeError);
// kNotGeneric
test(function() {
String.prototype.toString.call(1);
}, "String.prototype.toString is not generic", TypeError);
test(() => String.prototype.toString.call(1),
"String.prototype.toString requires that 'this' be a String",
TypeError);
test(function() {
String.prototype.valueOf.call(1);
}, "String.prototype.valueOf is not generic", TypeError);
test(() => String.prototype.valueOf.call(1),
"String.prototype.valueOf requires that 'this' be a String",
TypeError);
test(function() {
Boolean.prototype.toString.call(1);
}, "Boolean.prototype.toString is not generic", TypeError);
test(() => Boolean.prototype.toString.call(1),
"Boolean.prototype.toString requires that 'this' be a Boolean",
TypeError);
test(function() {
Boolean.prototype.valueOf.call(1);
}, "Boolean.prototype.valueOf is not generic", TypeError);
test(() => Boolean.prototype.valueOf.call(1),
"Boolean.prototype.valueOf requires that 'this' be a Boolean",
TypeError);
test(function() {
Number.prototype.toString.call({});
}, "Number.prototype.toString is not generic", TypeError);
test(() => Number.prototype.toString.call({}),
"Number.prototype.toString requires that 'this' be a Number",
TypeError);
test(function() {
Number.prototype.valueOf.call({});
}, "Number.prototype.valueOf is not generic", TypeError);
test(() => Number.prototype.valueOf.call({}),
"Number.prototype.valueOf requires that 'this' be a Number",
TypeError);
test(function() {
Function.prototype.toString.call(1);
}, "Function.prototype.toString is not generic", TypeError);
test(() => Function.prototype.toString.call(1),
"Function.prototype.toString requires that 'this' be a Function",
TypeError);
// kNotTypedArray
test(function() {