Index: src/stub-cache.cc |
diff --git a/src/stub-cache.cc b/src/stub-cache.cc |
index cd198e2f07f18ea0fff30f5ca2db0ceec42ceac6..65af6a54b2bde1f9cd56d0f10a08c90444cabf91 100644 |
--- a/src/stub-cache.cc |
+++ b/src/stub-cache.cc |
@@ -1277,8 +1277,7 @@ void StubCache::CollectMatchingMaps(ZoneMapList* types, |
// StubCompiler implementation. |
-MaybeObject* LoadCallbackProperty(RUNTIME_CALLING_CONVENTION) { |
- RUNTIME_GET_ISOLATE; |
+RUNTIME_FUNCTION(MaybeObject*, LoadCallbackProperty) { |
ASSERT(args[0]->IsJSObject()); |
ASSERT(args[1]->IsJSObject()); |
AccessorInfo* callback = AccessorInfo::cast(args[3]); |
@@ -1300,8 +1299,7 @@ MaybeObject* LoadCallbackProperty(RUNTIME_CALLING_CONVENTION) { |
} |
-MaybeObject* StoreCallbackProperty(RUNTIME_CALLING_CONVENTION) { |
- RUNTIME_GET_ISOLATE; |
+RUNTIME_FUNCTION(MaybeObject*, StoreCallbackProperty) { |
JSObject* recv = JSObject::cast(args[0]); |
AccessorInfo* callback = AccessorInfo::cast(args[1]); |
Address setter_address = v8::ToCData<Address>(callback->setter()); |
@@ -1334,8 +1332,7 @@ static const int kAccessorInfoOffsetInInterceptorArgs = 2; |
* Returns |Heap::no_interceptor_result_sentinel()| if interceptor doesn't |
* provide any value for the given name. |
*/ |
-MaybeObject* LoadPropertyWithInterceptorOnly(RUNTIME_CALLING_CONVENTION) { |
- RUNTIME_GET_ISOLATE; |
+RUNTIME_FUNCTION(MaybeObject*, LoadPropertyWithInterceptorOnly) { |
Handle<String> name_handle = args.at<String>(0); |
Handle<InterceptorInfo> interceptor_info = args.at<InterceptorInfo>(1); |
ASSERT(kAccessorInfoOffsetInInterceptorArgs == 2); |
@@ -1434,8 +1431,7 @@ static MaybeObject* LoadWithInterceptor(Arguments* args, |
* Loads a property with an interceptor performing post interceptor |
* lookup if interceptor failed. |
*/ |
-MaybeObject* LoadPropertyWithInterceptorForLoad(RUNTIME_CALLING_CONVENTION) { |
- RUNTIME_GET_ISOLATE; |
+RUNTIME_FUNCTION(MaybeObject*, LoadPropertyWithInterceptorForLoad) { |
PropertyAttributes attr = NONE; |
Object* result; |
{ MaybeObject* maybe_result = LoadWithInterceptor(&args, &attr); |
@@ -1448,8 +1444,7 @@ MaybeObject* LoadPropertyWithInterceptorForLoad(RUNTIME_CALLING_CONVENTION) { |
} |
-MaybeObject* LoadPropertyWithInterceptorForCall(RUNTIME_CALLING_CONVENTION) { |
- RUNTIME_GET_ISOLATE; |
+RUNTIME_FUNCTION(MaybeObject*, LoadPropertyWithInterceptorForCall) { |
PropertyAttributes attr; |
MaybeObject* result = LoadWithInterceptor(&args, &attr); |
RETURN_IF_SCHEDULED_EXCEPTION(isolate); |
@@ -1460,8 +1455,7 @@ MaybeObject* LoadPropertyWithInterceptorForCall(RUNTIME_CALLING_CONVENTION) { |
} |
-MaybeObject* StoreInterceptorProperty(RUNTIME_CALLING_CONVENTION) { |
- RUNTIME_GET_ISOLATE; |
+RUNTIME_FUNCTION(MaybeObject*, StoreInterceptorProperty) { |
ASSERT(args.length() == 4); |
JSObject* recv = JSObject::cast(args[0]); |
String* name = String::cast(args[1]); |
@@ -1477,8 +1471,7 @@ MaybeObject* StoreInterceptorProperty(RUNTIME_CALLING_CONVENTION) { |
} |
-MaybeObject* KeyedLoadPropertyWithInterceptor(RUNTIME_CALLING_CONVENTION) { |
- RUNTIME_GET_ISOLATE; |
+RUNTIME_FUNCTION(MaybeObject*, KeyedLoadPropertyWithInterceptor) { |
JSObject* receiver = JSObject::cast(args[0]); |
ASSERT(Smi::cast(args[1])->value() >= 0); |
uint32_t index = Smi::cast(args[1])->value(); |