Index: src/arm/full-codegen-arm.cc |
=================================================================== |
--- src/arm/full-codegen-arm.cc (revision 12224) |
+++ src/arm/full-codegen-arm.cc (working copy) |
@@ -2364,16 +2364,14 @@ |
// Record source position for debugger. |
SetSourcePosition(expr->position()); |
- // Record call targets in unoptimized code, but not in the snapshot. |
- if (!Serializer::enabled()) { |
- flags = static_cast<CallFunctionFlags>(flags | RECORD_CALL_TARGET); |
- Handle<Object> uninitialized = |
- TypeFeedbackCells::UninitializedSentinel(isolate()); |
- Handle<JSGlobalPropertyCell> cell = |
- isolate()->factory()->NewJSGlobalPropertyCell(uninitialized); |
- RecordTypeFeedbackCell(expr->id(), cell); |
- __ mov(r2, Operand(cell)); |
- } |
+ // Record call targets in unoptimized code. |
+ flags = static_cast<CallFunctionFlags>(flags | RECORD_CALL_TARGET); |
+ Handle<Object> uninitialized = |
+ TypeFeedbackCells::UninitializedSentinel(isolate()); |
+ Handle<JSGlobalPropertyCell> cell = |
+ isolate()->factory()->NewJSGlobalPropertyCell(uninitialized); |
+ RecordTypeFeedbackCell(expr->id(), cell); |
+ __ mov(r2, Operand(cell)); |
CallFunctionStub stub(arg_count, flags); |
__ ldr(r1, MemOperand(sp, (arg_count + 1) * kPointerSize)); |
@@ -2563,21 +2561,15 @@ |
__ mov(r0, Operand(arg_count)); |
__ ldr(r1, MemOperand(sp, arg_count * kPointerSize)); |
- // Record call targets in unoptimized code, but not in the snapshot. |
- CallFunctionFlags flags; |
- if (!Serializer::enabled()) { |
- flags = RECORD_CALL_TARGET; |
- Handle<Object> uninitialized = |
- TypeFeedbackCells::UninitializedSentinel(isolate()); |
- Handle<JSGlobalPropertyCell> cell = |
- isolate()->factory()->NewJSGlobalPropertyCell(uninitialized); |
- RecordTypeFeedbackCell(expr->id(), cell); |
- __ mov(r2, Operand(cell)); |
- } else { |
- flags = NO_CALL_FUNCTION_FLAGS; |
- } |
+ // Record call targets in unoptimized code. |
+ Handle<Object> uninitialized = |
+ TypeFeedbackCells::UninitializedSentinel(isolate()); |
+ Handle<JSGlobalPropertyCell> cell = |
+ isolate()->factory()->NewJSGlobalPropertyCell(uninitialized); |
+ RecordTypeFeedbackCell(expr->id(), cell); |
+ __ mov(r2, Operand(cell)); |
- CallConstructStub stub(flags); |
+ CallConstructStub stub(RECORD_CALL_TARGET); |
__ Call(stub.GetCode(), RelocInfo::CONSTRUCT_CALL); |
PrepareForBailoutForId(expr->ReturnId(), TOS_REG); |
context()->Plug(r0); |