Index: src/builtins/ppc/builtins-ppc.cc |
diff --git a/src/builtins/ppc/builtins-ppc.cc b/src/builtins/ppc/builtins-ppc.cc |
index a121ebd409378fc8deb0fc0e3b2855650b93273b..6e9754755e41cc0a5ef5c1e45b6c90ff63050804 100644 |
--- a/src/builtins/ppc/builtins-ppc.cc |
+++ b/src/builtins/ppc/builtins-ppc.cc |
@@ -1363,6 +1363,12 @@ |
Register closure = r4; |
Register map = r9; |
Register index = r5; |
+ |
+ // Do we have a valid feedback vector? |
+ __ LoadP(index, FieldMemOperand(closure, JSFunction::kLiteralsOffset)); |
+ __ LoadP(index, FieldMemOperand(index, LiteralsArray::kFeedbackVectorOffset)); |
+ __ JumpIfRoot(index, Heap::kUndefinedValueRootIndex, &gotta_call_runtime); |
+ |
__ LoadP(map, |
FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset)); |
__ LoadP(map, |
@@ -1371,7 +1377,6 @@ |
__ CmpSmiLiteral(index, Smi::FromInt(2), r0); |
__ blt(&gotta_call_runtime); |
- // Find literals. |
// r10 : native context |
// r5 : length / index |
// r9 : optimized code map |
@@ -1392,18 +1397,6 @@ |
__ LoadP(temp, FieldMemOperand(temp, WeakCell::kValueOffset)); |
__ cmp(temp, native_context); |
__ bne(&loop_bottom); |
- // Literals available? |
- __ LoadP(temp, |
- FieldMemOperand(array_pointer, |
- SharedFunctionInfo::kOffsetToPreviousLiterals)); |
- __ LoadP(temp, FieldMemOperand(temp, WeakCell::kValueOffset)); |
- __ JumpIfSmi(temp, &gotta_call_runtime); |
- |
- // Save the literals in the closure. |
- __ StoreP(temp, FieldMemOperand(closure, JSFunction::kLiteralsOffset), r0); |
- __ RecordWriteField(closure, JSFunction::kLiteralsOffset, temp, r7, |
- kLRHasNotBeenSaved, kDontSaveFPRegs, EMIT_REMEMBERED_SET, |
- OMIT_SMI_CHECK); |
// Code available? |
Register entry = r7; |
@@ -1413,7 +1406,7 @@ |
__ LoadP(entry, FieldMemOperand(entry, WeakCell::kValueOffset)); |
__ JumpIfSmi(entry, &try_shared); |
- // Found literals and code. Get them into the closure and return. |
+ // Found code. Get it into the closure and return. |
// Store code entry in the closure. |
__ addi(entry, entry, Operand(Code::kHeaderSize - kHeapObjectTag)); |
__ StoreP(entry, FieldMemOperand(closure, JSFunction::kCodeEntryOffset), r0); |
@@ -1447,7 +1440,7 @@ |
__ CmpSmiLiteral(index, Smi::FromInt(1), r0); |
__ bgt(&loop_top); |
- // We found neither literals nor code. |
+ // We found no code. |
__ b(&gotta_call_runtime); |
__ bind(&try_shared); |