Revision: 21863
Author: [email protected]
Date: Tue Jun 17 04:40:51 2014 UTC
Log: Version 3.26.31.6 (merged r21509, r21858, r21525)
Avoid HeapObject check in HStoreNamedField.
Add unit test for regression in GVN caused by field type tracking.
MIPS: Avoid HeapObject check in HStoreNamedField.
BUG=v8:3347
LOG=N
[email protected]
Review URL: https://codereview.chromium.org/332333002
http://code.google.com/p/v8/source/detail?r=21863
Added:
/branches/3.26/test/mjsunit/regress/regress-gvn-ftt.js
Modified:
/branches/3.26/src/arm/lithium-arm.cc
/branches/3.26/src/arm/lithium-codegen-arm.cc
/branches/3.26/src/arm/macro-assembler-arm.cc
/branches/3.26/src/arm64/lithium-arm64.cc
/branches/3.26/src/arm64/lithium-codegen-arm64.cc
/branches/3.26/src/arm64/macro-assembler-arm64.cc
/branches/3.26/src/hydrogen-instructions.cc
/branches/3.26/src/hydrogen-instructions.h
/branches/3.26/src/hydrogen.cc
/branches/3.26/src/ia32/lithium-codegen-ia32.cc
/branches/3.26/src/ia32/lithium-ia32.cc
/branches/3.26/src/ia32/macro-assembler-ia32.cc
/branches/3.26/src/mips/lithium-codegen-mips.cc
/branches/3.26/src/mips/lithium-mips.cc
/branches/3.26/src/mips/macro-assembler-mips.cc
/branches/3.26/src/version.cc
/branches/3.26/src/x64/lithium-codegen-x64.cc
/branches/3.26/src/x64/lithium-x64.cc
/branches/3.26/src/x64/macro-assembler-x64.cc
=======================================
--- /dev/null
+++ /branches/3.26/test/mjsunit/regress/regress-gvn-ftt.js Tue Jun 17
04:40:51 2014 UTC
@@ -0,0 +1,27 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --track-field-types --use-gvn
+
+function A(id) {
+ this.id = id;
+}
+
+var a1 = new A(1);
+var a2 = new A(2);
+
+
+var g;
+function f(o, value) {
+ g = o.o;
+ o.o = value;
+ return o.o;
+}
+
+var obj = {o: a1};
+
+f(obj, a1);
+f(obj, a1);
+%OptimizeFunctionOnNextCall(f);
+assertEquals(a2.id, f(obj, a2).id);
=======================================
--- /branches/3.26/src/arm/lithium-arm.cc Mon Jun 16 20:45:15 2014 UTC
+++ /branches/3.26/src/arm/lithium-arm.cc Tue Jun 17 04:40:51 2014 UTC
@@ -2297,13 +2297,7 @@
// We need a temporary register for write barrier of the map field.
LOperand* temp = needs_write_barrier_for_map ? TempRegister() : NULL;
- LInstruction* result = new(zone()) LStoreNamedField(obj, val, temp);
- if (!instr->access().IsExternalMemory() &&
- instr->field_representation().IsHeapObject() &&
- !instr->value()->type().IsHeapObject()) {
- result = AssignEnvironment(result);
- }
- return result;
+ return new(zone()) LStoreNamedField(obj, val, temp);
}
=======================================
--- /branches/3.26/src/arm/lithium-codegen-arm.cc Mon Jun 16 20:45:15 2014
UTC
+++ /branches/3.26/src/arm/lithium-codegen-arm.cc Tue Jun 17 04:40:51 2014
UTC
@@ -4069,23 +4069,12 @@
return;
}
- SmiCheck check_needed =
- instr->hydrogen()->value()->IsHeapObject()
- ? OMIT_SMI_CHECK : INLINE_SMI_CHECK;
+ __ AssertNotSmi(object);
- ASSERT(!(representation.IsSmi() &&
- instr->value()->IsConstantOperand() &&
- !IsSmi(LConstantOperand::cast(instr->value()))));
- if (representation.IsHeapObject()) {
- Register value = ToRegister(instr->value());
- if (!instr->hydrogen()->value()->type().IsHeapObject()) {
- __ SmiTst(value);
- DeoptimizeIf(eq, instr->environment());
-
- // We know now that value is not a smi, so we can omit the check
below.
- check_needed = OMIT_SMI_CHECK;
- }
- } else if (representation.IsDouble()) {
+ ASSERT(!representation.IsSmi() ||
+ !instr->value()->IsConstantOperand() ||
+ IsSmi(LConstantOperand::cast(instr->value())));
+ if (representation.IsDouble()) {
ASSERT(access.IsInobject());
ASSERT(!instr->hydrogen()->has_transition());
ASSERT(!instr->hydrogen()->NeedsWriteBarrier());
@@ -4127,7 +4116,7 @@
GetLinkRegisterState(),
kSaveFPRegs,
EMIT_REMEMBERED_SET,
- check_needed);
+ instr->hydrogen()->SmiCheckForWriteBarrier());
}
} else {
__ ldr(scratch, FieldMemOperand(object, JSObject::kPropertiesOffset));
@@ -4143,7 +4132,7 @@
GetLinkRegisterState(),
kSaveFPRegs,
EMIT_REMEMBERED_SET,
- check_needed);
+ instr->hydrogen()->SmiCheckForWriteBarrier());
}
}
}
=======================================
--- /branches/3.26/src/arm/macro-assembler-arm.cc Mon Jun 16 20:45:15 2014
UTC
+++ /branches/3.26/src/arm/macro-assembler-arm.cc Tue Jun 17 04:40:51 2014
UTC
@@ -405,6 +405,11 @@
} else if (r.IsInteger16() || r.IsUInteger16()) {
strh(src, dst);
} else {
+ if (r.IsHeapObject()) {
+ AssertNotSmi(src);
+ } else if (r.IsSmi()) {
+ AssertSmi(src);
+ }
str(src, dst);
}
}
=======================================
--- /branches/3.26/src/arm64/lithium-arm64.cc Mon Jun 16 20:45:15 2014 UTC
+++ /branches/3.26/src/arm64/lithium-arm64.cc Tue Jun 17 04:40:51 2014 UTC
@@ -2246,13 +2246,7 @@
temp0 = TempRegister();
}
- LStoreNamedField* result =
- new(zone()) LStoreNamedField(object, value, temp0, temp1);
- if (instr->field_representation().IsHeapObject() &&
- !instr->value()->type().IsHeapObject()) {
- return AssignEnvironment(result);
- }
- return result;
+ return new(zone()) LStoreNamedField(object, value, temp0, temp1);
}
=======================================
--- /branches/3.26/src/arm64/lithium-codegen-arm64.cc Mon Jun 16 20:45:15
2014 UTC
+++ /branches/3.26/src/arm64/lithium-codegen-arm64.cc Tue Jun 17 04:40:51
2014 UTC
@@ -5257,7 +5257,11 @@
Register value = ToRegister(instr->value());
__ Store(value, MemOperand(object, offset), representation);
return;
- } else if (representation.IsDouble()) {
+ }
+
+ __ AssertNotSmi(object);
+
+ if (representation.IsDouble()) {
ASSERT(access.IsInobject());
ASSERT(!instr->hydrogen()->has_transition());
ASSERT(!instr->hydrogen()->NeedsWriteBarrier());
@@ -5268,19 +5272,9 @@
Register value = ToRegister(instr->value());
- SmiCheck check_needed = instr->hydrogen()->value()->IsHeapObject()
- ? OMIT_SMI_CHECK : INLINE_SMI_CHECK;
-
- ASSERT(!(representation.IsSmi() &&
- instr->value()->IsConstantOperand() &&
- !IsInteger32Constant(LConstantOperand::cast(instr->value()))));
- if (representation.IsHeapObject() &&
- !instr->hydrogen()->value()->type().IsHeapObject()) {
- DeoptimizeIfSmi(value, instr->environment());
-
- // We know now that value is not a smi, so we can omit the check below.
- check_needed = OMIT_SMI_CHECK;
- }
+ ASSERT(!representation.IsSmi() ||
+ !instr->value()->IsConstantOperand() ||
+ IsInteger32Constant(LConstantOperand::cast(instr->value())));
if (instr->hydrogen()->has_transition()) {
Handle<Map> transition = instr->hydrogen()->transition_map();
@@ -5340,7 +5334,7 @@
GetLinkRegisterState(),
kSaveFPRegs,
EMIT_REMEMBERED_SET,
- check_needed);
+ instr->hydrogen()->SmiCheckForWriteBarrier());
}
}
=======================================
--- /branches/3.26/src/arm64/macro-assembler-arm64.cc Mon Jun 16 20:45:15
2014 UTC
+++ /branches/3.26/src/arm64/macro-assembler-arm64.cc Tue Jun 17 04:40:51
2014 UTC
@@ -557,6 +557,11 @@
Str(rt.W(), addr);
} else {
ASSERT(rt.Is64Bits());
+ if (r.IsHeapObject()) {
+ AssertNotSmi(rt);
+ } else if (r.IsSmi()) {
+ AssertSmi(rt);
+ }
Str(rt, addr);
}
}
=======================================
--- /branches/3.26/src/hydrogen-instructions.cc Mon Jun 16 20:45:15 2014 UTC
+++ /branches/3.26/src/hydrogen-instructions.cc Tue Jun 17 04:40:51 2014 UTC
@@ -873,6 +873,7 @@
case HValue::kSeqStringGetChar:
case HValue::kStoreCodeEntry:
case HValue::kStoreKeyed:
+ case HValue::kStoreNamedField:
case HValue::kStoreNamedGeneric:
case HValue::kStringCharCodeAt:
case HValue::kStringCharFromCode:
@@ -921,7 +922,6 @@
case HValue::kStoreContextSlot:
case HValue::kStoreGlobalCell:
case HValue::kStoreKeyedGeneric:
- case HValue::kStoreNamedField:
case HValue::kStringAdd:
case HValue::kStringCompareAndBranch:
case HValue::kSub:
=======================================
--- /branches/3.26/src/hydrogen-instructions.h Mon Jun 16 20:45:15 2014 UTC
+++ /branches/3.26/src/hydrogen-instructions.h Tue Jun 17 04:40:51 2014 UTC
@@ -6662,6 +6662,12 @@
return ReceiverObjectNeedsWriteBarrier(object(), transition(),
new_space_dominator());
}
+
+ SmiCheck SmiCheckForWriteBarrier() const {
+ if (field_representation().IsHeapObject()) return OMIT_SMI_CHECK;
+ if (value()->IsHeapObject()) return OMIT_SMI_CHECK;
+ return INLINE_SMI_CHECK;
+ }
Representation field_representation() const {
return access_.representation();
=======================================
--- /branches/3.26/src/hydrogen.cc Mon Jun 16 20:45:15 2014 UTC
+++ /branches/3.26/src/hydrogen.cc Tue Jun 17 04:40:51 2014 UTC
@@ -5391,16 +5391,13 @@
value, STORE_TO_INITIALIZED_ENTRY);
}
} else {
+ if (field_access.representation().IsHeapObject()) {
+ BuildCheckHeapObject(value);
+ }
+
if (!info->field_maps()->is_empty()) {
ASSERT(field_access.representation().IsHeapObject());
- BuildCheckHeapObject(value);
value = Add<HCheckMaps>(value, info->field_maps());
-
- // TODO(bmeurer): This is a dirty hack to avoid repeating the smi
check
- // that was already performed by the HCheckHeapObject above in the
- // HStoreNamedField below. We should really do this right instead and
- // make Crankshaft aware of Representation::HeapObject().
- field_access =
field_access.WithRepresentation(Representation::Tagged());
}
// This is a normal store.
=======================================
--- /branches/3.26/src/ia32/lithium-codegen-ia32.cc Mon Jun 16 20:45:15
2014 UTC
+++ /branches/3.26/src/ia32/lithium-codegen-ia32.cc Tue Jun 17 04:40:51
2014 UTC
@@ -4359,30 +4359,12 @@
}
Register object = ToRegister(instr->object());
- SmiCheck check_needed =
- instr->hydrogen()->value()->IsHeapObject()
- ? OMIT_SMI_CHECK : INLINE_SMI_CHECK;
+ __ AssertNotSmi(object);
- ASSERT(!(representation.IsSmi() &&
- instr->value()->IsConstantOperand() &&
- !IsSmi(LConstantOperand::cast(instr->value()))));
- if (representation.IsHeapObject()) {
- if (instr->value()->IsConstantOperand()) {
- LConstantOperand* operand_value =
LConstantOperand::cast(instr->value());
- if (chunk_->LookupConstant(operand_value)->HasSmiValue()) {
- DeoptimizeIf(no_condition, instr->environment());
- }
- } else {
- if (!instr->hydrogen()->value()->type().IsHeapObject()) {
- Register value = ToRegister(instr->value());
- __ test(value, Immediate(kSmiTagMask));
- DeoptimizeIf(zero, instr->environment());
-
- // We know now that value is not a smi, so we can omit the check
below.
- check_needed = OMIT_SMI_CHECK;
- }
- }
- } else if (representation.IsDouble()) {
+ ASSERT(!representation.IsSmi() ||
+ !instr->value()->IsConstantOperand() ||
+ IsSmi(LConstantOperand::cast(instr->value())));
+ if (representation.IsDouble()) {
ASSERT(access.IsInobject());
ASSERT(!instr->hydrogen()->has_transition());
ASSERT(!instr->hydrogen()->NeedsWriteBarrier());
@@ -4455,7 +4437,7 @@
temp,
GetSaveFPRegsMode(isolate()),
EMIT_REMEMBERED_SET,
- check_needed);
+ instr->hydrogen()->SmiCheckForWriteBarrier());
}
}
=======================================
--- /branches/3.26/src/ia32/lithium-ia32.cc Mon Jun 16 20:45:15 2014 UTC
+++ /branches/3.26/src/ia32/lithium-ia32.cc Tue Jun 17 04:40:51 2014 UTC
@@ -2419,16 +2419,7 @@
// We need a temporary register for write barrier of the map field.
LOperand* temp_map = needs_write_barrier_for_map ? TempRegister() : NULL;
- LInstruction* result =
- new(zone()) LStoreNamedField(obj, val, temp, temp_map);
- if (!instr->access().IsExternalMemory() &&
- instr->field_representation().IsHeapObject() &&
- (val->IsConstantOperand()
- ? HConstant::cast(instr->value())->HasSmiValue()
- : !instr->value()->type().IsHeapObject())) {
- result = AssignEnvironment(result);
- }
- return result;
+ return new(zone()) LStoreNamedField(obj, val, temp, temp_map);
}
=======================================
--- /branches/3.26/src/ia32/macro-assembler-ia32.cc Mon Jun 16 20:45:15
2014 UTC
+++ /branches/3.26/src/ia32/macro-assembler-ia32.cc Tue Jun 17 04:40:51
2014 UTC
@@ -55,6 +55,11 @@
} else if (r.IsInteger16() || r.IsUInteger16()) {
mov_w(dst, src);
} else {
+ if (r.IsHeapObject()) {
+ AssertNotSmi(src);
+ } else if (r.IsSmi()) {
+ AssertSmi(src);
+ }
mov(dst, src);
}
}
=======================================
--- /branches/3.26/src/mips/lithium-codegen-mips.cc Mon Jun 16 20:45:15
2014 UTC
+++ /branches/3.26/src/mips/lithium-codegen-mips.cc Tue Jun 17 04:40:51
2014 UTC
@@ -4066,23 +4066,12 @@
return;
}
- SmiCheck check_needed =
- instr->hydrogen()->value()->IsHeapObject()
- ? OMIT_SMI_CHECK : INLINE_SMI_CHECK;
+ __ AssertNotSmi(object);
- ASSERT(!(representation.IsSmi() &&
- instr->value()->IsConstantOperand() &&
- !IsSmi(LConstantOperand::cast(instr->value()))));
- if (representation.IsHeapObject()) {
- Register value = ToRegister(instr->value());
- if (!instr->hydrogen()->value()->type().IsHeapObject()) {
- __ SmiTst(value, scratch);
- DeoptimizeIf(eq, instr->environment(), scratch, Operand(zero_reg));
-
- // We know now that value is not a smi, so we can omit the check
below.
- check_needed = OMIT_SMI_CHECK;
- }
- } else if (representation.IsDouble()) {
+ ASSERT(!representation.IsSmi() ||
+ !instr->value()->IsConstantOperand() ||
+ IsSmi(LConstantOperand::cast(instr->value())));
+ if (representation.IsDouble()) {
ASSERT(access.IsInobject());
ASSERT(!instr->hydrogen()->has_transition());
ASSERT(!instr->hydrogen()->NeedsWriteBarrier());
@@ -4124,7 +4113,7 @@
GetRAState(),
kSaveFPRegs,
EMIT_REMEMBERED_SET,
- check_needed);
+ instr->hydrogen()->SmiCheckForWriteBarrier());
}
} else {
__ lw(scratch, FieldMemOperand(object, JSObject::kPropertiesOffset));
@@ -4140,7 +4129,7 @@
GetRAState(),
kSaveFPRegs,
EMIT_REMEMBERED_SET,
- check_needed);
+ instr->hydrogen()->SmiCheckForWriteBarrier());
}
}
}
=======================================
--- /branches/3.26/src/mips/lithium-mips.cc Mon Jun 16 20:45:15 2014 UTC
+++ /branches/3.26/src/mips/lithium-mips.cc Tue Jun 17 04:40:51 2014 UTC
@@ -2248,13 +2248,7 @@
// We need a temporary register for write barrier of the map field.
LOperand* temp = needs_write_barrier_for_map ? TempRegister() : NULL;
- LInstruction* result = new(zone()) LStoreNamedField(obj, val, temp);
- if (!instr->access().IsExternalMemory() &&
- instr->field_representation().IsHeapObject() &&
- !instr->value()->type().IsHeapObject()) {
- result = AssignEnvironment(result);
- }
- return result;
+ return new(zone()) LStoreNamedField(obj, val, temp);
}
=======================================
--- /branches/3.26/src/mips/macro-assembler-mips.cc Mon Jun 16 20:45:15
2014 UTC
+++ /branches/3.26/src/mips/macro-assembler-mips.cc Tue Jun 17 04:40:51
2014 UTC
@@ -56,6 +56,11 @@
} else if (r.IsInteger16() || r.IsUInteger16()) {
sh(src, dst);
} else {
+ if (r.IsHeapObject()) {
+ AssertNotSmi(src);
+ } else if (r.IsSmi()) {
+ AssertSmi(src);
+ }
sw(src, dst);
}
}
=======================================
--- /branches/3.26/src/version.cc Mon Jun 16 20:45:15 2014 UTC
+++ /branches/3.26/src/version.cc Tue Jun 17 04:40:51 2014 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 26
#define BUILD_NUMBER 31
-#define PATCH_LEVEL 5
+#define PATCH_LEVEL 6
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
=======================================
--- /branches/3.26/src/x64/lithium-codegen-x64.cc Mon Jun 16 20:45:15 2014
UTC
+++ /branches/3.26/src/x64/lithium-codegen-x64.cc Tue Jun 17 04:40:51 2014
UTC
@@ -3990,29 +3990,12 @@
}
Register object = ToRegister(instr->object());
- SmiCheck check_needed = hinstr->value()->IsHeapObject()
- ? OMIT_SMI_CHECK : INLINE_SMI_CHECK;
+ __ AssertNotSmi(object);
- ASSERT(!(representation.IsSmi() &&
- instr->value()->IsConstantOperand() &&
- !IsInteger32Constant(LConstantOperand::cast(instr->value()))));
- if (representation.IsHeapObject()) {
- if (instr->value()->IsConstantOperand()) {
- LConstantOperand* operand_value =
LConstantOperand::cast(instr->value());
- if (chunk_->LookupConstant(operand_value)->HasSmiValue()) {
- DeoptimizeIf(no_condition, instr->environment());
- }
- } else {
- if (!hinstr->value()->type().IsHeapObject()) {
- Register value = ToRegister(instr->value());
- Condition cc = masm()->CheckSmi(value);
- DeoptimizeIf(cc, instr->environment());
-
- // We know now that value is not a smi, so we can omit the check
below.
- check_needed = OMIT_SMI_CHECK;
- }
- }
- } else if (representation.IsDouble()) {
+ ASSERT(!representation.IsSmi() ||
+ !instr->value()->IsConstantOperand() ||
+ IsInteger32Constant(LConstantOperand::cast(instr->value())));
+ if (representation.IsDouble()) {
ASSERT(access.IsInobject());
ASSERT(!hinstr->has_transition());
ASSERT(!hinstr->NeedsWriteBarrier());
@@ -4097,7 +4080,7 @@
temp,
kSaveFPRegs,
EMIT_REMEMBERED_SET,
- check_needed);
+ hinstr->SmiCheckForWriteBarrier());
}
}
=======================================
--- /branches/3.26/src/x64/lithium-x64.cc Mon Jun 16 20:45:15 2014 UTC
+++ /branches/3.26/src/x64/lithium-x64.cc Tue Jun 17 04:40:51 2014 UTC
@@ -2311,15 +2311,7 @@
LOperand* temp = (!is_in_object || needs_write_barrier ||
needs_write_barrier_for_map) ? TempRegister() : NULL;
- LInstruction* result = new(zone()) LStoreNamedField(obj, val, temp);
- if (!instr->access().IsExternalMemory() &&
- instr->field_representation().IsHeapObject() &&
- (val->IsConstantOperand()
- ? HConstant::cast(instr->value())->HasSmiValue()
- : !instr->value()->type().IsHeapObject())) {
- result = AssignEnvironment(result);
- }
- return result;
+ return new(zone()) LStoreNamedField(obj, val, temp);
}
=======================================
--- /branches/3.26/src/x64/macro-assembler-x64.cc Mon Jun 16 20:45:15 2014
UTC
+++ /branches/3.26/src/x64/macro-assembler-x64.cc Tue Jun 17 04:40:51 2014
UTC
@@ -935,6 +935,11 @@
} else if (r.IsInteger32()) {
movl(dst, src);
} else {
+ if (r.IsHeapObject()) {
+ AssertNotSmi(src);
+ } else if (r.IsSmi()) {
+ AssertSmi(src);
+ }
movp(dst, src);
}
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
