Index: src/ic/ppc/ic-ppc.cc |
diff --git a/src/ic/ppc/ic-ppc.cc b/src/ic/ppc/ic-ppc.cc |
index fdb88aee50ce57c38cdb96681b33b8cf2d602b19..6b4fc4599722ce02baf5a83ea7919b3aabfac34c 100644 |
--- a/src/ic/ppc/ic-ppc.cc |
+++ b/src/ic/ppc/ic-ppc.cc |
@@ -167,7 +167,8 @@ |
static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver, |
Register key, Register elements, |
Register scratch1, Register scratch2, |
- Register result, Label* slow) { |
+ Register result, Label* slow, |
+ LanguageMode language_mode) { |
// Register use: |
// |
// receiver - holds the receiver on entry. |
@@ -189,7 +190,7 @@ |
// |
// scratch2 - used to hold maps, prototypes, and the loaded value. |
Label check_prototypes, check_next_prototype; |
- Label done, in_bounds, return_undefined; |
+ Label done, in_bounds, absent; |
__ LoadP(elements, FieldMemOperand(receiver, JSObject::kElementsOffset)); |
__ AssertFastElements(elements); |
@@ -208,7 +209,7 @@ |
__ LoadP(scratch2, FieldMemOperand(scratch2, Map::kPrototypeOffset)); |
// scratch2: current prototype |
__ CompareRoot(scratch2, Heap::kNullValueRootIndex); |
- __ beq(&return_undefined); |
+ __ beq(&absent); |
__ LoadP(elements, FieldMemOperand(scratch2, JSObject::kElementsOffset)); |
__ LoadP(scratch2, FieldMemOperand(scratch2, HeapObject::kMapOffset)); |
// elements: elements of current prototype |
@@ -223,9 +224,14 @@ |
__ bne(slow); |
__ jmp(&check_next_prototype); |
- __ bind(&return_undefined); |
- __ LoadRoot(result, Heap::kUndefinedValueRootIndex); |
- __ jmp(&done); |
+ __ bind(&absent); |
+ if (is_strong(language_mode)) { |
+ // Strong mode accesses must throw in this case, so call the runtime. |
+ __ jmp(slow); |
+ } else { |
+ __ LoadRoot(result, Heap::kUndefinedValueRootIndex); |
+ __ jmp(&done); |
+ } |
__ bind(&in_bounds); |
// Fast case: Do the load. |
@@ -288,7 +294,7 @@ |
// Dictionary load failed, go slow (but don't miss). |
__ bind(&slow); |
- GenerateRuntimeGetProperty(masm); |
+ GenerateSlow(masm); |
} |
@@ -323,13 +329,16 @@ |
} |
-void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { |
+void LoadIC::GenerateSlow(MacroAssembler* masm) { |
// The return address is in lr. |
__ mr(LoadIC_TempRegister(), LoadDescriptor::ReceiverRegister()); |
__ Push(LoadIC_TempRegister(), LoadDescriptor::NameRegister()); |
- __ TailCallRuntime(Runtime::kGetProperty, 2, 1); |
+ ExternalReference ref = |
+ ExternalReference(IC_Utility(kLoadIC_Slow), masm->isolate()); |
+ int arg_count = 2; |
+ __ TailCallExternalReference(ref, arg_count, 1); |
} |
@@ -351,16 +360,20 @@ |
} |
-void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { |
+void KeyedLoadIC::GenerateSlow(MacroAssembler* masm) { |
// The return address is in lr. |
__ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister()); |
- __ TailCallRuntime(Runtime::kKeyedGetProperty, 2, 1); |
-} |
- |
- |
-void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) { |
+ ExternalReference ref = |
+ ExternalReference(IC_Utility(kKeyedLoadIC_Slow), masm->isolate()); |
+ int arg_count = 2; |
+ __ TailCallExternalReference(ref, arg_count, 1); |
+} |
+ |
+ |
+void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, |
+ LanguageMode language_mode) { |
// The return address is in lr. |
Label slow, check_name, index_smi, index_name, property_array_property; |
Label probe_dictionary, check_number_dictionary; |
@@ -384,7 +397,8 @@ |
// Check the receiver's map to see if it has fast elements. |
__ CheckFastElements(r3, r6, &check_number_dictionary); |
- GenerateFastArrayLoad(masm, receiver, key, r3, r6, r7, r3, &slow); |
+ GenerateFastArrayLoad(masm, receiver, key, r3, r6, r7, r3, &slow, |
+ language_mode); |
__ IncrementCounter(isolate->counters()->keyed_load_generic_smi(), 1, r7, r6); |
__ Ret(); |
@@ -406,7 +420,7 @@ |
__ bind(&slow); |
__ IncrementCounter(isolate->counters()->keyed_load_generic_slow(), 1, r7, |
r6); |
- GenerateRuntimeGetProperty(masm); |
+ GenerateSlow(masm); |
__ bind(&check_name); |
GenerateKeyNameCheck(masm, key, r3, r6, &index_name, &slow); |