Index: src/runtime/runtime.cc |
diff --git a/src/runtime/runtime.cc b/src/runtime/runtime.cc |
index 379a38f746d7f5bcbb00bd06607f8d69cb1a3fef..7b0578fb837790f5c15cd29ba29c2bc6a5d38ccc 100644 |
--- a/src/runtime/runtime.cc |
+++ b/src/runtime/runtime.cc |
@@ -1954,8 +1954,8 @@ RUNTIME_FUNCTION(Runtime_HomeObjectSymbol) { |
RUNTIME_FUNCTION(Runtime_LoadFromSuper) { |
HandleScope scope(isolate); |
DCHECK(args.length() == 3); |
- CONVERT_ARG_HANDLE_CHECKED(JSObject, home_object, 0); |
- CONVERT_ARG_HANDLE_CHECKED(Object, receiver, 1); |
+ CONVERT_ARG_HANDLE_CHECKED(Object, receiver, 0); |
+ CONVERT_ARG_HANDLE_CHECKED(JSObject, home_object, 1); |
CONVERT_ARG_HANDLE_CHECKED(Name, name, 2); |
if (home_object->IsAccessCheckNeeded() && |
@@ -1975,6 +1975,54 @@ RUNTIME_FUNCTION(Runtime_LoadFromSuper) { |
} |
+static Object* StoreToSuper(Isolate* isolate, Handle<JSObject> home_object, |
+ Handle<Object> receiver, Handle<Name> name, |
+ Handle<Object> value, StrictMode strict_mode) { |
+ if (home_object->IsAccessCheckNeeded() && |
+ !isolate->MayNamedAccess(home_object, name, v8::ACCESS_SET)) { |
+ isolate->ReportFailedAccessCheck(home_object, v8::ACCESS_SET); |
+ RETURN_FAILURE_IF_SCHEDULED_EXCEPTION(isolate); |
+ } |
+ |
+ PrototypeIterator iter(isolate, home_object); |
+ Handle<Object> proto = PrototypeIterator::GetCurrent(iter); |
+ if (!proto->IsJSReceiver()) return isolate->heap()->undefined_value(); |
+ |
+ LookupIterator it(receiver, name, Handle<JSReceiver>::cast(proto)); |
+ Handle<Object> result; |
+ ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
+ isolate, result, |
+ Object::SetProperty(&it, value, strict_mode, |
+ Object::CERTAINLY_NOT_STORE_FROM_KEYED, |
+ Object::SUPER_PROPERTY)); |
+ return *result; |
+} |
+ |
+ |
+RUNTIME_FUNCTION(Runtime_StoreToSuper_Strict) { |
+ HandleScope scope(isolate); |
+ DCHECK(args.length() == 4); |
+ CONVERT_ARG_HANDLE_CHECKED(Object, receiver, 0); |
+ CONVERT_ARG_HANDLE_CHECKED(JSObject, home_object, 1); |
+ CONVERT_ARG_HANDLE_CHECKED(Object, value, 2); |
+ CONVERT_ARG_HANDLE_CHECKED(Name, name, 3); |
+ |
+ return StoreToSuper(isolate, home_object, receiver, name, value, STRICT); |
+} |
+ |
+ |
+RUNTIME_FUNCTION(Runtime_StoreToSuper_Sloppy) { |
arv (Not doing code reviews)
2014/09/29 14:37:27
Why not take strict mode as a parameter?
|
+ HandleScope scope(isolate); |
+ DCHECK(args.length() == 4); |
+ CONVERT_ARG_HANDLE_CHECKED(Object, receiver, 0); |
+ CONVERT_ARG_HANDLE_CHECKED(JSObject, home_object, 1); |
+ CONVERT_ARG_HANDLE_CHECKED(Object, value, 2); |
+ CONVERT_ARG_HANDLE_CHECKED(Name, name, 3); |
+ |
+ return StoreToSuper(isolate, home_object, receiver, name, value, SLOPPY); |
+} |
+ |
+ |
RUNTIME_FUNCTION(Runtime_IsExtensible) { |
SealHandleScope shs(isolate); |
DCHECK(args.length() == 1); |