| Index: src/ic/ppc/ic-ppc.cc
|
| diff --git a/src/ic/ppc/ic-ppc.cc b/src/ic/ppc/ic-ppc.cc
|
| index 557f9ca4bd9b90f6a983abeef2bde142ecdd29a9..db56fbaf669903a1271af0474de0d770031ebf1a 100644
|
| --- a/src/ic/ppc/ic-ppc.cc
|
| +++ b/src/ic/ppc/ic-ppc.cc
|
| @@ -167,7 +167,8 @@ static void GenerateKeyedLoadReceiverCheck(MacroAssembler* masm,
|
| 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 @@ static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver,
|
| //
|
| // 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 @@ static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver,
|
| __ 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 @@ static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver,
|
| __ 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.
|
| @@ -273,7 +279,7 @@ static void GenerateKeyNameCheck(MacroAssembler* masm, Register key,
|
| }
|
|
|
|
|
| -void LoadIC::GenerateNormal(MacroAssembler* masm) {
|
| +void LoadIC::GenerateNormal(MacroAssembler* masm, LanguageMode language_mode) {
|
| Register dictionary = r3;
|
| DCHECK(!dictionary.is(LoadDescriptor::ReceiverRegister()));
|
| DCHECK(!dictionary.is(LoadDescriptor::NameRegister()));
|
| @@ -288,7 +294,7 @@ void LoadIC::GenerateNormal(MacroAssembler* masm) {
|
|
|
| // Dictionary load failed, go slow (but don't miss).
|
| __ bind(&slow);
|
| - GenerateRuntimeGetProperty(masm);
|
| + GenerateRuntimeGetProperty(masm, language_mode);
|
| }
|
|
|
|
|
| @@ -323,13 +329,17 @@ void LoadIC::GenerateMiss(MacroAssembler* masm) {
|
| }
|
|
|
|
|
| -void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) {
|
| +void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm,
|
| + LanguageMode language_mode) {
|
| // The return address is in lr.
|
|
|
| __ mr(LoadIC_TempRegister(), LoadDescriptor::ReceiverRegister());
|
| __ Push(LoadIC_TempRegister(), LoadDescriptor::NameRegister());
|
|
|
| - __ TailCallRuntime(Runtime::kGetProperty, 2, 1);
|
| + // Do tail-call to runtime routine.
|
| + __ TailCallRuntime(is_strong(language_mode) ? Runtime::kGetPropertyStrong
|
| + : Runtime::kGetProperty,
|
| + 2, 1);
|
| }
|
|
|
|
|
| @@ -351,16 +361,21 @@ void KeyedLoadIC::GenerateMiss(MacroAssembler* masm) {
|
| }
|
|
|
|
|
| -void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) {
|
| +void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm,
|
| + LanguageMode language_mode) {
|
| // The return address is in lr.
|
|
|
| __ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister());
|
|
|
| - __ TailCallRuntime(Runtime::kKeyedGetProperty, 2, 1);
|
| + // Do tail-call to runtime routine.
|
| + __ TailCallRuntime(is_strong(language_mode) ? Runtime::kKeyedGetPropertyStrong
|
| + : Runtime::kKeyedGetProperty,
|
| + 2, 1);
|
| }
|
|
|
|
|
| -void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) {
|
| +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 +399,8 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) {
|
| // 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 +422,7 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) {
|
| __ bind(&slow);
|
| __ IncrementCounter(isolate->counters()->keyed_load_generic_slow(), 1, r7,
|
| r6);
|
| - GenerateRuntimeGetProperty(masm);
|
| + GenerateRuntimeGetProperty(masm, language_mode);
|
|
|
| __ bind(&check_name);
|
| GenerateKeyNameCheck(masm, key, r3, r6, &index_name, &slow);
|
|
|