Skip to content

V
V8
Commit a956bf58 authored by ulan's avatar ulan Committed by Commit bot
Browse files
Options

Make map check in NamedStoreHandlerCompiler::GenerateFieldTypeChecks weak. 

BUG=v8:3629
LOG=N

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

Cr-Commit-Position: refs/heads/master@{#26070}
parent e6552d49
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 19 deletions
src/ic/arm/handler-compiler-arm.cc
View file @ a956bf58
...@@ -377,13 +377,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg, ...@@ -377,13 +377,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg,
void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type, void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type,
Register value_reg, Register value_reg,
Label* miss_label) { Label* miss_label) {
Register map_reg = scratch1();
Register scratch = scratch2();
DCHECK(!value_reg.is(map_reg));
DCHECK(!value_reg.is(scratch));
__ JumpIfSmi(value_reg, miss_label); __ JumpIfSmi(value_reg, miss_label);
HeapType::Iterator<Map> it = field_type->Classes(); HeapType::Iterator<Map> it = field_type->Classes();
if (!it.Done()) { if (!it.Done()) {
__ ldr(scratch1(), FieldMemOperand(value_reg, HeapObject::kMapOffset)); __ ldr(map_reg, FieldMemOperand(value_reg, HeapObject::kMapOffset));
Label do_store; Label do_store;
while (true) { while (true) {
__ CompareMap(scratch1(), it.Current(), &do_store); __ CmpWeakValue(map_reg, Map::WeakCellForMap(it.Current()), scratch);
it.Advance(); it.Advance();
if (it.Done()) { if (it.Done()) {
__ b(ne, miss_label); __ b(ne, miss_label);
......
src/ic/arm64/handler-compiler-arm64.cc
View file @ a956bf58
...@@ -427,13 +427,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg, ...@@ -427,13 +427,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg,
void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type, void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type,
Register value_reg, Register value_reg,
Label* miss_label) { Label* miss_label) {
Register map_reg = scratch1();
Register scratch = scratch2();
DCHECK(!value_reg.is(map_reg));
DCHECK(!value_reg.is(scratch));
__ JumpIfSmi(value_reg, miss_label); __ JumpIfSmi(value_reg, miss_label);
HeapType::Iterator<Map> it = field_type->Classes(); HeapType::Iterator<Map> it = field_type->Classes();
if (!it.Done()) { if (!it.Done()) {
__ Ldr(scratch1(), FieldMemOperand(value_reg, HeapObject::kMapOffset)); __ Ldr(map_reg, FieldMemOperand(value_reg, HeapObject::kMapOffset));
Label do_store; Label do_store;
while (true) { while (true) {
__ CompareMap(scratch1(), it.Current()); __ CmpWeakValue(map_reg, Map::WeakCellForMap(it.Current()), scratch);
it.Advance(); it.Advance();
if (it.Done()) { if (it.Done()) {
__ B(ne, miss_label); __ B(ne, miss_label);
......
src/ic/ia32/handler-compiler-ia32.cc
View file @ a956bf58
...@@ -385,12 +385,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg, ...@@ -385,12 +385,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg,
void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type, void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type,
Register value_reg, Register value_reg,
Label* miss_label) { Label* miss_label) {
Register map_reg = scratch1();
Register scratch = scratch2();
DCHECK(!value_reg.is(map_reg));
DCHECK(!value_reg.is(scratch));
__ JumpIfSmi(value_reg, miss_label); __ JumpIfSmi(value_reg, miss_label);
HeapType::Iterator<Map> it = field_type->Classes(); HeapType::Iterator<Map> it = field_type->Classes();
if (!it.Done()) { if (!it.Done()) {
Label do_store; Label do_store;
__ mov(map_reg, FieldOperand(value_reg, HeapObject::kMapOffset));
while (true) { while (true) {
__ CompareMap(value_reg, it.Current()); __ CmpWeakValue(map_reg, Map::WeakCellForMap(it.Current()), scratch);
it.Advance(); it.Advance();
if (it.Done()) { if (it.Done()) {
__ j(not_equal, miss_label); __ j(not_equal, miss_label);
......
src/ic/mips/handler-compiler-mips.cc
View file @ a956bf58
...@@ -370,21 +370,24 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg, ...@@ -370,21 +370,24 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg,
void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type, void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type,
Register value_reg, Register value_reg,
Label* miss_label) { Label* miss_label) {
Register map_reg = scratch1();
Register scratch = scratch2();
DCHECK(!value_reg.is(map_reg));
DCHECK(!value_reg.is(scratch));
__ JumpIfSmi(value_reg, miss_label); __ JumpIfSmi(value_reg, miss_label);
HeapType::Iterator<Map> it = field_type->Classes(); HeapType::Iterator<Map> it = field_type->Classes();
if (!it.Done()) { if (!it.Done()) {
__ lw(scratch1(), FieldMemOperand(value_reg, HeapObject::kMapOffset)); __ lw(map_reg, FieldMemOperand(value_reg, HeapObject::kMapOffset));
Label do_store; Label do_store;
Handle<Map> current;
while (true) { while (true) {
// Do the CompareMap() directly within the Branch() functions. // Compare map directly within the Branch() functions.
current = it.Current(); __ GetWeakValue(scratch, Map::WeakCellForMap(it.Current()));
it.Advance(); it.Advance();
if (it.Done()) { if (it.Done()) {
__ Branch(miss_label, ne, scratch1(), Operand(current)); __ Branch(miss_label, ne, map_reg, Operand(scratch));
break; break;
} }
__ Branch(&do_store, eq, scratch1(), Operand(current)); __ Branch(&do_store, eq, map_reg, Operand(scratch));
} }
__ bind(&do_store); __ bind(&do_store);
} }
......
src/ic/mips64/handler-compiler-mips64.cc
View file @ a956bf58
...@@ -371,21 +371,24 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg, ...@@ -371,21 +371,24 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg,
void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type, void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type,
Register value_reg, Register value_reg,
Label* miss_label) { Label* miss_label) {
Register map_reg = scratch1();
Register scratch = scratch2();
DCHECK(!value_reg.is(map_reg));
DCHECK(!value_reg.is(scratch));
__ JumpIfSmi(value_reg, miss_label); __ JumpIfSmi(value_reg, miss_label);
HeapType::Iterator<Map> it = field_type->Classes(); HeapType::Iterator<Map> it = field_type->Classes();
if (!it.Done()) { if (!it.Done()) {
__ ld(scratch1(), FieldMemOperand(value_reg, HeapObject::kMapOffset)); __ ld(map_reg, FieldMemOperand(value_reg, HeapObject::kMapOffset));
Label do_store; Label do_store;
Handle<Map> current;
while (true) { while (true) {
// Do the CompareMap() directly within the Branch() functions. // Compare map directly within the Branch() functions.
current = it.Current();
it.Advance(); it.Advance();
__ GetWeakValue(scratch, Map::WeakCellForMap(it.Current()));
if (it.Done()) { if (it.Done()) {
__ Branch(miss_label, ne, scratch1(), Operand(current)); __ Branch(miss_label, ne, map_reg, Operand(scratch));
break; break;
} }
__ Branch(&do_store, eq, scratch1(), Operand(current)); __ Branch(&do_store, eq, map_reg, Operand(scratch));
} }
__ bind(&do_store); __ bind(&do_store);
} }
......
src/ic/x64/handler-compiler-x64.cc
View file @ a956bf58
...@@ -377,12 +377,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg, ...@@ -377,12 +377,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg,
void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type, void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type,
Register value_reg, Register value_reg,
Label* miss_label) { Label* miss_label) {
Register map_reg = scratch1();
Register scratch = scratch2();
DCHECK(!value_reg.is(map_reg));
DCHECK(!value_reg.is(scratch));
__ JumpIfSmi(value_reg, miss_label); __ JumpIfSmi(value_reg, miss_label);
HeapType::Iterator<Map> it = field_type->Classes(); HeapType::Iterator<Map> it = field_type->Classes();
if (!it.Done()) { if (!it.Done()) {
Label do_store; Label do_store;
__ movp(map_reg, FieldOperand(value_reg, HeapObject::kMapOffset));
while (true) { while (true) {
__ CompareMap(value_reg, it.Current()); __ CmpWeakValue(map_reg, Map::WeakCellForMap(it.Current()), scratch);
it.Advance(); it.Advance();
if (it.Done()) { if (it.Done()) {
__ j(not_equal, miss_label); __ j(not_equal, miss_label);
......
src/ic/x87/handler-compiler-x87.cc
View file @ a956bf58
...@@ -385,12 +385,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg, ...@@ -385,12 +385,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg,
void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type, void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type,
Register value_reg, Register value_reg,
Label* miss_label) { Label* miss_label) {
Register map_reg = scratch1();
Register scratch = scratch2();
DCHECK(!value_reg.is(map_reg));
DCHECK(!value_reg.is(scratch));
__ JumpIfSmi(value_reg, miss_label); __ JumpIfSmi(value_reg, miss_label);
HeapType::Iterator<Map> it = field_type->Classes(); HeapType::Iterator<Map> it = field_type->Classes();
if (!it.Done()) { if (!it.Done()) {
Label do_store; Label do_store;
__ mov(map_reg, FieldOperand(value_reg, HeapObject::kMapOffset));
while (true) { while (true) {
__ CompareMap(value_reg, it.Current()); __ CmpWeakValue(map_reg, Map::WeakCellForMap(it.Current()), scratch);
it.Advance(); it.Advance();
if (it.Done()) { if (it.Done()) {
__ j(not_equal, miss_label); __ j(not_equal, miss_label);
......
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