Index: src/arm/stub-cache-arm.cc |
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc |
index cc2925eab0f69461fe458d8aff16c28d00edc6b9..43de0c8a1ca2b936f48cceea2a9aac7ed9482900 100644 |
--- a/src/arm/stub-cache-arm.cc |
+++ b/src/arm/stub-cache-arm.cc |
@@ -521,11 +521,12 @@ static void PushInterceptorArguments(MacroAssembler* masm, |
} |
-static void CompileCallLoadPropertyWithInterceptor(MacroAssembler* masm, |
- Register receiver, |
- Register holder, |
- Register name, |
- Handle<JSObject> holder_obj) { |
+static void CompileCallLoadPropertyWithInterceptor( |
+ MacroAssembler* masm, |
+ Register receiver, |
+ Register holder, |
+ Register name, |
+ Handle<JSObject> holder_obj) { |
PushInterceptorArguments(masm, receiver, holder, name, holder_obj); |
ExternalReference ref = |
@@ -3100,7 +3101,8 @@ Handle<Code> KeyedStoreStubCompiler::CompileStorePolymorphic( |
} |
-MaybeObject* ConstructStubCompiler::CompileConstructStub(JSFunction* function) { |
+Handle<Code> ConstructStubCompiler::CompileConstructStub( |
+ Handle<JSFunction> function) { |
// ----------- S t a t e ------------- |
// -- r0 : argc |
// -- r1 : constructor |
@@ -3146,12 +3148,7 @@ MaybeObject* ConstructStubCompiler::CompileConstructStub(JSFunction* function) { |
// r2: initial map |
// r7: undefined |
__ ldrb(r3, FieldMemOperand(r2, Map::kInstanceSizeOffset)); |
- __ AllocateInNewSpace(r3, |
- r4, |
- r5, |
- r6, |
- &generic_stub_call, |
- SIZE_IN_WORDS); |
+ __ AllocateInNewSpace(r3, r4, r5, r6, &generic_stub_call, SIZE_IN_WORDS); |
// Allocated the JSObject, now initialize the fields. Map is set to initial |
// map and properties and elements are set to empty fixed array. |
@@ -3183,7 +3180,7 @@ MaybeObject* ConstructStubCompiler::CompileConstructStub(JSFunction* function) { |
// r7: undefined |
// Fill the initialized properties with a constant value or a passed argument |
// depending on the this.x = ...; assignment in the function. |
- SharedFunctionInfo* shared = function->shared(); |
+ Handle<SharedFunctionInfo> shared(function->shared()); |
for (int i = 0; i < shared->this_property_assignments_count(); i++) { |
if (shared->IsThisPropertyAssignmentArgument(i)) { |
Label not_passed, next; |