Revision: 6210
Author: [email protected]
Date: Thu Jan 6 07:53:56 2011
Log: Use a separate marker value to allocate the arguments object on
deoptimzation.
Before we used the hole value for this purpose, but this does not work once
we
start using the hole value for other purposes in the optimizing compiler.
Review URL: http://codereview.chromium.org/6116001
http://code.google.com/p/v8/source/detail?r=6210
Modified:
/branches/bleeding_edge/src/accessors.cc
/branches/bleeding_edge/src/arm/codegen-arm.cc
/branches/bleeding_edge/src/assembler.cc
/branches/bleeding_edge/src/assembler.h
/branches/bleeding_edge/src/deoptimizer.cc
/branches/bleeding_edge/src/heap.cc
/branches/bleeding_edge/src/heap.h
/branches/bleeding_edge/src/ia32/codegen-ia32.cc
/branches/bleeding_edge/src/objects-debug.cc
/branches/bleeding_edge/src/objects-inl.h
/branches/bleeding_edge/src/objects.h
/branches/bleeding_edge/src/runtime.cc
/branches/bleeding_edge/src/serialize.cc
/branches/bleeding_edge/src/x64/codegen-x64.cc
=======================================
--- /branches/bleeding_edge/src/accessors.cc Thu Jan 6 06:00:50 2011
+++ /branches/bleeding_edge/src/accessors.cc Thu Jan 6 07:53:56 2011
@@ -775,7 +775,7 @@
if (index >= 0) {
Handle<Object> arguments =
Handle<Object>(frame->GetExpression(index));
- if (!arguments->IsTheHole()) return *arguments;
+ if (!arguments->IsArgumentsMarker()) return *arguments;
}
// If there isn't an arguments variable in the stack, we need to
=======================================
--- /branches/bleeding_edge/src/arm/codegen-arm.cc Mon Jan 3 06:59:12 2011
+++ /branches/bleeding_edge/src/arm/codegen-arm.cc Thu Jan 6 07:53:56 2011
@@ -596,7 +596,7 @@
// When using lazy arguments allocation, we store the hole value
// as a sentinel indicating that the arguments object hasn't been
// allocated yet.
- frame_->EmitPushRoot(Heap::kTheHoleValueRootIndex);
+ frame_->EmitPushRoot(Heap::kArgumentsMarkerRootIndex);
} else {
frame_->SpillAll();
ArgumentsAccessStub stub(ArgumentsAccessStub::NEW_OBJECT);
@@ -623,7 +623,7 @@
// has a local variable named 'arguments'.
LoadFromSlot(scope()->arguments()->AsSlot(), NOT_INSIDE_TYPEOF);
Register arguments = frame_->PopToRegister();
- __ LoadRoot(ip, Heap::kTheHoleValueRootIndex);
+ __ LoadRoot(ip, Heap::kArgumentsMarkerRootIndex);
__ cmp(arguments, ip);
done.Branch(ne);
}
@@ -1748,7 +1748,7 @@
// named 'arguments' has been introduced.
JumpTarget slow;
Label done;
- __ LoadRoot(ip, Heap::kTheHoleValueRootIndex);
+ __ LoadRoot(ip, Heap::kArgumentsMarkerRootIndex);
__ cmp(ip, arguments_reg);
slow.Branch(ne);
@@ -3255,7 +3255,7 @@
// If the loaded value is the sentinel that indicates that we
// haven't loaded the arguments object yet, we need to do it now.
JumpTarget exit;
- __ LoadRoot(ip, Heap::kTheHoleValueRootIndex);
+ __ LoadRoot(ip, Heap::kArgumentsMarkerRootIndex);
__ cmp(tos, ip);
exit.Branch(ne);
frame_->Drop();
=======================================
--- /branches/bleeding_edge/src/assembler.cc Mon Dec 20 02:38:19 2010
+++ /branches/bleeding_edge/src/assembler.cc Thu Jan 6 07:53:56 2011
@@ -645,6 +645,11 @@
ExternalReference ExternalReference::the_hole_value_location() {
return ExternalReference(Factory::the_hole_value().location());
}
+
+
+ExternalReference ExternalReference::arguments_marker_location() {
+ return ExternalReference(Factory::arguments_marker().location());
+}
ExternalReference ExternalReference::roots_address() {
=======================================
--- /branches/bleeding_edge/src/assembler.h Mon Dec 20 02:38:19 2010
+++ /branches/bleeding_edge/src/assembler.h Thu Jan 6 07:53:56 2011
@@ -512,6 +512,9 @@
// Static variable Factory::the_hole_value.location()
static ExternalReference the_hole_value_location();
+ // Static variable Factory::arguments_marker.location()
+ static ExternalReference arguments_marker_location();
+
// Static variable Heap::roots_address()
static ExternalReference roots_address();
=======================================
--- /branches/bleeding_edge/src/deoptimizer.cc Wed Dec 22 01:49:26 2010
+++ /branches/bleeding_edge/src/deoptimizer.cc Thu Jan 6 07:53:56 2011
@@ -618,17 +618,17 @@
}
case Translation::ARGUMENTS_OBJECT: {
- // Use the hole value as a sentinel and fill in the arguments object
- // after the deoptimized frame is built.
+ // Use the arguments marker value as a sentinel and fill in the
arguments
+ // object after the deoptimized frame is built.
ASSERT(frame_index == 0); // Only supported for first frame.
if (FLAG_trace_deopt) {
PrintF(" 0x%08" V8PRIxPTR ": [top + %d] <- ",
output_[frame_index]->GetTop() + output_offset,
output_offset);
- Heap::the_hole_value()->ShortPrint();
+ Heap::arguments_marker()->ShortPrint();
PrintF(" ; arguments object\n");
}
- intptr_t value = reinterpret_cast<intptr_t>(Heap::the_hole_value());
+ intptr_t value =
reinterpret_cast<intptr_t>(Heap::arguments_marker());
output_[frame_index]->SetFrameSlot(output_offset, value);
return;
}
=======================================
--- /branches/bleeding_edge/src/heap.cc Wed Dec 22 12:14:19 2010
+++ /branches/bleeding_edge/src/heap.cc Thu Jan 6 07:53:56 2011
@@ -2011,6 +2011,12 @@
}
set_the_hole_value(obj);
+ { MaybeObject* maybe_obj = CreateOddball("arguments_marker",
+ Smi::FromInt(-4));
+ if (!maybe_obj->ToObject(&obj)) return false;
+ }
+ set_arguments_marker(obj);
+
{ MaybeObject* maybe_obj =
CreateOddball("no_interceptor_result_sentinel", Smi::FromInt(-2));
if (!maybe_obj->ToObject(&obj)) return false;
=======================================
--- /branches/bleeding_edge/src/heap.h Wed Dec 22 12:14:19 2010
+++ /branches/bleeding_edge/src/heap.h Thu Jan 6 07:53:56 2011
@@ -53,6 +53,7 @@
V(Object, null_value,
NullValue) \
V(Object, true_value,
TrueValue) \
V(Object, false_value,
FalseValue) \
+ V(Object, arguments_marker,
ArgumentsMarker) \
V(Map, heap_number_map,
HeapNumberMap) \
V(Map, global_context_map,
GlobalContextMap) \
V(Map, fixed_array_map,
FixedArrayMap) \
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.cc Mon Dec 20 05:52:14
2010
+++ /branches/bleeding_edge/src/ia32/codegen-ia32.cc Thu Jan 6 07:53:56
2011
@@ -745,10 +745,10 @@
Comment cmnt(masm_, "[ store arguments object");
if (mode == LAZY_ARGUMENTS_ALLOCATION && initial) {
- // When using lazy arguments allocation, we store the hole value
+ // When using lazy arguments allocation, we store the arguments marker
value
// as a sentinel indicating that the arguments object hasn't been
// allocated yet.
- frame_->Push(Factory::the_hole_value());
+ frame_->Push(Factory::arguments_marker());
} else {
ArgumentsAccessStub stub(ArgumentsAccessStub::NEW_OBJECT);
frame_->PushFunction();
@@ -773,9 +773,9 @@
if (probe.is_constant()) {
// We have to skip updating the arguments object if it has
// been assigned a proper value.
- skip_arguments = !probe.handle()->IsTheHole();
+ skip_arguments = !probe.handle()->IsArgumentsMarker();
} else {
- __ cmp(Operand(probe.reg()), Immediate(Factory::the_hole_value()));
+ __ cmp(Operand(probe.reg()), Immediate(Factory::arguments_marker()));
probe.Unuse();
done.Branch(not_equal);
}
@@ -3294,9 +3294,9 @@
Label slow, done;
bool try_lazy = true;
if (probe.is_constant()) {
- try_lazy = probe.handle()->IsTheHole();
+ try_lazy = probe.handle()->IsArgumentsMarker();
} else {
- __ cmp(Operand(probe.reg()), Immediate(Factory::the_hole_value()));
+ __ cmp(Operand(probe.reg()), Immediate(Factory::arguments_marker()));
probe.Unuse();
__ j(not_equal, &slow);
}
@@ -5068,7 +5068,7 @@
// object has been lazily loaded yet.
Result result = frame()->Pop();
if (result.is_constant()) {
- if (result.handle()->IsTheHole()) {
+ if (result.handle()->IsArgumentsMarker()) {
result = StoreArgumentsObject(false);
}
frame()->Push(&result);
@@ -5079,7 +5079,7 @@
// indicates that we haven't loaded the arguments object yet, we
// need to do it now.
JumpTarget exit;
- __ cmp(Operand(result.reg()), Immediate(Factory::the_hole_value()));
+ __ cmp(Operand(result.reg()), Immediate(Factory::arguments_marker()));
frame()->Push(&result);
exit.Branch(not_equal);
=======================================
--- /branches/bleeding_edge/src/objects-debug.cc Wed Dec 22 05:04:47 2010
+++ /branches/bleeding_edge/src/objects-debug.cc Thu Jan 6 07:53:56 2011
@@ -368,8 +368,10 @@
} else {
ASSERT(number->IsSmi());
int value = Smi::cast(number)->value();
- ASSERT(value == 0 || value == 1 || value == -1 ||
- value == -2 || value == -3);
+ // Hidden oddballs have negative smis.
+ const int kLeastHiddenOddballNumber = -4;
+ ASSERT(value <= 1);
+ ASSERT(value >= kLeastHiddenOddballNumber);
}
}
=======================================
--- /branches/bleeding_edge/src/objects-inl.h Tue Dec 14 10:53:48 2010
+++ /branches/bleeding_edge/src/objects-inl.h Thu Jan 6 07:53:56 2011
@@ -421,6 +421,11 @@
bool MaybeObject::IsTheHole() {
return this == Heap::the_hole_value();
}
+
+
+bool MaybeObject::IsArgumentsMarker() {
+ return this == Heap::arguments_marker();
+}
Failure* Failure::cast(MaybeObject* obj) {
=======================================
--- /branches/bleeding_edge/src/objects.h Thu Jan 6 06:00:50 2011
+++ /branches/bleeding_edge/src/objects.h Thu Jan 6 07:53:56 2011
@@ -593,6 +593,7 @@
inline bool IsOutOfMemory();
inline bool IsException();
INLINE(bool IsTheHole());
+ INLINE(bool IsArgumentsMarker());
inline bool ToObject(Object** obj) {
if (IsFailure()) return false;
*obj = reinterpret_cast<Object*>(this);
=======================================
--- /branches/bleeding_edge/src/runtime.cc Thu Jan 6 06:00:50 2011
+++ /branches/bleeding_edge/src/runtime.cc Thu Jan 6 07:53:56 2011
@@ -6748,7 +6748,7 @@
Handle<JSFunction> function(JSFunction::cast(frame->function()));
Handle<Object> arguments;
for (int i = frame->ComputeExpressionsCount() - 1; i >= 0; --i) {
- if (frame->GetExpression(i) == Heap::the_hole_value()) {
+ if (frame->GetExpression(i) == Heap::arguments_marker()) {
if (arguments.is_null()) {
// FunctionGetArguments can't throw an exception, so cast away the
// doubt with an assert.
=======================================
--- /branches/bleeding_edge/src/serialize.cc Wed Dec 8 06:32:40 2010
+++ /branches/bleeding_edge/src/serialize.cc Thu Jan 6 07:53:56 2011
@@ -498,6 +498,10 @@
UNCLASSIFIED,
39,
"power_double_int_function");
+ Add(ExternalReference::arguments_marker_location().address(),
+ UNCLASSIFIED,
+ 40,
+ "Factory::arguments_marker().location()");
}
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.cc Mon Jan 3 06:59:12 2011
+++ /branches/bleeding_edge/src/x64/codegen-x64.cc Thu Jan 6 07:53:56 2011
@@ -627,10 +627,10 @@
Comment cmnt(masm_, "[ store arguments object");
if (mode == LAZY_ARGUMENTS_ALLOCATION && initial) {
- // When using lazy arguments allocation, we store the hole value
+ // When using lazy arguments allocation, we store the arguments marker
value
// as a sentinel indicating that the arguments object hasn't been
// allocated yet.
- frame_->Push(Factory::the_hole_value());
+ frame_->Push(Factory::arguments_marker());
} else {
ArgumentsAccessStub stub(ArgumentsAccessStub::NEW_OBJECT);
frame_->PushFunction();
@@ -655,9 +655,9 @@
if (probe.is_constant()) {
// We have to skip updating the arguments object if it has
// been assigned a proper value.
- skip_arguments = !probe.handle()->IsTheHole();
+ skip_arguments = !probe.handle()->IsArgumentsMarker();
} else {
- __ CompareRoot(probe.reg(), Heap::kTheHoleValueRootIndex);
+ __ CompareRoot(probe.reg(), Heap::kArgumentsMarkerRootIndex);
probe.Unuse();
done.Branch(not_equal);
}
@@ -2516,9 +2516,9 @@
Label slow, done;
bool try_lazy = true;
if (probe.is_constant()) {
- try_lazy = probe.handle()->IsTheHole();
+ try_lazy = probe.handle()->IsArgumentsMarker();
} else {
- __ CompareRoot(probe.reg(), Heap::kTheHoleValueRootIndex);
+ __ CompareRoot(probe.reg(), Heap::kArgumentsMarkerRootIndex);
probe.Unuse();
__ j(not_equal, &slow);
}
@@ -4417,7 +4417,7 @@
// If the loaded value is a constant, we know if the arguments
// object has been lazily loaded yet.
if (value.is_constant()) {
- if (value.handle()->IsTheHole()) {
+ if (value.handle()->IsArgumentsMarker()) {
Result arguments = StoreArgumentsObject(false);
frame_->Push(&arguments);
} else {
@@ -4430,7 +4430,7 @@
// indicates that we haven't loaded the arguments object yet, we
// need to do it now.
JumpTarget exit;
- __ CompareRoot(value.reg(), Heap::kTheHoleValueRootIndex);
+ __ CompareRoot(value.reg(), Heap::kArgumentsMarkerRootIndex);
frame_->Push(&value);
exit.Branch(not_equal);
Result arguments = StoreArgumentsObject(false);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
