diff options
| author | Ben Murdoch <benm@google.com> | 2016-08-08 18:44:38 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2016-08-08 18:53:09 +0100 |
| commit | bcf72ee8e3b26f1d0726869c7ddb3921c68b09a8 (patch) | |
| tree | f29dbc902638cd0978d68e11ca4210b4d42ad94b /src/ic/x87/ic-x87.cc | |
| parent | c760da5ef600c88c80b92873880fa8d221642e06 (diff) | |
| download | v8-bcf72ee8e3b26f1d0726869c7ddb3921c68b09a8.tar.gz | |
Merge V8 5.2.361.47
https://chromium.googlesource.com/v8/v8/+/5.2.361.47
Change-Id: Ibec421b85a9b88cb3a432ada642e469fe7e78346
Diffstat (limited to 'src/ic/x87/ic-x87.cc')
| -rw-r--r-- | src/ic/x87/ic-x87.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ic/x87/ic-x87.cc b/src/ic/x87/ic-x87.cc index b51045be..94919549 100644 --- a/src/ic/x87/ic-x87.cc +++ b/src/ic/x87/ic-x87.cc @@ -336,8 +336,8 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) { __ push(Immediate(Smi::FromInt(slot))); __ push(Immediate(dummy_vector)); - Code::Flags flags = Code::RemoveTypeAndHolderFromFlags( - Code::ComputeHandlerFlags(Code::LOAD_IC)); + Code::Flags flags = + Code::RemoveHolderFromFlags(Code::ComputeHandlerFlags(Code::LOAD_IC)); masm->isolate()->stub_cache()->GenerateProbe(masm, Code::KEYED_LOAD_IC, flags, receiver, key, ebx, edi); @@ -519,10 +519,10 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm, __ JumpIfSmi(receiver, &slow); // Get the map from the receiver. __ mov(edi, FieldOperand(receiver, HeapObject::kMapOffset)); - // Check that the receiver does not require access checks and is not observed. - // The generic stub does not perform map checks or handle observed objects. + // Check that the receiver does not require access checks. + // The generic stub does not perform map checks. __ test_b(FieldOperand(edi, Map::kBitFieldOffset), - Immediate(1 << Map::kIsAccessCheckNeeded | 1 << Map::kIsObserved)); + Immediate(1 << Map::kIsAccessCheckNeeded)); __ j(not_zero, &slow); // Check that the key is a smi. __ JumpIfNotSmi(key, &maybe_name_key); @@ -563,10 +563,10 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm, __ push(Immediate(Smi::FromInt(slot))); __ push(Immediate(dummy_vector)); - Code::Flags flags = Code::RemoveTypeAndHolderFromFlags( - Code::ComputeHandlerFlags(Code::STORE_IC)); - masm->isolate()->stub_cache()->GenerateProbe(masm, Code::STORE_IC, flags, - receiver, key, edi, no_reg); + Code::Flags flags = + Code::RemoveHolderFromFlags(Code::ComputeHandlerFlags(Code::STORE_IC)); + masm->isolate()->stub_cache()->GenerateProbe( + masm, Code::KEYED_STORE_IC, flags, receiver, key, edi, no_reg); __ pop(VectorStoreICDescriptor::VectorRegister()); __ pop(VectorStoreICDescriptor::SlotRegister()); |