Index: src/runtime/runtime-object.cc |
diff --git a/src/runtime/runtime-object.cc b/src/runtime/runtime-object.cc |
index 18078fc78f1dc14b9b8a435cbf03c989d18d8589..c83e2942f4fd7562a7ae883b11fcdc66bc15179a 100644 |
--- a/src/runtime/runtime-object.cc |
+++ b/src/runtime/runtime-object.cc |
@@ -1444,7 +1444,7 @@ RUNTIME_FUNCTION(Runtime_DefineAccessorPropertyUnchecked) { |
DCHECK(args.length() == 5); |
CONVERT_ARG_HANDLE_CHECKED(JSObject, obj, 0); |
RUNTIME_ASSERT(!obj->IsNull()); |
- CONVERT_ARG_HANDLE_CHECKED(Name, name, 1); |
+ CONVERT_ARG_HANDLE_CHECKED(Object, key, 1); |
arv (Not doing code reviews)
2014/12/10 23:38:13
revert this. handle ToName in caller instead.
arv (Not doing code reviews)
2014/12/11 23:10:34
Done.
|
CONVERT_ARG_HANDLE_CHECKED(Object, getter, 2); |
RUNTIME_ASSERT(IsValidAccessor(getter)); |
CONVERT_ARG_HANDLE_CHECKED(Object, setter, 3); |
@@ -1453,6 +1453,9 @@ RUNTIME_FUNCTION(Runtime_DefineAccessorPropertyUnchecked) { |
RUNTIME_ASSERT((unchecked & ~(READ_ONLY | DONT_ENUM | DONT_DELETE)) == 0); |
PropertyAttributes attr = static_cast<PropertyAttributes>(unchecked); |
+ Handle<Name> name; |
+ ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, name, |
+ Runtime::ToName(isolate, key)); |
RETURN_FAILURE_ON_EXCEPTION( |
isolate, JSObject::DefineAccessor(obj, name, getter, setter, attr)); |
return isolate->heap()->undefined_value(); |