From 30f2578ca2829a5c9b8952df20fd39bf7c99ea30 Mon Sep 17 00:00:00 2001 From: "balazs.kilvady" Date: Wed, 10 Dec 2014 05:13:53 -0800 Subject: [PATCH] MIPS: Fix after 'Reland remaining parts of 'Use weak cells in map checks in polymorphic ICs''. Fix d2e54925caa8b14988a46a912a8b061bf4c6cbf3 In 'MIPS: Change CmpWeakValue to a more MIPS like GetWeakValue.' a25003cfa6eac88635c12b51ec6ad74fed0d91a1 we switched to use GetWeakValue. BUG= Review URL: https://codereview.chromium.org/782273004 Cr-Commit-Position: refs/heads/master@{#25746} --- src/ic/mips/ic-compiler-mips.cc | 10 +++++----- src/ic/mips64/ic-compiler-mips64.cc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ic/mips/ic-compiler-mips.cc b/src/ic/mips/ic-compiler-mips.cc index fd8e6fa8e0..7c74d7a0e3 100644 --- a/src/ic/mips/ic-compiler-mips.cc +++ b/src/ic/mips/ic-compiler-mips.cc @@ -58,13 +58,13 @@ Handle PropertyICCompiler::CompilePolymorphic(TypeHandleList* types, // Check map and tail call if there's a match. // Separate compare from branch, to provide path for above JumpIfSmi(). Handle cell = Map::WeakCellForMap(map); - __ CmpWeakValue(match, map_reg, cell); + __ GetWeakValue(match, cell); if (type->Is(HeapType::Number())) { DCHECK(!number_case.is_unused()); __ bind(&number_case); } __ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq, match, - Operand(zero_reg)); + Operand(map_reg)); } } DCHECK(number_of_handled_maps != 0); @@ -91,13 +91,13 @@ Handle PropertyICCompiler::CompileKeyedStorePolymorphic( __ lw(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset)); for (int i = 0; i < receiver_count; ++i) { Handle cell = Map::WeakCellForMap(receiver_maps->at(i)); - __ CmpWeakValue(match, map_reg, cell); + __ GetWeakValue(match, cell); if (transitioned_maps->at(i).is_null()) { __ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET, eq, match, - Operand(zero_reg)); + Operand(map_reg)); } else { Label next_map; - __ Branch(&next_map, ne, match, Operand(zero_reg)); + __ Branch(&next_map, ne, match, Operand(map_reg)); Handle cell = Map::WeakCellForMap(transitioned_maps->at(i)); __ LoadWeakValue(transition_map(), cell, &miss); __ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET); diff --git a/src/ic/mips64/ic-compiler-mips64.cc b/src/ic/mips64/ic-compiler-mips64.cc index 25588248ab..39dfe25795 100644 --- a/src/ic/mips64/ic-compiler-mips64.cc +++ b/src/ic/mips64/ic-compiler-mips64.cc @@ -58,13 +58,13 @@ Handle PropertyICCompiler::CompilePolymorphic(TypeHandleList* types, // Check map and tail call if there's a match. // Separate compare from branch, to provide path for above JumpIfSmi(). Handle cell = Map::WeakCellForMap(map); - __ CmpWeakValue(match, map_reg, cell); + __ GetWeakValue(match, cell); if (type->Is(HeapType::Number())) { DCHECK(!number_case.is_unused()); __ bind(&number_case); } __ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq, match, - Operand(zero_reg)); + Operand(map_reg)); } } DCHECK(number_of_handled_maps != 0); @@ -91,13 +91,13 @@ Handle PropertyICCompiler::CompileKeyedStorePolymorphic( __ ld(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset)); for (int i = 0; i < receiver_count; ++i) { Handle cell = Map::WeakCellForMap(receiver_maps->at(i)); - __ CmpWeakValue(match, map_reg, cell); + __ GetWeakValue(match, cell); if (transitioned_maps->at(i).is_null()) { __ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET, eq, match, - Operand(zero_reg)); + Operand(map_reg)); } else { Label next_map; - __ Branch(&next_map, ne, match, Operand(zero_reg)); + __ Branch(&next_map, ne, match, Operand(map_reg)); Handle cell = Map::WeakCellForMap(transitioned_maps->at(i)); __ LoadWeakValue(transition_map(), cell, &miss); __ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET);