| Index: src/runtime/runtime-object.cc
 | 
| diff --git a/src/runtime/runtime-object.cc b/src/runtime/runtime-object.cc
 | 
| index 184eb2c324c696bbf621da11aea1e3f967e01c80..462e024cf33288632192537b37b795e49dd898e5 100644
 | 
| --- a/src/runtime/runtime-object.cc
 | 
| +++ b/src/runtime/runtime-object.cc
 | 
| @@ -70,10 +70,10 @@
 | 
|                                                 Handle<Object> object,
 | 
|                                                 Handle<Object> key) {
 | 
|    if (object->IsUndefined() || object->IsNull()) {
 | 
| -    THROW_NEW_ERROR(
 | 
| -        isolate,
 | 
| -        NewTypeError(MessageTemplate::kNonObjectPropertyLoad, key, object),
 | 
| -        Object);
 | 
| +    Handle<Object> args[2] = {key, object};
 | 
| +    THROW_NEW_ERROR(isolate, NewTypeError("non_object_property_load",
 | 
| +                                          HandleVector(args, 2)),
 | 
| +                    Object);
 | 
|    }
 | 
|  
 | 
|    // Check if the given key is an array index.
 | 
| @@ -102,10 +102,10 @@
 | 
|                                                 Handle<Object> value,
 | 
|                                                 LanguageMode language_mode) {
 | 
|    if (object->IsUndefined() || object->IsNull()) {
 | 
| -    THROW_NEW_ERROR(
 | 
| -        isolate,
 | 
| -        NewTypeError(MessageTemplate::kNonObjectPropertyStore, key, object),
 | 
| -        Object);
 | 
| +    Handle<Object> args[2] = {key, object};
 | 
| +    THROW_NEW_ERROR(isolate, NewTypeError("non_object_property_store",
 | 
| +                                          HandleVector(args, 2)),
 | 
| +                    Object);
 | 
|    }
 | 
|  
 | 
|    if (object->IsJSProxy()) {
 | 
| @@ -1420,9 +1420,9 @@
 | 
|  RUNTIME_FUNCTION(Runtime_GetDataProperty) {
 | 
|    HandleScope scope(isolate);
 | 
|    DCHECK(args.length() == 2);
 | 
| -  CONVERT_ARG_HANDLE_CHECKED(JSReceiver, object, 0);
 | 
| +  CONVERT_ARG_HANDLE_CHECKED(JSObject, object, 0);
 | 
|    CONVERT_ARG_HANDLE_CHECKED(Name, key, 1);
 | 
| -  return *JSReceiver::GetDataProperty(object, key);
 | 
| +  return *JSObject::GetDataProperty(object, key);
 | 
|  }
 | 
|  
 | 
|  
 | 
| 
 |