| Index: src/objects.cc
|
| diff --git a/src/objects.cc b/src/objects.cc
|
| index eac53cbab5db237308536d63aa8e0b6a1ca28258..d61ff74aefb46e9ea52710c66778ec5d130bfc5c 100644
|
| --- a/src/objects.cc
|
| +++ b/src/objects.cc
|
| @@ -33,6 +33,7 @@
|
| #include "src/log.h"
|
| #include "src/lookup.h"
|
| #include "src/macro-assembler.h"
|
| +#include "src/messages.h"
|
| #include "src/objects-inl.h"
|
| #include "src/prototype.h"
|
| #include "src/safepoint-table.h"
|
| @@ -297,10 +298,9 @@ MaybeHandle<Object> Object::GetPropertyWithAccessor(Handle<Object> receiver,
|
| if (structure->IsAccessorInfo()) {
|
| Handle<AccessorInfo> info = Handle<AccessorInfo>::cast(structure);
|
| if (!info->IsCompatibleReceiver(*receiver)) {
|
| - Handle<Object> args[] = {name, receiver};
|
| THROW_NEW_ERROR(isolate,
|
| - NewTypeError("incompatible_method_receiver",
|
| - HandleVector(args, arraysize(args))),
|
| + NewTypeError(MessageTemplate::kIncompatibleMethodReceiver,
|
| + name, receiver),
|
| Object);
|
| }
|
|
|
| @@ -362,10 +362,9 @@ MaybeHandle<Object> Object::SetPropertyWithAccessor(
|
| // api style callbacks
|
| ExecutableAccessorInfo* info = ExecutableAccessorInfo::cast(*structure);
|
| if (!info->IsCompatibleReceiver(*receiver)) {
|
| - Handle<Object> args[] = {name, receiver};
|
| THROW_NEW_ERROR(isolate,
|
| - NewTypeError("incompatible_method_receiver",
|
| - HandleVector(args, arraysize(args))),
|
| + NewTypeError(MessageTemplate::kIncompatibleMethodReceiver,
|
| + name, receiver),
|
| Object);
|
| }
|
| Object* call_obj = info->setter();
|
| @@ -12489,9 +12488,7 @@ MaybeHandle<Object> JSObject::SetPrototype(Handle<JSObject> object,
|
| !iter.IsAtEnd(); iter.Advance()) {
|
| if (JSReceiver::cast(iter.GetCurrent()) == *object) {
|
| // Cycle detected.
|
| - THROW_NEW_ERROR(isolate,
|
| - NewError("cyclic_proto", HandleVector<Object>(NULL, 0)),
|
| - Object);
|
| + THROW_NEW_ERROR(isolate, NewError(MessageTemplate::kCyclicProto), Object);
|
| }
|
| }
|
|
|
|
|