Commit 30f2578c authored by balazs.kilvady's avatar balazs.kilvady Committed by Commit bot

MIPS: Fix after 'Reland remaining parts of 'Use weak cells in map checks in polymorphic ICs''.

Fix d2e54925

In 'MIPS: Change CmpWeakValue to a more MIPS like GetWeakValue.'
a25003cf
we switched to use GetWeakValue.

BUG=

Review URL: https://codereview.chromium.org/782273004

Cr-Commit-Position: refs/heads/master@{#25746}
parent 071a2860
...@@ -58,13 +58,13 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types, ...@@ -58,13 +58,13 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types,
// Check map and tail call if there's a match. // Check map and tail call if there's a match.
// Separate compare from branch, to provide path for above JumpIfSmi(). // Separate compare from branch, to provide path for above JumpIfSmi().
Handle<WeakCell> cell = Map::WeakCellForMap(map); Handle<WeakCell> cell = Map::WeakCellForMap(map);
__ CmpWeakValue(match, map_reg, cell); __ GetWeakValue(match, cell);
if (type->Is(HeapType::Number())) { if (type->Is(HeapType::Number())) {
DCHECK(!number_case.is_unused()); DCHECK(!number_case.is_unused());
__ bind(&number_case); __ bind(&number_case);
} }
__ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq, match, __ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq, match,
Operand(zero_reg)); Operand(map_reg));
} }
} }
DCHECK(number_of_handled_maps != 0); DCHECK(number_of_handled_maps != 0);
...@@ -91,13 +91,13 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic( ...@@ -91,13 +91,13 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
__ lw(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset)); __ lw(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset));
for (int i = 0; i < receiver_count; ++i) { for (int i = 0; i < receiver_count; ++i) {
Handle<WeakCell> cell = Map::WeakCellForMap(receiver_maps->at(i)); Handle<WeakCell> cell = Map::WeakCellForMap(receiver_maps->at(i));
__ CmpWeakValue(match, map_reg, cell); __ GetWeakValue(match, cell);
if (transitioned_maps->at(i).is_null()) { if (transitioned_maps->at(i).is_null()) {
__ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET, eq, match, __ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET, eq, match,
Operand(zero_reg)); Operand(map_reg));
} else { } else {
Label next_map; Label next_map;
__ Branch(&next_map, ne, match, Operand(zero_reg)); __ Branch(&next_map, ne, match, Operand(map_reg));
Handle<WeakCell> cell = Map::WeakCellForMap(transitioned_maps->at(i)); Handle<WeakCell> cell = Map::WeakCellForMap(transitioned_maps->at(i));
__ LoadWeakValue(transition_map(), cell, &miss); __ LoadWeakValue(transition_map(), cell, &miss);
__ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET); __ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET);
......
...@@ -58,13 +58,13 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types, ...@@ -58,13 +58,13 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types,
// Check map and tail call if there's a match. // Check map and tail call if there's a match.
// Separate compare from branch, to provide path for above JumpIfSmi(). // Separate compare from branch, to provide path for above JumpIfSmi().
Handle<WeakCell> cell = Map::WeakCellForMap(map); Handle<WeakCell> cell = Map::WeakCellForMap(map);
__ CmpWeakValue(match, map_reg, cell); __ GetWeakValue(match, cell);
if (type->Is(HeapType::Number())) { if (type->Is(HeapType::Number())) {
DCHECK(!number_case.is_unused()); DCHECK(!number_case.is_unused());
__ bind(&number_case); __ bind(&number_case);
} }
__ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq, match, __ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq, match,
Operand(zero_reg)); Operand(map_reg));
} }
} }
DCHECK(number_of_handled_maps != 0); DCHECK(number_of_handled_maps != 0);
...@@ -91,13 +91,13 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic( ...@@ -91,13 +91,13 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
__ ld(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset)); __ ld(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset));
for (int i = 0; i < receiver_count; ++i) { for (int i = 0; i < receiver_count; ++i) {
Handle<WeakCell> cell = Map::WeakCellForMap(receiver_maps->at(i)); Handle<WeakCell> cell = Map::WeakCellForMap(receiver_maps->at(i));
__ CmpWeakValue(match, map_reg, cell); __ GetWeakValue(match, cell);
if (transitioned_maps->at(i).is_null()) { if (transitioned_maps->at(i).is_null()) {
__ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET, eq, match, __ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET, eq, match,
Operand(zero_reg)); Operand(map_reg));
} else { } else {
Label next_map; Label next_map;
__ Branch(&next_map, ne, match, Operand(zero_reg)); __ Branch(&next_map, ne, match, Operand(map_reg));
Handle<WeakCell> cell = Map::WeakCellForMap(transitioned_maps->at(i)); Handle<WeakCell> cell = Map::WeakCellForMap(transitioned_maps->at(i));
__ LoadWeakValue(transition_map(), cell, &miss); __ LoadWeakValue(transition_map(), cell, &miss);
__ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET); __ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment