Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/deoptimizer.cc

Issue 1136223004: Unify reading of deoptimization information. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/deoptimizer.h ('K') | « src/deoptimizer.h ('k') | src/ia32/lithium-codegen-ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/deoptimizer.cc
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index 35f340e8a31df3a4b42879ba5d63de9a2a83d40e..daddaf6de2c9db34a2293f8ef9f8aa7775fd8be0 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -194,26 +194,12 @@ DeoptimizedFrameInfo* Deoptimizer::DebuggerInspectableFrame(
has_construct_stub);
isolate->deoptimizer_data()->deoptimized_frame_info_ = info;
- // Get the "simulated" top and size for the requested frame.
- FrameDescription* parameters_frame =
- deoptimizer->output_[
- has_arguments_adaptor ? (frame_index - 1) : frame_index];
-
- uint32_t parameters_size = (info->parameters_count() + 1) * kPointerSize;
- Address parameters_top = reinterpret_cast<Address>(
- parameters_frame->GetTop() + (parameters_frame->GetFrameSize() -
- parameters_size));
-
- uint32_t expressions_size = info->expression_count() * kPointerSize;
- Address expressions_top = reinterpret_cast<Address>(
- deoptimizer->output_[frame_index]->GetTop());
-
// Done with the GC-unsafe frame descriptions. This re-enables allocation.
deoptimizer->DeleteFrameDescriptions();
// Allocate a heap number for the doubles belonging to this frame.
deoptimizer->MaterializeHeapNumbersForDebuggerInspectableFrame(
- parameters_top, parameters_size, expressions_top, expressions_size, info);
+ frame_index, info->parameters_count(), info->expression_count(), info);
// Finished using the deoptimizer instance.
delete deoptimizer;
@@ -546,13 +532,9 @@ const char* Deoptimizer::MessageFor(BailoutType type) {
}
-Deoptimizer::Deoptimizer(Isolate* isolate,
- JSFunction* function,
- BailoutType type,
- unsigned bailout_id,
- Address from,
- int fp_to_sp_delta,
- Code* optimized_code)
+Deoptimizer::Deoptimizer(Isolate* isolate, JSFunction* function,
+ BailoutType type, unsigned bailout_id, Address from,
+ int fp_to_sp_delta, Code* optimized_code)
: isolate_(isolate),
function_(function),
bailout_id_(bailout_id),
@@ -560,28 +542,20 @@ Deoptimizer::Deoptimizer(Isolate* isolate,
from_(from),
fp_to_sp_delta_(fp_to_sp_delta),
has_alignment_padding_(0),
- input_(NULL),
+ input_(nullptr),
output_count_(0),
jsframe_count_(0),
- output_(NULL),
- deferred_objects_tagged_values_(0),
- deferred_objects_double_values_(0),
- deferred_objects_(0),
- deferred_heap_numbers_(0),
+ output_(nullptr),
jsframe_functions_(0),
jsframe_has_adapted_arguments_(0),
- materialized_values_(NULL),
- materialized_objects_(NULL),
- materialization_value_index_(0),
- materialization_object_index_(0),
- trace_scope_(NULL) {
+ trace_scope_(nullptr) {
// For COMPILED_STUBs called from builtins, the function pointer is a SMI
// indicating an internal frame.
if (function->IsSmi()) {
- function = NULL;
+ function = nullptr;
}
- DCHECK(from != NULL);
- if (function != NULL && function->IsOptimized()) {
+ DCHECK(from != nullptr);
+ if (function != nullptr && function->IsOptimized()) {
function->shared()->increment_deopt_count();
if (bailout_type_ == Deoptimizer::SOFT) {
isolate->counters()->soft_deopts_executed()->Increment();
@@ -780,22 +754,20 @@ void Deoptimizer::DoComputeOutputFrames() {
unsigned translation_index =
input_data->TranslationIndex(bailout_id_)->value();
+ TranslationIterator state_iterator(translations, translation_index);
+ translated_state_.Init(
+ input_->GetFramePointerAddress(), function_, &state_iterator,
+ input_data->LiteralArray(), input_->GetRegisterValues(),
+ trace_scope_ == nullptr ? nullptr : trace_scope_->file());
+
// Do the input frame to output frame(s) translation.
- TranslationIterator iterator(translations, translation_index);
- Translation::Opcode opcode =
- static_cast<Translation::Opcode>(iterator.Next());
- DCHECK(Translation::BEGIN == opcode);
- USE(opcode);
- // Read the number of output frames and allocate an array for their
- // descriptions.
- int count = iterator.Next();
- iterator.Next(); // Drop JS frames count.
+ size_t count = translated_state_.frames().size();
DCHECK(output_ == NULL);
output_ = new FrameDescription*[count];
- for (int i = 0; i < count; ++i) {
+ for (size_t i = 0; i < count; ++i) {
output_[i] = NULL;
}
- output_count_ = count;
+ output_count_ = static_cast<int>(count);
Register fp_reg = JavaScriptFrame::fp_register();
stack_fp_ = reinterpret_cast<Address>(
@@ -803,46 +775,31 @@ void Deoptimizer::DoComputeOutputFrames() {
has_alignment_padding_ * kPointerSize);
// Translate each output frame.
- for (int i = 0; i < count; ++i) {
+ for (size_t i = 0; i < count; ++i) {
// Read the ast node id, function, and frame height for this output frame.
- Translation::Opcode opcode =
- static_cast<Translation::Opcode>(iterator.Next());
- switch (opcode) {
- case Translation::JS_FRAME:
- DoComputeJSFrame(&iterator, i);
+ int frame_index = static_cast<int>(i);
Benedikt Meurer 2015/06/03 04:02:17 Remove this static_cast and change the functions b
Jarin 2015/06/03 09:28:07 Yeah, I tried that, but in those functions we comp
+ switch (translated_state_.frames()[i].kind()) {
+ case TranslatedFrame::Function:
+ DoComputeJSFrame(nullptr, frame_index);
jsframe_count_++;
break;
- case Translation::ARGUMENTS_ADAPTOR_FRAME:
- DoComputeArgumentsAdaptorFrame(&iterator, i);
+ case TranslatedFrame::ArgumentsAdaptor:
+ DoComputeArgumentsAdaptorFrame(nullptr, frame_index);
break;
- case Translation::CONSTRUCT_STUB_FRAME:
- DoComputeConstructStubFrame(&iterator, i);
+ case TranslatedFrame::ConstructStub:
+ DoComputeConstructStubFrame(nullptr, frame_index);
break;
- case Translation::GETTER_STUB_FRAME:
- DoComputeAccessorStubFrame(&iterator, i, false);
+ case TranslatedFrame::Getter:
+ DoComputeAccessorStubFrame(nullptr, frame_index, false);
break;
- case Translation::SETTER_STUB_FRAME:
- DoComputeAccessorStubFrame(&iterator, i, true);
+ case TranslatedFrame::Setter:
+ DoComputeAccessorStubFrame(nullptr, frame_index, true);
break;
- case Translation::COMPILED_STUB_FRAME:
- DoComputeCompiledStubFrame(&iterator, i);
+ case TranslatedFrame::CompiledStub:
+ DoComputeCompiledStubFrame(nullptr, frame_index);
break;
- case Translation::BEGIN:
- case Translation::REGISTER:
- case Translation::INT32_REGISTER:
- case Translation::UINT32_REGISTER:
- case Translation::BOOL_REGISTER:
- case Translation::DOUBLE_REGISTER:
- case Translation::STACK_SLOT:
- case Translation::INT32_STACK_SLOT:
- case Translation::UINT32_STACK_SLOT:
- case Translation::BOOL_STACK_SLOT:
- case Translation::DOUBLE_STACK_SLOT:
- case Translation::LITERAL:
- case Translation::ARGUMENTS_OBJECT:
- case Translation::DUPLICATED_OBJECT:
- case Translation::CAPTURED_OBJECT:
- FATAL("Unsupported translation");
+ case TranslatedFrame::Invalid:
+ FATAL("invalid frame");
break;
}
}
@@ -871,25 +828,26 @@ void Deoptimizer::DoComputeOutputFrames() {
void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
int frame_index) {
- BailoutId node_id = BailoutId(iterator->Next());
- JSFunction* function;
- if (frame_index != 0) {
- function = JSFunction::cast(ComputeLiteral(iterator->Next()));
- } else {
- int closure_id = iterator->Next();
- USE(closure_id);
- CHECK_EQ(Translation::kSelfLiteralId, closure_id);
- function = function_;
- }
- unsigned height = iterator->Next() - 1; // Do not count the context.
+ TranslatedFrame* translated_frame =
+ &(translated_state_.frames()[frame_index]);
+ TranslatedFrame::ValueIterator value_iterator = translated_frame->begin();
+ int input_index = 0;
+
+ BailoutId node_id = translated_frame->node_id();
+ JSFunction* function = translated_frame->raw_function();
+ unsigned height =
+ translated_frame->height() - 1; // Do not count the context.
unsigned height_in_bytes = height * kPointerSize;
if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(), " translating ");
+ PrintF(trace_scope_->file(), " translating frame ");
function->PrintName(trace_scope_->file());
PrintF(trace_scope_->file(),
" => node=%d, height=%d\n", node_id.ToInt(), height_in_bytes);
}
+ CHECK(translated_frame->kind() == TranslatedFrame::Function);
+ CHECK(function == translated_frame->raw_function());
+
// The 'fixed' part of the frame consists of the incoming parameters and
// the part described by JavaScriptFrameConstants.
unsigned fixed_frame_size = ComputeFixedSize(function);
@@ -938,7 +896,8 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
unsigned input_offset = input_frame_size;
for (int i = 0; i < parameter_count; ++i) {
output_offset -= kPointerSize;
- DoTranslateCommand(iterator, frame_index, output_offset);
+ WriteValueToOutput(&value_iterator, &input_index, frame_index,
+ output_offset);
}
input_offset -= (parameter_count * kPointerSize);
@@ -1018,7 +977,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
output_offset -= kPointerSize;
input_offset -= kPointerSize;
// Read the context from the translations.
- DoTranslateCommand(iterator, frame_index, output_offset);
+ WriteValueToOutput(&value_iterator, &input_index, frame_index, output_offset);
value = output_frame->GetFrameSlot(output_offset);
// The context should not be a placeholder for a materialized object.
CHECK(value !=
@@ -1062,7 +1021,8 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
// Translate the rest of the frame.
for (unsigned i = 0; i < height; ++i) {
output_offset -= kPointerSize;
- DoTranslateCommand(iterator, frame_index, output_offset);
+ WriteValueToOutput(&value_iterator, &input_index, frame_index,
+ output_offset);
}
CHECK_EQ(0u, output_offset);
@@ -1111,8 +1071,13 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator,
int frame_index) {
- JSFunction* function = JSFunction::cast(ComputeLiteral(iterator->Next()));
- unsigned height = iterator->Next();
+ TranslatedFrame* translated_frame =
+ &(translated_state_.frames()[frame_index]);
+ TranslatedFrame::ValueIterator value_iterator = translated_frame->begin();
+ int input_index = 0;
+
+ JSFunction* function = translated_frame->raw_function();
+ unsigned height = translated_frame->height();
unsigned height_in_bytes = height * kPointerSize;
if (trace_scope_ != NULL) {
PrintF(trace_scope_->file(),
@@ -1143,7 +1108,8 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator,
unsigned output_offset = output_frame_size;
for (int i = 0; i < parameter_count; ++i) {
output_offset -= kPointerSize;
- DoTranslateCommand(iterator, frame_index, output_offset);
+ WriteValueToOutput(&value_iterator, &input_index, frame_index,
+ output_offset);
}
// Read caller's PC from the previous frame.
@@ -1235,10 +1201,15 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator,
void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
int frame_index) {
+ TranslatedFrame* translated_frame =
+ &(translated_state_.frames()[frame_index]);
+ TranslatedFrame::ValueIterator value_iterator = translated_frame->begin();
+ int input_index = 0;
+
Builtins* builtins = isolate_->builtins();
Code* construct_stub = builtins->builtin(Builtins::kJSConstructStubGeneric);
- JSFunction* function = JSFunction::cast(ComputeLiteral(iterator->Next()));
- unsigned height = iterator->Next();
+ JSFunction* function = translated_frame->raw_function();
+ unsigned height = translated_frame->height();
unsigned height_in_bytes = height * kPointerSize;
if (trace_scope_ != NULL) {
PrintF(trace_scope_->file(),
@@ -1269,15 +1240,12 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
unsigned output_offset = output_frame_size;
for (int i = 0; i < parameter_count; ++i) {
output_offset -= kPointerSize;
- int deferred_object_index = deferred_objects_.length();
- DoTranslateCommand(iterator, frame_index, output_offset);
// The allocated receiver of a construct stub frame is passed as the
// receiver parameter through the translation. It might be encoding
- // a captured object, patch the slot address for a captured object.
- if (i == 0 && deferred_objects_.length() > deferred_object_index) {
- CHECK(!deferred_objects_[deferred_object_index].is_arguments());
- deferred_objects_[deferred_object_index].patch_slot_address(top_address);
- }
+ // a captured object, override the slot address for a captured object.
+ WriteValueToOutput(
+ &value_iterator, &input_index, frame_index, output_offset,
+ (i == 0) ? reinterpret_cast<Address>(top_address) : nullptr);
}
// Read caller's PC from the previous frame.
@@ -1403,7 +1371,12 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator,
int frame_index,
bool is_setter_stub_frame) {
- JSFunction* accessor = JSFunction::cast(ComputeLiteral(iterator->Next()));
+ TranslatedFrame* translated_frame =
+ &(translated_state_.frames()[frame_index]);
+ TranslatedFrame::ValueIterator value_iterator = translated_frame->begin();
+ int input_index = 0;
+
+ JSFunction* accessor = translated_frame->raw_function();
// The receiver (and the implicit return value, if any) are expected in
// registers by the LoadIC/StoreIC, so they don't belong to the output stack
// frame. This means that we have to use a height of 0.
@@ -1517,13 +1490,14 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator,
}
// Skip receiver.
- DoTranslateObjectAndSkip(iterator);
+ value_iterator++;
if (is_setter_stub_frame) {
// The implicit return value was part of the artificial setter stub
// environment.
output_offset -= kPointerSize;
- DoTranslateCommand(iterator, frame_index, output_offset);
+ WriteValueToOutput(&value_iterator, &input_index, frame_index,
+ output_offset);
}
CHECK_EQ(0u, output_offset);
@@ -1576,6 +1550,11 @@ void Deoptimizer::DoComputeCompiledStubFrame(TranslationIterator* iterator,
// reg = JSFunction context
//
+ TranslatedFrame* translated_frame =
+ &(translated_state_.frames()[frame_index]);
+ TranslatedFrame::ValueIterator value_iterator = translated_frame->begin();
+ int input_index = 0;
+
CHECK(compiled_code_->is_hydrogen_stub());
int major_key = CodeStub::GetMajorKey(compiled_code_);
CodeStubDescriptor descriptor(isolate_, compiled_code_->stub_key());
@@ -1585,6 +1564,7 @@ void Deoptimizer::DoComputeCompiledStubFrame(TranslationIterator* iterator,
// object to the callee and optionally the space to pass the argument
// object to the stub failure handler.
int param_count = descriptor.GetEnvironmentParameterCount();
+ CHECK_EQ(translated_frame->height(), param_count);
CHECK_GE(param_count, 0);
int height_in_bytes = kPointerSize * param_count + sizeof(Arguments) +
@@ -1732,7 +1712,7 @@ void Deoptimizer::DoComputeCompiledStubFrame(TranslationIterator* iterator,
int arguments_length_offset = -1;
for (int i = 0; i < param_count; ++i) {
output_frame_offset -= kPointerSize;
- DoTranslateCommand(iterator, 0, output_frame_offset);
+ WriteValueToOutput(&value_iterator, &input_index, 0, output_frame_offset);
if (!arg_count_known && descriptor.IsEnvironmentParameterCountRegister(i)) {
arguments_length_offset = output_frame_offset;
@@ -1799,124 +1779,6 @@ void Deoptimizer::DoComputeCompiledStubFrame(TranslationIterator* iterator,
}
-Handle<Object> Deoptimizer::MaterializeNextHeapObject() {
- int object_index = materialization_object_index_++;
- ObjectMaterializationDescriptor desc = deferred_objects_[object_index];
- const int length = desc.object_length();
-
- if (desc.duplicate_object() >= 0) {
- // Found a previously materialized object by de-duplication.
- object_index = desc.duplicate_object();
- materialized_objects_->Add(Handle<Object>());
- } else if (desc.is_arguments() && ArgumentsObjectIsAdapted(object_index)) {
- // Use the arguments adapter frame we just built to materialize the
- // arguments object. FunctionGetArguments can't throw an exception.
- Handle<JSFunction> function = ArgumentsObjectFunction(object_index);
- Handle<JSObject> arguments = Handle<JSObject>::cast(
- Accessors::FunctionGetArguments(function));
- materialized_objects_->Add(arguments);
- // To keep consistent object counters, we still materialize the
- // nested values (but we throw them away).
- for (int i = 0; i < length; ++i) {
- MaterializeNextValue();
- }
- } else if (desc.is_arguments()) {
- // Construct an arguments object and copy the parameters to a newly
- // allocated arguments object backing store.
- Handle<JSFunction> function = ArgumentsObjectFunction(object_index);
- Handle<JSObject> arguments =
- isolate_->factory()->NewArgumentsObject(function, length);
- Handle<FixedArray> array = isolate_->factory()->NewFixedArray(length);
- DCHECK_EQ(array->length(), length);
- arguments->set_elements(*array);
- materialized_objects_->Add(arguments);
- for (int i = 0; i < length; ++i) {
- Handle<Object> value = MaterializeNextValue();
- array->set(i, *value);
- }
- } else {
- // Dispatch on the instance type of the object to be materialized.
- // We also need to make sure that the representation of all fields
- // in the given object are general enough to hold a tagged value.
- Handle<Map> map = Map::GeneralizeAllFieldRepresentations(
- Handle<Map>::cast(MaterializeNextValue()));
- switch (map->instance_type()) {
- case MUTABLE_HEAP_NUMBER_TYPE:
- case HEAP_NUMBER_TYPE: {
- // Reuse the HeapNumber value directly as it is already properly
- // tagged and skip materializing the HeapNumber explicitly. Turn mutable
- // heap numbers immutable.
- Handle<Object> object = MaterializeNextValue();
- if (object_index < prev_materialized_count_) {
- materialized_objects_->Add(Handle<Object>(
- previously_materialized_objects_->get(object_index), isolate_));
- } else {
- materialized_objects_->Add(object);
- }
- materialization_value_index_ += kDoubleSize / kPointerSize - 1;
- break;
- }
- case JS_OBJECT_TYPE: {
- Handle<JSObject> object =
- isolate_->factory()->NewJSObjectFromMap(map, NOT_TENURED, false);
- if (object_index < prev_materialized_count_) {
- materialized_objects_->Add(Handle<Object>(
- previously_materialized_objects_->get(object_index), isolate_));
- } else {
- materialized_objects_->Add(object);
- }
- Handle<Object> properties = MaterializeNextValue();
- Handle<Object> elements = MaterializeNextValue();
- object->set_properties(FixedArray::cast(*properties));
- object->set_elements(FixedArrayBase::cast(*elements));
- for (int i = 0; i < length - 3; ++i) {
- Handle<Object> value = MaterializeNextValue();
- FieldIndex index = FieldIndex::ForPropertyIndex(object->map(), i);
- object->FastPropertyAtPut(index, *value);
- }
- break;
- }
- case JS_ARRAY_TYPE: {
- Handle<JSArray> object =
- isolate_->factory()->NewJSArray(0, map->elements_kind());
- if (object_index < prev_materialized_count_) {
- materialized_objects_->Add(Handle<Object>(
- previously_materialized_objects_->get(object_index), isolate_));
- } else {
- materialized_objects_->Add(object);
- }
- Handle<Object> properties = MaterializeNextValue();
- Handle<Object> elements = MaterializeNextValue();
- Handle<Object> length = MaterializeNextValue();
- object->set_properties(FixedArray::cast(*properties));
- object->set_elements(FixedArrayBase::cast(*elements));
- object->set_length(*length);
- break;
- }
- default:
- PrintF(stderr,
- "[couldn't handle instance type %d]\n", map->instance_type());
- FATAL("Unsupported instance type");
- }
- }
-
- return materialized_objects_->at(object_index);
-}
-
-
-Handle<Object> Deoptimizer::MaterializeNextValue() {
- int value_index = materialization_value_index_++;
- Handle<Object> value = materialized_values_->at(value_index);
- if (value->IsMutableHeapNumber()) {
- HeapNumber::cast(*value)->set_map(isolate_->heap()->heap_number_map());
- }
- if (*value == isolate_->heap()->arguments_marker()) {
- value = MaterializeNextHeapObject();
- }
- return value;
-}
-
-
void Deoptimizer::MaterializeHeapObjects(JavaScriptFrameIterator* it) {
DCHECK_NE(DEBUGGER, bailout_type_);
@@ -1934,1024 +1796,194 @@ void Deoptimizer::MaterializeHeapObjects(JavaScriptFrameIterator* it) {
jsframe_has_adapted_arguments_.Add(frame->has_adapted_arguments());
}
- // Handlify all tagged object values before triggering any allocation.
- List<Handle<Object> > values(deferred_objects_tagged_values_.length());
- for (int i = 0; i < deferred_objects_tagged_values_.length(); ++i) {
- values.Add(Handle<Object>(deferred_objects_tagged_values_[i], isolate_));
- }
-
- // Play it safe and clear all unhandlified values before we continue.
- deferred_objects_tagged_values_.Clear();
+ translated_state_.Prepare(it->frame()->has_adapted_arguments(), stack_fp_);
- // Materialize all heap numbers before looking at arguments because when the
- // output frames are used to materialize arguments objects later on they need
- // to already contain valid heap numbers.
- for (int i = 0; i < deferred_heap_numbers_.length(); i++) {
- HeapNumberMaterializationDescriptor<Address> d = deferred_heap_numbers_[i];
- Handle<Object> num = isolate_->factory()->NewNumber(d.value());
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- "Materialized a new heap number %p [%e] in slot %p\n",
- reinterpret_cast<void*>(*num),
- d.value(),
- d.destination());
- }
- Memory::Object_at(d.destination()) = *num;
- }
+ for (auto& materialization : values_to_materialize_) {
+ Handle<Object> value = materialization.value_->GetValue();
- // Materialize all heap numbers required for arguments/captured objects.
- for (int i = 0; i < deferred_objects_double_values_.length(); i++) {
- HeapNumberMaterializationDescriptor<int> d =
- deferred_objects_double_values_[i];
- Handle<Object> num = isolate_->factory()->NewNumber(d.value());
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- "Materialized a new heap number %p [%e] for object at %d\n",
- reinterpret_cast<void*>(*num),
- d.value(),
- d.destination());
- }
- DCHECK(values.at(d.destination())->IsTheHole());
- values.Set(d.destination(), num);
- }
-
- // Play it safe and clear all object double values before we continue.
- deferred_objects_double_values_.Clear();
-
- // Materialize arguments/captured objects.
- if (!deferred_objects_.is_empty()) {
- List<Handle<Object> > materialized_objects(deferred_objects_.length());
- materialized_objects_ = &materialized_objects;
- materialized_values_ = &values;
-
- while (materialization_object_index_ < deferred_objects_.length()) {
- int object_index = materialization_object_index_;
- ObjectMaterializationDescriptor descriptor =
- deferred_objects_.at(object_index);
-
- // Find a previously materialized object by de-duplication or
- // materialize a new instance of the object if necessary. Store
- // the materialized object into the frame slot.
- Handle<Object> object = MaterializeNextHeapObject();
- if (descriptor.slot_address() != NULL) {
- Memory::Object_at(descriptor.slot_address()) = *object;
- }
- if (trace_scope_ != NULL) {
- if (descriptor.is_arguments()) {
- PrintF(trace_scope_->file(),
- "Materialized %sarguments object of length %d for %p: ",
- ArgumentsObjectIsAdapted(object_index) ? "(adapted) " : "",
- Handle<JSObject>::cast(object)->elements()->length(),
- reinterpret_cast<void*>(descriptor.slot_address()));
- } else {
- PrintF(trace_scope_->file(),
- "Materialized captured object of size %d for %p: ",
- Handle<HeapObject>::cast(object)->Size(),
- reinterpret_cast<void*>(descriptor.slot_address()));
- }
- object->ShortPrint(trace_scope_->file());
- PrintF(trace_scope_->file(), "\n");
- }
+ if (trace_scope_ != nullptr) {
+ PrintF("Materialization [0x%08" V8PRIxPTR "] <- 0x%08" V8PRIxPTR " ; ",
+ reinterpret_cast<intptr_t>(materialization.output_slot_address_),
+ reinterpret_cast<intptr_t>(*value));
+ value->ShortPrint(trace_scope_->file());
+ PrintF(trace_scope_->file(), "\n");
}
- CHECK_EQ(materialization_object_index_, materialized_objects_->length());
- CHECK_EQ(materialization_value_index_, materialized_values_->length());
+ *(reinterpret_cast<intptr_t*>(materialization.output_slot_address_)) =
+ reinterpret_cast<intptr_t>(*value);
}
- if (prev_materialized_count_ > 0) {
- bool removed = materialized_store->Remove(stack_fp_);
- CHECK(removed);
- }
+ isolate_->materialized_object_store()->Remove(stack_fp_);
}
void Deoptimizer::MaterializeHeapNumbersForDebuggerInspectableFrame(
- Address parameters_top,
- uint32_t parameters_size,
- Address expressions_top,
- uint32_t expressions_size,
+ int frame_index, int parameter_count, int expression_count,
DeoptimizedFrameInfo* info) {
CHECK_EQ(DEBUGGER, bailout_type_);
- Address parameters_bottom = parameters_top + parameters_size;
- Address expressions_bottom = expressions_top + expressions_size;
- for (int i = 0; i < deferred_heap_numbers_.length(); i++) {
- HeapNumberMaterializationDescriptor<Address> d = deferred_heap_numbers_[i];
-
- // Check of the heap number to materialize actually belong to the frame
- // being extracted.
- Address slot = d.destination();
- if (parameters_top <= slot && slot < parameters_bottom) {
- Handle<Object> num = isolate_->factory()->NewNumber(d.value());
-
- int index = (info->parameters_count() - 1) -
- static_cast<int>(slot - parameters_top) / kPointerSize;
-
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- "Materializing a new heap number %p [%e] in slot %p"
- "for parameter slot #%d\n",
- reinterpret_cast<void*>(*num),
- d.value(),
- d.destination(),
- index);
- }
-
- info->SetParameter(index, *num);
- } else if (expressions_top <= slot && slot < expressions_bottom) {
- Handle<Object> num = isolate_->factory()->NewNumber(d.value());
-
- int index = info->expression_count() - 1 -
- static_cast<int>(slot - expressions_top) / kPointerSize;
-
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- "Materializing a new heap number %p [%e] in slot %p"
- "for expression slot #%d\n",
- reinterpret_cast<void*>(*num),
- d.value(),
- d.destination(),
- index);
- }
- info->SetExpression(index, *num);
+ translated_state_.Prepare(false, nullptr);
+
+ TranslatedFrame* frame = &(translated_state_.frames()[frame_index]);
+ CHECK(frame->kind() == TranslatedFrame::Function);
+ int frame_arg_count =
+ frame->function()->shared()->internal_formal_parameter_count();
+
+ // The height is #expressions + 1 for context.
+ CHECK_EQ(expression_count + 1, frame->height());
+ TranslatedFrame* argument_frame = frame;
+ if (frame_index > 0) {
+ TranslatedFrame* previous_frame =
+ &(translated_state_.frames()[frame_index - 1]);
+ if (previous_frame->kind() == TranslatedFrame::ArgumentsAdaptor) {
+ argument_frame = previous_frame;
+ CHECK_EQ(parameter_count, argument_frame->height() - 1);
+ } else {
+ CHECK_EQ(frame_arg_count, parameter_count);
}
+ } else {
+ CHECK_EQ(frame_arg_count, parameter_count);
}
-}
+ TranslatedFrame::ValueIterator arg_iter = argument_frame->begin();
+ arg_iter++; // Skip the receiver.
+ for (int i = 0; i < parameter_count; i++, arg_iter++) {
+ if (!arg_iter->IsMaterializedObject()) {
+ info->SetParameter(i, *(arg_iter->GetValue()));
+ }
+ }
-static const char* TraceValueType(bool is_smi) {
- if (is_smi) {
- return "smi";
+ TranslatedFrame::ValueIterator iter = frame->begin();
+ // Skip the arguments, receiver and context.
+ for (int i = 0; i < frame_arg_count + 2; i++, iter++) {
}
- return "heap number";
+ for (int i = 0; i < expression_count; i++, iter++) {
+ if (!iter->IsMaterializedObject()) {
+ info->SetExpression(i, *(iter->GetValue()));
+ }
+ }
}
-void Deoptimizer::DoTranslateObjectAndSkip(TranslationIterator* iterator) {
- Translation::Opcode opcode =
- static_cast<Translation::Opcode>(iterator->Next());
-
- switch (opcode) {
- case Translation::BEGIN:
- case Translation::JS_FRAME:
- case Translation::ARGUMENTS_ADAPTOR_FRAME:
- case Translation::CONSTRUCT_STUB_FRAME:
- case Translation::GETTER_STUB_FRAME:
- case Translation::SETTER_STUB_FRAME:
- case Translation::COMPILED_STUB_FRAME: {
- FATAL("Unexpected frame start translation opcode");
- return;
- }
+void Deoptimizer::WriteValueToOutput(
+ TranslatedFrame::ValueIterator* iterator, int* input_index, int frame_index,
+ unsigned output_offset, Address output_address_for_materialization) {
+ Object* value = (*iterator)->GetRawValue();
+ output_[frame_index]->SetFrameSlot(output_offset,
+ reinterpret_cast<intptr_t>(value));
- case Translation::REGISTER:
- case Translation::INT32_REGISTER:
- case Translation::UINT32_REGISTER:
- case Translation::BOOL_REGISTER:
- case Translation::DOUBLE_REGISTER:
- case Translation::STACK_SLOT:
- case Translation::INT32_STACK_SLOT:
- case Translation::UINT32_STACK_SLOT:
- case Translation::BOOL_STACK_SLOT:
- case Translation::DOUBLE_STACK_SLOT:
- case Translation::LITERAL: {
- // The value is not part of any materialized object, so we can ignore it.
- iterator->Skip(Translation::NumberOfOperandsFor(opcode));
- return;
- }
+ Address output_address =
+ reinterpret_cast<Address>(output_[frame_index]->GetTop()) + output_offset;
+ if (trace_scope_ != nullptr) {
+ PrintF(trace_scope_->file(),
+ " 0x%08" V8PRIxPTR ": [top + %d] <- 0x%08" V8PRIxPTR " ; ",
+ reinterpret_cast<intptr_t>(output_address), output_offset,
+ reinterpret_cast<intptr_t>(value));
+ value->ShortPrint(trace_scope_->file());
+ PrintF(trace_scope_->file(), " (input #%d)\n", *input_index);
+ }
- case Translation::DUPLICATED_OBJECT: {
- int object_index = iterator->Next();
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(), " skipping object ");
- PrintF(trace_scope_->file(),
- " ; duplicate of object #%d\n", object_index);
- }
- AddObjectDuplication(0, object_index);
- return;
+ if (value == isolate_->heap()->arguments_marker()) {
+ if (output_address_for_materialization == nullptr) {
+ output_address_for_materialization = output_address;
}
+ values_to_materialize_.push_back(
+ {output_address_for_materialization, *iterator});
+ }
- case Translation::ARGUMENTS_OBJECT:
- case Translation::CAPTURED_OBJECT: {
- int length = iterator->Next();
- bool is_args = opcode == Translation::ARGUMENTS_OBJECT;
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(), " skipping object ");
- PrintF(trace_scope_->file(),
- " ; object (length = %d, is_args = %d)\n", length, is_args);
- }
+ (*iterator)++;
+ (*input_index)++;
+}
- AddObjectStart(0, length, is_args);
- // We save the object values on the side and materialize the actual
- // object after the deoptimized frame is built.
- int object_index = deferred_objects_.length() - 1;
- for (int i = 0; i < length; i++) {
- DoTranslateObject(iterator, object_index, i);
- }
- return;
- }
+unsigned Deoptimizer::ComputeInputFrameSize() const {
+ unsigned fixed_size = ComputeFixedSize(function_);
+ // The fp-to-sp delta already takes the context, constant pool pointer and the
+ // function into account so we have to avoid double counting them.
+ unsigned result = fixed_size + fp_to_sp_delta_ -
+ StandardFrameConstants::kFixedFrameSizeFromFp;
+ if (compiled_code_->kind() == Code::OPTIMIZED_FUNCTION) {
+ unsigned stack_slots = compiled_code_->stack_slots();
+ unsigned outgoing_size = ComputeOutgoingArgumentSize();
+ CHECK(result == fixed_size + (stack_slots * kPointerSize) + outgoing_size);
}
-
- FATAL("Unexpected translation opcode");
+ return result;
}
-void Deoptimizer::DoTranslateObject(TranslationIterator* iterator,
- int object_index,
- int field_index) {
- disasm::NameConverter converter;
- Address object_slot = deferred_objects_[object_index].slot_address();
+unsigned Deoptimizer::ComputeFixedSize(JSFunction* function) const {
+ // The fixed part of the frame consists of the return address, frame
+ // pointer, function, context, and all the incoming arguments.
+ return ComputeIncomingArgumentSize(function) +
+ StandardFrameConstants::kFixedFrameSize;
+}
- Translation::Opcode opcode =
- static_cast<Translation::Opcode>(iterator->Next());
- switch (opcode) {
- case Translation::BEGIN:
- case Translation::JS_FRAME:
- case Translation::ARGUMENTS_ADAPTOR_FRAME:
- case Translation::CONSTRUCT_STUB_FRAME:
- case Translation::GETTER_STUB_FRAME:
- case Translation::SETTER_STUB_FRAME:
- case Translation::COMPILED_STUB_FRAME:
- FATAL("Unexpected frame start translation opcode");
- return;
+unsigned Deoptimizer::ComputeIncomingArgumentSize(JSFunction* function) const {
+ // The incoming arguments is the values for formal parameters and
+ // the receiver. Every slot contains a pointer.
+ if (function->IsSmi()) {
+ CHECK_EQ(Smi::cast(function), Smi::FromInt(StackFrame::STUB));
+ return 0;
+ }
+ unsigned arguments =
+ function->shared()->internal_formal_parameter_count() + 1;
+ return arguments * kPointerSize;
+}
- case Translation::REGISTER: {
- int input_reg = iterator->Next();
- intptr_t input_value = input_->GetRegister(input_reg);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- PrintF(trace_scope_->file(),
- "0x%08" V8PRIxPTR " ; %s ", input_value,
- converter.NameOfCPURegister(input_reg));
- reinterpret_cast<Object*>(input_value)->ShortPrint(
- trace_scope_->file());
- PrintF(trace_scope_->file(),
- "\n");
- }
- AddObjectTaggedValue(input_value);
- return;
- }
- case Translation::INT32_REGISTER: {
- int input_reg = iterator->Next();
- intptr_t value = input_->GetRegister(input_reg);
- bool is_smi = Smi::IsValid(value);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- PrintF(trace_scope_->file(),
- "%" V8PRIdPTR " ; %s (%s)\n", value,
- converter.NameOfCPURegister(input_reg),
- TraceValueType(is_smi));
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(static_cast<int>(value)));
- AddObjectTaggedValue(tagged_value);
- } else {
- double double_value = static_cast<double>(static_cast<int32_t>(value));
- AddObjectDoubleValue(double_value);
- }
- return;
- }
+unsigned Deoptimizer::ComputeOutgoingArgumentSize() const {
+ DeoptimizationInputData* data =
+ DeoptimizationInputData::cast(compiled_code_->deoptimization_data());
+ unsigned height = data->ArgumentsStackHeight(bailout_id_)->value();
+ return height * kPointerSize;
+}
- case Translation::UINT32_REGISTER: {
- int input_reg = iterator->Next();
- uintptr_t value = static_cast<uintptr_t>(input_->GetRegister(input_reg));
- bool is_smi = (value <= static_cast<uintptr_t>(Smi::kMaxValue));
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- PrintF(trace_scope_->file(), "%" V8PRIuPTR " ; uint %s (%s)\n", value,
- converter.NameOfCPURegister(input_reg), TraceValueType(is_smi));
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(static_cast<int>(value)));
- AddObjectTaggedValue(tagged_value);
- } else {
- double double_value = static_cast<double>(static_cast<uint32_t>(value));
- AddObjectDoubleValue(double_value);
- }
- return;
- }
- case Translation::BOOL_REGISTER: {
- int input_reg = iterator->Next();
- uintptr_t value = static_cast<uintptr_t>(input_->GetRegister(input_reg));
- bool is_smi = (value <= static_cast<uintptr_t>(Smi::kMaxValue));
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot), field_index);
- PrintF(trace_scope_->file(), "%" V8PRIuPTR " ; bool %s (%s)\n", value,
- converter.NameOfCPURegister(input_reg), TraceValueType(is_smi));
- }
- if (value == 0) {
- AddObjectTaggedValue(
- reinterpret_cast<intptr_t>(isolate_->heap()->false_value()));
- } else {
- DCHECK_EQ(1U, value);
- AddObjectTaggedValue(
- reinterpret_cast<intptr_t>(isolate_->heap()->true_value()));
- }
- return;
- }
+Object* Deoptimizer::ComputeLiteral(int index) const {
+ DeoptimizationInputData* data =
+ DeoptimizationInputData::cast(compiled_code_->deoptimization_data());
+ FixedArray* literals = data->LiteralArray();
+ return literals->get(index);
+}
- case Translation::DOUBLE_REGISTER: {
- int input_reg = iterator->Next();
- double value = input_->GetDoubleRegister(input_reg);
- int int_value = FastD2IChecked(value);
- bool is_smi =
- !IsMinusZero(value) && value == int_value && Smi::IsValid(int_value);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- PrintF(trace_scope_->file(),
- "%e ; %s\n", value,
- DoubleRegister::AllocationIndexToString(input_reg));
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(int_value));
- AddObjectTaggedValue(tagged_value);
- } else {
- AddObjectDoubleValue(value);
- }
- return;
- }
- case Translation::STACK_SLOT: {
- int input_slot_index = iterator->Next();
- unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
- intptr_t input_value = input_->GetFrameSlot(input_offset);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- PrintF(trace_scope_->file(),
- "0x%08" V8PRIxPTR " ; [sp + %d] ", input_value, input_offset);
- reinterpret_cast<Object*>(input_value)->ShortPrint(
- trace_scope_->file());
- PrintF(trace_scope_->file(),
- "\n");
- }
- AddObjectTaggedValue(input_value);
- return;
- }
+void Deoptimizer::EnsureCodeForDeoptimizationEntry(Isolate* isolate,
+ BailoutType type,
+ int max_entry_id) {
+ // We cannot run this if the serializer is enabled because this will
+ // cause us to emit relocation information for the external
+ // references. This is fine because the deoptimizer's code section
+ // isn't meant to be serialized at all.
+ CHECK(type == EAGER || type == SOFT || type == LAZY);
+ DeoptimizerData* data = isolate->deoptimizer_data();
+ int entry_count = data->deopt_entry_code_entries_[type];
+ if (max_entry_id < entry_count) return;
+ entry_count = Max(entry_count, Deoptimizer::kMinNumberOfEntries);
+ while (max_entry_id >= entry_count) entry_count *= 2;
+ CHECK(entry_count <= Deoptimizer::kMaxNumberOfEntries);
- case Translation::INT32_STACK_SLOT: {
- int input_slot_index = iterator->Next();
- unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
- intptr_t value = input_->GetFrameSlot(input_offset);
- bool is_smi = Smi::IsValid(value);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- PrintF(trace_scope_->file(),
- "%" V8PRIdPTR " ; [sp + %d] (%s)\n",
- value, input_offset, TraceValueType(is_smi));
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(static_cast<int>(value)));
- AddObjectTaggedValue(tagged_value);
- } else {
- double double_value = static_cast<double>(static_cast<int32_t>(value));
- AddObjectDoubleValue(double_value);
- }
- return;
- }
+ MacroAssembler masm(isolate, NULL, 16 * KB);
+ masm.set_emit_debug_code(false);
+ GenerateDeoptimizationEntries(&masm, entry_count, type);
+ CodeDesc desc;
+ masm.GetCode(&desc);
+ DCHECK(!RelocInfo::RequiresRelocation(desc));
- case Translation::UINT32_STACK_SLOT: {
- int input_slot_index = iterator->Next();
- unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
- uintptr_t value =
- static_cast<uintptr_t>(input_->GetFrameSlot(input_offset));
- bool is_smi = (value <= static_cast<uintptr_t>(Smi::kMaxValue));
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- PrintF(trace_scope_->file(), "%" V8PRIuPTR " ; [sp + %d] (uint %s)\n",
- value, input_offset, TraceValueType(is_smi));
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(static_cast<int>(value)));
- AddObjectTaggedValue(tagged_value);
- } else {
- double double_value = static_cast<double>(static_cast<uint32_t>(value));
- AddObjectDoubleValue(double_value);
- }
- return;
- }
+ MemoryChunk* chunk = data->deopt_entry_code_[type];
+ CHECK(static_cast<int>(Deoptimizer::GetMaxDeoptTableSize()) >=
+ desc.instr_size);
+ if (!chunk->CommitArea(desc.instr_size)) {
+ V8::FatalProcessOutOfMemory(
+ "Deoptimizer::EnsureCodeForDeoptimizationEntry");
+ }
+ CopyBytes(chunk->area_start(), desc.buffer,
+ static_cast<size_t>(desc.instr_size));
+ CpuFeatures::FlushICache(chunk->area_start(), desc.instr_size);
- case Translation::BOOL_STACK_SLOT: {
- int input_slot_index = iterator->Next();
- unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
- uintptr_t value =
- static_cast<uintptr_t>(input_->GetFrameSlot(input_offset));
- bool is_smi = (value <= static_cast<uintptr_t>(Smi::kMaxValue));
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot), field_index);
- PrintF(trace_scope_->file(), "%" V8PRIuPTR " ; [sp + %d] (bool %s)\n",
- value, input_offset, TraceValueType(is_smi));
- }
- if (value == 0) {
- AddObjectTaggedValue(
- reinterpret_cast<intptr_t>(isolate_->heap()->false_value()));
- } else {
- DCHECK_EQ(1U, value);
- AddObjectTaggedValue(
- reinterpret_cast<intptr_t>(isolate_->heap()->true_value()));
- }
- return;
- }
-
- case Translation::DOUBLE_STACK_SLOT: {
- int input_slot_index = iterator->Next();
- unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
- double value = input_->GetDoubleFrameSlot(input_offset);
- int int_value = FastD2IChecked(value);
- bool is_smi =
- !IsMinusZero(value) && value == int_value && Smi::IsValid(int_value);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- PrintF(trace_scope_->file(),
- "%e ; [sp + %d]\n", value, input_offset);
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(int_value));
- AddObjectTaggedValue(tagged_value);
- } else {
- AddObjectDoubleValue(value);
- }
- return;
- }
-
- case Translation::LITERAL: {
- Object* literal = ComputeLiteral(iterator->Next());
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " object @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- literal->ShortPrint(trace_scope_->file());
- PrintF(trace_scope_->file(),
- " ; literal\n");
- }
- intptr_t value = reinterpret_cast<intptr_t>(literal);
- AddObjectTaggedValue(value);
- return;
- }
-
- case Translation::DUPLICATED_OBJECT: {
- int object_index = iterator->Next();
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " nested @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- isolate_->heap()->arguments_marker()->ShortPrint(trace_scope_->file());
- PrintF(trace_scope_->file(),
- " ; duplicate of object #%d\n", object_index);
- }
- // Use the materialization marker value as a sentinel and fill in
- // the object after the deoptimized frame is built.
- intptr_t value = reinterpret_cast<intptr_t>(
- isolate_->heap()->arguments_marker());
- AddObjectDuplication(0, object_index);
- AddObjectTaggedValue(value);
- return;
- }
-
- case Translation::ARGUMENTS_OBJECT:
- case Translation::CAPTURED_OBJECT: {
- int length = iterator->Next();
- bool is_args = opcode == Translation::ARGUMENTS_OBJECT;
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " nested @0x%08" V8PRIxPTR ": [field #%d] <- ",
- reinterpret_cast<intptr_t>(object_slot),
- field_index);
- isolate_->heap()->arguments_marker()->ShortPrint(trace_scope_->file());
- PrintF(trace_scope_->file(),
- " ; object (length = %d, is_args = %d)\n", length, is_args);
- }
- // Use the materialization marker value as a sentinel and fill in
- // the object after the deoptimized frame is built.
- intptr_t value = reinterpret_cast<intptr_t>(
- isolate_->heap()->arguments_marker());
- AddObjectStart(0, length, is_args);
- AddObjectTaggedValue(value);
- // We save the object values on the side and materialize the actual
- // object after the deoptimized frame is built.
- int object_index = deferred_objects_.length() - 1;
- for (int i = 0; i < length; i++) {
- DoTranslateObject(iterator, object_index, i);
- }
- return;
- }
- }
-
- FATAL("Unexpected translation opcode");
-}
-
-
-void Deoptimizer::DoTranslateCommand(TranslationIterator* iterator,
- int frame_index,
- unsigned output_offset) {
- disasm::NameConverter converter;
- // A GC-safe temporary placeholder that we can put in the output frame.
- const intptr_t kPlaceholder = reinterpret_cast<intptr_t>(Smi::FromInt(0));
-
- Translation::Opcode opcode =
- static_cast<Translation::Opcode>(iterator->Next());
-
- switch (opcode) {
- case Translation::BEGIN:
- case Translation::JS_FRAME:
- case Translation::ARGUMENTS_ADAPTOR_FRAME:
- case Translation::CONSTRUCT_STUB_FRAME:
- case Translation::GETTER_STUB_FRAME:
- case Translation::SETTER_STUB_FRAME:
- case Translation::COMPILED_STUB_FRAME:
- FATAL("Unexpected translation opcode");
- return;
-
- case Translation::REGISTER: {
- int input_reg = iterator->Next();
- intptr_t input_value = input_->GetRegister(input_reg);
- if (trace_scope_ != NULL) {
- PrintF(
- trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": [top + %d] <- 0x%08" V8PRIxPTR " ; %s ",
- output_[frame_index]->GetTop() + output_offset,
- output_offset,
- input_value,
- converter.NameOfCPURegister(input_reg));
- reinterpret_cast<Object*>(input_value)->ShortPrint(
- trace_scope_->file());
- PrintF(trace_scope_->file(), "\n");
- }
- output_[frame_index]->SetFrameSlot(output_offset, input_value);
- return;
- }
-
- case Translation::INT32_REGISTER: {
- int input_reg = iterator->Next();
- intptr_t value = input_->GetRegister(input_reg);
- bool is_smi = Smi::IsValid(value);
- if (trace_scope_ != NULL) {
- PrintF(
- trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": [top + %d] <- %" V8PRIdPTR " ; %s (%s)\n",
- output_[frame_index]->GetTop() + output_offset,
- output_offset,
- value,
- converter.NameOfCPURegister(input_reg),
- TraceValueType(is_smi));
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(static_cast<int>(value)));
- output_[frame_index]->SetFrameSlot(output_offset, tagged_value);
- } else {
- // We save the untagged value on the side and store a GC-safe
- // temporary placeholder in the frame.
- AddDoubleValue(output_[frame_index]->GetTop() + output_offset,
- static_cast<double>(static_cast<int32_t>(value)));
- output_[frame_index]->SetFrameSlot(output_offset, kPlaceholder);
- }
- return;
- }
-
- case Translation::UINT32_REGISTER: {
- int input_reg = iterator->Next();
- uintptr_t value = static_cast<uintptr_t>(input_->GetRegister(input_reg));
- bool is_smi = value <= static_cast<uintptr_t>(Smi::kMaxValue);
- if (trace_scope_ != NULL) {
- PrintF(
- trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": [top + %d] <- %" V8PRIuPTR
- " ; uint %s (%s)\n",
- output_[frame_index]->GetTop() + output_offset,
- output_offset,
- value,
- converter.NameOfCPURegister(input_reg),
- TraceValueType(is_smi));
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(static_cast<int>(value)));
- output_[frame_index]->SetFrameSlot(output_offset, tagged_value);
- } else {
- // We save the untagged value on the side and store a GC-safe
- // temporary placeholder in the frame.
- AddDoubleValue(output_[frame_index]->GetTop() + output_offset,
- static_cast<double>(static_cast<uint32_t>(value)));
- output_[frame_index]->SetFrameSlot(output_offset, kPlaceholder);
- }
- return;
- }
-
- case Translation::BOOL_REGISTER: {
- int input_reg = iterator->Next();
- uintptr_t value = static_cast<uintptr_t>(input_->GetRegister(input_reg));
- bool is_smi = value <= static_cast<uintptr_t>(Smi::kMaxValue);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": [top + %d] <- %" V8PRIuPTR
- " ; bool %s (%s)\n",
- output_[frame_index]->GetTop() + output_offset, output_offset,
- value, converter.NameOfCPURegister(input_reg),
- TraceValueType(is_smi));
- }
- if (value == 0) {
- output_[frame_index]->SetFrameSlot(
- output_offset,
- reinterpret_cast<intptr_t>(isolate_->heap()->false_value()));
- } else {
- DCHECK_EQ(1U, value);
- output_[frame_index]->SetFrameSlot(
- output_offset,
- reinterpret_cast<intptr_t>(isolate_->heap()->true_value()));
- }
- return;
- }
-
- case Translation::DOUBLE_REGISTER: {
- int input_reg = iterator->Next();
- double value = input_->GetDoubleRegister(input_reg);
- int int_value = FastD2IChecked(value);
- bool is_smi =
- !IsMinusZero(value) && value == int_value && Smi::IsValid(int_value);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": [top + %d] <- %e ; %s\n",
- output_[frame_index]->GetTop() + output_offset, output_offset,
- value, DoubleRegister::AllocationIndexToString(input_reg));
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(int_value));
- output_[frame_index]->SetFrameSlot(output_offset, tagged_value);
- } else {
- // We save the untagged value on the side and store a GC-safe
- // temporary placeholder in the frame.
- AddDoubleValue(output_[frame_index]->GetTop() + output_offset, value);
- output_[frame_index]->SetFrameSlot(output_offset, kPlaceholder);
- }
- return;
- }
-
- case Translation::STACK_SLOT: {
- int input_slot_index = iterator->Next();
- unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
- intptr_t input_value = input_->GetFrameSlot(input_offset);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": ",
- output_[frame_index]->GetTop() + output_offset);
- PrintF(trace_scope_->file(),
- "[top + %d] <- 0x%08" V8PRIxPTR " ; [sp + %d] ",
- output_offset,
- input_value,
- input_offset);
- reinterpret_cast<Object*>(input_value)->ShortPrint(
- trace_scope_->file());
- PrintF(trace_scope_->file(), "\n");
- }
- output_[frame_index]->SetFrameSlot(output_offset, input_value);
- return;
- }
-
- case Translation::INT32_STACK_SLOT: {
- int input_slot_index = iterator->Next();
- unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
- intptr_t value = input_->GetFrameSlot(input_offset);
- bool is_smi = Smi::IsValid(value);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": ",
- output_[frame_index]->GetTop() + output_offset);
- PrintF(trace_scope_->file(),
- "[top + %d] <- %" V8PRIdPTR " ; [sp + %d] (%s)\n",
- output_offset,
- value,
- input_offset,
- TraceValueType(is_smi));
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(static_cast<int>(value)));
- output_[frame_index]->SetFrameSlot(output_offset, tagged_value);
- } else {
- // We save the untagged value on the side and store a GC-safe
- // temporary placeholder in the frame.
- AddDoubleValue(output_[frame_index]->GetTop() + output_offset,
- static_cast<double>(static_cast<int32_t>(value)));
- output_[frame_index]->SetFrameSlot(output_offset, kPlaceholder);
- }
- return;
- }
-
- case Translation::UINT32_STACK_SLOT: {
- int input_slot_index = iterator->Next();
- unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
- uintptr_t value =
- static_cast<uintptr_t>(input_->GetFrameSlot(input_offset));
- bool is_smi = value <= static_cast<uintptr_t>(Smi::kMaxValue);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": ",
- output_[frame_index]->GetTop() + output_offset);
- PrintF(trace_scope_->file(),
- "[top + %d] <- %" V8PRIuPTR " ; [sp + %d] (uint32 %s)\n",
- output_offset,
- value,
- input_offset,
- TraceValueType(is_smi));
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(static_cast<int>(value)));
- output_[frame_index]->SetFrameSlot(output_offset, tagged_value);
- } else {
- // We save the untagged value on the side and store a GC-safe
- // temporary placeholder in the frame.
- AddDoubleValue(output_[frame_index]->GetTop() + output_offset,
- static_cast<double>(static_cast<uint32_t>(value)));
- output_[frame_index]->SetFrameSlot(output_offset, kPlaceholder);
- }
- return;
- }
-
- case Translation::BOOL_STACK_SLOT: {
- int input_slot_index = iterator->Next();
- unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
- uintptr_t value =
- static_cast<uintptr_t>(input_->GetFrameSlot(input_offset));
- bool is_smi = value <= static_cast<uintptr_t>(Smi::kMaxValue);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(), " 0x%08" V8PRIxPTR ": ",
- output_[frame_index]->GetTop() + output_offset);
- PrintF(trace_scope_->file(),
- "[top + %d] <- %" V8PRIuPTR " ; [sp + %d] (uint32 %s)\n",
- output_offset, value, input_offset, TraceValueType(is_smi));
- }
- if (value == 0) {
- output_[frame_index]->SetFrameSlot(
- output_offset,
- reinterpret_cast<intptr_t>(isolate_->heap()->false_value()));
- } else {
- DCHECK_EQ(1U, value);
- output_[frame_index]->SetFrameSlot(
- output_offset,
- reinterpret_cast<intptr_t>(isolate_->heap()->true_value()));
- }
- return;
- }
-
- case Translation::DOUBLE_STACK_SLOT: {
- int input_slot_index = iterator->Next();
- unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
- double value = input_->GetDoubleFrameSlot(input_offset);
- int int_value = FastD2IChecked(value);
- bool is_smi =
- !IsMinusZero(value) && value == int_value && Smi::IsValid(int_value);
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": [top + %d] <- %e ; [sp + %d]\n",
- output_[frame_index]->GetTop() + output_offset,
- output_offset,
- value,
- input_offset);
- }
- if (is_smi) {
- intptr_t tagged_value =
- reinterpret_cast<intptr_t>(Smi::FromInt(int_value));
- output_[frame_index]->SetFrameSlot(output_offset, tagged_value);
- } else {
- // We save the untagged value on the side and store a GC-safe
- // temporary placeholder in the frame.
- AddDoubleValue(output_[frame_index]->GetTop() + output_offset, value);
- output_[frame_index]->SetFrameSlot(output_offset, kPlaceholder);
- }
- return;
- }
-
- case Translation::LITERAL: {
- Object* literal = ComputeLiteral(iterator->Next());
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": [top + %d] <- ",
- output_[frame_index]->GetTop() + output_offset,
- output_offset);
- literal->ShortPrint(trace_scope_->file());
- PrintF(trace_scope_->file(), " ; literal\n");
- }
- intptr_t value = reinterpret_cast<intptr_t>(literal);
- output_[frame_index]->SetFrameSlot(output_offset, value);
- return;
- }
-
- case Translation::DUPLICATED_OBJECT: {
- int object_index = iterator->Next();
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": [top + %d] <- ",
- output_[frame_index]->GetTop() + output_offset,
- output_offset);
- isolate_->heap()->arguments_marker()->ShortPrint(trace_scope_->file());
- PrintF(trace_scope_->file(),
- " ; duplicate of object #%d\n", object_index);
- }
- // Use the materialization marker value as a sentinel and fill in
- // the object after the deoptimized frame is built.
- intptr_t value = reinterpret_cast<intptr_t>(
- isolate_->heap()->arguments_marker());
- AddObjectDuplication(output_[frame_index]->GetTop() + output_offset,
- object_index);
- output_[frame_index]->SetFrameSlot(output_offset, value);
- return;
- }
-
- case Translation::ARGUMENTS_OBJECT:
- case Translation::CAPTURED_OBJECT: {
- int length = iterator->Next();
- bool is_args = opcode == Translation::ARGUMENTS_OBJECT;
- if (trace_scope_ != NULL) {
- PrintF(trace_scope_->file(),
- " 0x%08" V8PRIxPTR ": [top + %d] <- ",
- output_[frame_index]->GetTop() + output_offset,
- output_offset);
- isolate_->heap()->arguments_marker()->ShortPrint(trace_scope_->file());
- PrintF(trace_scope_->file(),
- " ; object (length = %d, is_args = %d)\n", length, is_args);
- }
- // Use the materialization marker value as a sentinel and fill in
- // the object after the deoptimized frame is built.
- intptr_t value = reinterpret_cast<intptr_t>(
- isolate_->heap()->arguments_marker());
- AddObjectStart(output_[frame_index]->GetTop() + output_offset,
- length, is_args);
- output_[frame_index]->SetFrameSlot(output_offset, value);
- // We save the object values on the side and materialize the actual
- // object after the deoptimized frame is built.
- int object_index = deferred_objects_.length() - 1;
- for (int i = 0; i < length; i++) {
- DoTranslateObject(iterator, object_index, i);
- }
- return;
- }
- }
-}
-
-
-unsigned Deoptimizer::ComputeInputFrameSize() const {
- unsigned fixed_size = ComputeFixedSize(function_);
- // The fp-to-sp delta already takes the context, constant pool pointer and the
- // function into account so we have to avoid double counting them.
- unsigned result = fixed_size + fp_to_sp_delta_ -
- StandardFrameConstants::kFixedFrameSizeFromFp;
- if (compiled_code_->kind() == Code::OPTIMIZED_FUNCTION) {
- unsigned stack_slots = compiled_code_->stack_slots();
- unsigned outgoing_size = ComputeOutgoingArgumentSize();
- CHECK(result == fixed_size + (stack_slots * kPointerSize) + outgoing_size);
- }
- return result;
-}
-
-
-unsigned Deoptimizer::ComputeFixedSize(JSFunction* function) const {
- // The fixed part of the frame consists of the return address, frame
- // pointer, function, context, and all the incoming arguments.
- return ComputeIncomingArgumentSize(function) +
- StandardFrameConstants::kFixedFrameSize;
-}
-
-
-unsigned Deoptimizer::ComputeIncomingArgumentSize(JSFunction* function) const {
- // The incoming arguments is the values for formal parameters and
- // the receiver. Every slot contains a pointer.
- if (function->IsSmi()) {
- CHECK_EQ(Smi::cast(function), Smi::FromInt(StackFrame::STUB));
- return 0;
- }
- unsigned arguments =
- function->shared()->internal_formal_parameter_count() + 1;
- return arguments * kPointerSize;
-}
-
-
-unsigned Deoptimizer::ComputeOutgoingArgumentSize() const {
- DeoptimizationInputData* data = DeoptimizationInputData::cast(
- compiled_code_->deoptimization_data());
- unsigned height = data->ArgumentsStackHeight(bailout_id_)->value();
- return height * kPointerSize;
-}
-
-
-Object* Deoptimizer::ComputeLiteral(int index) const {
- DeoptimizationInputData* data = DeoptimizationInputData::cast(
- compiled_code_->deoptimization_data());
- FixedArray* literals = data->LiteralArray();
- return literals->get(index);
-}
-
-
-void Deoptimizer::AddObjectStart(intptr_t slot, int length, bool is_args) {
- ObjectMaterializationDescriptor object_desc(
- reinterpret_cast<Address>(slot), jsframe_count_, length, -1, is_args);
- deferred_objects_.Add(object_desc);
-}
-
-
-void Deoptimizer::AddObjectDuplication(intptr_t slot, int object_index) {
- ObjectMaterializationDescriptor object_desc(
- reinterpret_cast<Address>(slot), jsframe_count_, -1, object_index, false);
- deferred_objects_.Add(object_desc);
-}
-
-
-void Deoptimizer::AddObjectTaggedValue(intptr_t value) {
- deferred_objects_tagged_values_.Add(reinterpret_cast<Object*>(value));
-}
-
-
-void Deoptimizer::AddObjectDoubleValue(double value) {
- deferred_objects_tagged_values_.Add(isolate()->heap()->the_hole_value());
- HeapNumberMaterializationDescriptor<int> value_desc(
- deferred_objects_tagged_values_.length() - 1, value);
- deferred_objects_double_values_.Add(value_desc);
-}
-
-
-void Deoptimizer::AddDoubleValue(intptr_t slot_address, double value) {
- HeapNumberMaterializationDescriptor<Address> value_desc(
- reinterpret_cast<Address>(slot_address), value);
- deferred_heap_numbers_.Add(value_desc);
-}
-
-
-void Deoptimizer::EnsureCodeForDeoptimizationEntry(Isolate* isolate,
- BailoutType type,
- int max_entry_id) {
- // We cannot run this if the serializer is enabled because this will
- // cause us to emit relocation information for the external
- // references. This is fine because the deoptimizer's code section
- // isn't meant to be serialized at all.
- CHECK(type == EAGER || type == SOFT || type == LAZY);
- DeoptimizerData* data = isolate->deoptimizer_data();
- int entry_count = data->deopt_entry_code_entries_[type];
- if (max_entry_id < entry_count) return;
- entry_count = Max(entry_count, Deoptimizer::kMinNumberOfEntries);
- while (max_entry_id >= entry_count) entry_count *= 2;
- CHECK(entry_count <= Deoptimizer::kMaxNumberOfEntries);
-
- MacroAssembler masm(isolate, NULL, 16 * KB);
- masm.set_emit_debug_code(false);
- GenerateDeoptimizationEntries(&masm, entry_count, type);
- CodeDesc desc;
- masm.GetCode(&desc);
- DCHECK(!RelocInfo::RequiresRelocation(desc));
-
- MemoryChunk* chunk = data->deopt_entry_code_[type];
- CHECK(static_cast<int>(Deoptimizer::GetMaxDeoptTableSize()) >=
- desc.instr_size);
- if (!chunk->CommitArea(desc.instr_size)) {
- V8::FatalProcessOutOfMemory(
- "Deoptimizer::EnsureCodeForDeoptimizationEntry");
- }
- CopyBytes(chunk->area_start(), desc.buffer,
- static_cast<size_t>(desc.instr_size));
- CpuFeatures::FlushICache(chunk->area_start(), desc.instr_size);
-
- data->deopt_entry_code_entries_[type] = entry_count;
-}
+ data->deopt_entry_code_entries_[type] = entry_count;
+}
FrameDescription::FrameDescription(uint32_t frame_size,
@@ -3118,8 +2150,9 @@ void Translation::BeginJSFrame(BailoutId node_id,
}
-void Translation::BeginCompiledStubFrame() {
+void Translation::BeginCompiledStubFrame(int height) {
buffer_->Add(COMPILED_STUB_FRAME, zone());
+ buffer_->Add(height, zone());
}
@@ -3264,371 +2297,989 @@ const char* Translation::StringFor(Opcode opcode) {
#endif
-// We can't intermix stack decoding and allocations because
-// deoptimization infrastracture is not GC safe.
-// Thus we build a temporary structure in malloced space.
-SlotRef SlotRefValueBuilder::ComputeSlotForNextArgument(
- Translation::Opcode opcode,
- TranslationIterator* iterator,
- DeoptimizationInputData* data,
- JavaScriptFrame* frame) {
- switch (opcode) {
- case Translation::BEGIN:
- case Translation::JS_FRAME:
- case Translation::ARGUMENTS_ADAPTOR_FRAME:
- case Translation::CONSTRUCT_STUB_FRAME:
- case Translation::GETTER_STUB_FRAME:
- case Translation::SETTER_STUB_FRAME:
- // Peeled off before getting here.
- break;
+Handle<FixedArray> MaterializedObjectStore::Get(Address fp) {
+ int index = StackIdToIndex(fp);
+ if (index == -1) {
+ return Handle<FixedArray>::null();
+ }
+ Handle<FixedArray> array = GetStackEntries();
+ CHECK_GT(array->length(), index);
+ return Handle<FixedArray>::cast(Handle<Object>(array->get(index), isolate()));
+}
+
+
+void MaterializedObjectStore::Set(Address fp,
+ Handle<FixedArray> materialized_objects) {
+ int index = StackIdToIndex(fp);
+ if (index == -1) {
+ index = frame_fps_.length();
+ frame_fps_.Add(fp);
+ }
+
+ Handle<FixedArray> array = EnsureStackEntries(index + 1);
+ array->set(index, *materialized_objects);
+}
+
+
+bool MaterializedObjectStore::Remove(Address fp) {
+ int index = StackIdToIndex(fp);
+ if (index == -1) {
+ return false;
+ }
+ CHECK_GE(index, 0);
+
+ frame_fps_.Remove(index);
+ FixedArray* array = isolate()->heap()->materialized_objects();
+ CHECK_LT(index, array->length());
+ for (int i = index; i < frame_fps_.length(); i++) {
+ array->set(i, array->get(i + 1));
+ }
+ array->set(frame_fps_.length(), isolate()->heap()->undefined_value());
+ return true;
+}
+
+
+int MaterializedObjectStore::StackIdToIndex(Address fp) {
+ for (int i = 0; i < frame_fps_.length(); i++) {
+ if (frame_fps_[i] == fp) {
+ return i;
+ }
+ }
+ return -1;
+}
+
+
+Handle<FixedArray> MaterializedObjectStore::GetStackEntries() {
+ return Handle<FixedArray>(isolate()->heap()->materialized_objects());
+}
+
+
+Handle<FixedArray> MaterializedObjectStore::EnsureStackEntries(int length) {
+ Handle<FixedArray> array = GetStackEntries();
+ if (array->length() >= length) {
+ return array;
+ }
+
+ int new_length = length > 10 ? length : 10;
+ if (new_length < 2 * array->length()) {
+ new_length = 2 * array->length();
+ }
+
+ Handle<FixedArray> new_array =
+ isolate()->factory()->NewFixedArray(new_length, TENURED);
+ for (int i = 0; i < array->length(); i++) {
+ new_array->set(i, array->get(i));
+ }
+ for (int i = array->length(); i < length; i++) {
+ new_array->set(i, isolate()->heap()->undefined_value());
+ }
+ isolate()->heap()->public_set_materialized_objects(*new_array);
+ return new_array;
+}
+
+
+DeoptimizedFrameInfo::DeoptimizedFrameInfo(Deoptimizer* deoptimizer,
+ int frame_index,
+ bool has_arguments_adaptor,
+ bool has_construct_stub) {
+ FrameDescription* output_frame = deoptimizer->output_[frame_index];
+ function_ = output_frame->GetFunction();
+ context_ = reinterpret_cast<Object*>(output_frame->GetContext());
+ has_construct_stub_ = has_construct_stub;
+ expression_count_ = output_frame->GetExpressionCount();
+ expression_stack_ = new Object* [expression_count_];
+ // Get the source position using the unoptimized code.
+ Address pc = reinterpret_cast<Address>(output_frame->GetPc());
+ Code* code = Code::cast(deoptimizer->isolate()->FindCodeObject(pc));
+ source_position_ = code->SourcePosition(pc);
+
+ for (int i = 0; i < expression_count_; i++) {
+ SetExpression(i, output_frame->GetExpression(i));
+ }
+
+ if (has_arguments_adaptor) {
+ output_frame = deoptimizer->output_[frame_index - 1];
+ CHECK_EQ(output_frame->GetFrameType(), StackFrame::ARGUMENTS_ADAPTOR);
+ }
+
+ parameters_count_ = output_frame->ComputeParametersCount();
+ parameters_ = new Object* [parameters_count_];
+ for (int i = 0; i < parameters_count_; i++) {
+ SetParameter(i, output_frame->GetParameter(i));
+ }
+}
+
+
+DeoptimizedFrameInfo::~DeoptimizedFrameInfo() {
+ delete[] expression_stack_;
+ delete[] parameters_;
+}
+
+
+void DeoptimizedFrameInfo::Iterate(ObjectVisitor* v) {
+ v->VisitPointer(bit_cast<Object**>(&function_));
+ v->VisitPointer(&context_);
+ v->VisitPointers(parameters_, parameters_ + parameters_count_);
+ v->VisitPointers(expression_stack_, expression_stack_ + expression_count_);
+}
+
+
+const char* Deoptimizer::GetDeoptReason(DeoptReason deopt_reason) {
+ DCHECK(deopt_reason < kLastDeoptReason);
+#define DEOPT_MESSAGES_TEXTS(C, T) T,
+ static const char* deopt_messages_[] = {
+ DEOPT_MESSAGES_LIST(DEOPT_MESSAGES_TEXTS)};
+#undef DEOPT_MESSAGES_TEXTS
+ return deopt_messages_[deopt_reason];
+}
+
+
+Deoptimizer::DeoptInfo Deoptimizer::GetDeoptInfo(Code* code, Address pc) {
+ SourcePosition last_position = SourcePosition::Unknown();
+ Deoptimizer::DeoptReason last_reason = Deoptimizer::kNoReason;
+ int mask = RelocInfo::ModeMask(RelocInfo::DEOPT_REASON) |
+ RelocInfo::ModeMask(RelocInfo::POSITION);
+ for (RelocIterator it(code, mask); !it.done(); it.next()) {
+ RelocInfo* info = it.rinfo();
+ if (info->pc() >= pc) return DeoptInfo(last_position, NULL, last_reason);
+ if (info->rmode() == RelocInfo::POSITION) {
+ int raw_position = static_cast<int>(info->data());
+ last_position = raw_position ? SourcePosition::FromRaw(raw_position)
+ : SourcePosition::Unknown();
+ } else if (info->rmode() == RelocInfo::DEOPT_REASON) {
+ last_reason = static_cast<Deoptimizer::DeoptReason>(info->data());
+ }
+ }
+ return DeoptInfo(SourcePosition::Unknown(), NULL, Deoptimizer::kNoReason);
+}
+
+
+// static
+TranslatedValue TranslatedValue::NewArgumentsObject(TranslatedState* container,
+ int length,
+ int object_index) {
+ TranslatedValue slot(container, ARGUMENTS_OBJECT);
+ slot.deferred_object_length_ = length;
+ slot.object_index_ = object_index;
+ return slot;
+}
+
+
+// static
+TranslatedValue TranslatedValue::NewDeferredObject(TranslatedState* container,
+ int length,
+ int object_index) {
+ TranslatedValue slot(container, DEFERRED_OBJECT);
+ slot.deferred_object_length_ = length;
+ slot.object_index_ = object_index;
+ return slot;
+}
+
+
+// static
+TranslatedValue TranslatedValue::NewDuplicateObject(TranslatedState* container,
+ int id) {
+ TranslatedValue slot(container, DUPLICATE_OBJECT);
+ slot.object_index_ = id;
+ return slot;
+}
+
+
+// static
+TranslatedValue TranslatedValue::NewDouble(TranslatedState* container,
+ double value) {
+ TranslatedValue slot(container, DOUBLE);
+ slot.double_value_ = value;
+ return slot;
+}
+
+
+// static
+TranslatedValue TranslatedValue::NewInt32(TranslatedState* container,
+ uint32_t value) {
+ TranslatedValue slot(container, INT32);
+ slot.integral_value_ = value;
+ return slot;
+}
+
+
+// static
+TranslatedValue TranslatedValue::NewUInt32(TranslatedState* container,
+ uint32_t value) {
+ TranslatedValue slot(container, UINT32);
+ slot.integral_value_ = value;
+ return slot;
+}
+
+
+// static
+TranslatedValue TranslatedValue::NewBool(TranslatedState* container,
+ uint32_t value) {
+ TranslatedValue slot(container, BOOLBIT);
+ slot.integral_value_ = value;
+ return slot;
+}
+
+
+// static
+TranslatedValue TranslatedValue::NewTagged(TranslatedState* container,
+ Object* literal) {
+ TranslatedValue slot(container, TAGGED);
+ slot.raw_literal_ = literal;
+ return slot;
+}
+
+
+// static
+TranslatedValue TranslatedValue::NewInvalid() {
+ return TranslatedValue(nullptr, UNKNOWN);
+}
+
+
+Isolate* TranslatedValue::isolate() { return container_->isolate(); }
+
+
+Object* TranslatedValue::GetRawValue() {
+ // If we have a value, return it.
+ Handle<Object> result_handle;
+ if (value_.ToHandle(&result_handle)) {
+ return *result_handle;
+ }
+
+ // Otherwise, do a best effort to get the value without allocation.
+ switch (kind()) {
+ case TAGGED:
+ return raw_literal_;
+
+ case INT32: {
+ int32_t i32_value = static_cast<int32_t>(integral_value_);
+ bool is_smi = Smi::IsValid(i32_value);
+ if (is_smi) {
+ return Smi::FromInt(i32_value);
+ }
+ break;
+ }
+
+ case UINT32: {
+ bool is_smi = (integral_value_ <= static_cast<uintptr_t>(Smi::kMaxValue));
+ if (is_smi) {
+ return Smi::FromInt(static_cast<int32_t>(integral_value_));
+ }
+ break;
+ }
+
+ case DOUBLE: {
+ int int_value = FastD2IChecked(double_value_);
+ bool is_smi = !IsMinusZero(double_value_) && double_value_ == int_value &&
+ Smi::IsValid(int_value);
+ if (is_smi) {
+ return Smi::FromInt(static_cast<int32_t>(int_value));
+ }
+ break;
+ }
+
+ case BOOLBIT: {
+ if (integral_value_ == 0) {
+ return isolate()->heap()->false_value();
+ } else {
+ CHECK_EQ(1, integral_value_);
+ return isolate()->heap()->true_value();
+ }
+ }
+
+ default:
+ break;
+ }
+
+ // If we could not get the value without allocation, return the arguments
+ // marker.
+ return isolate()->heap()->arguments_marker();
+}
+
+
+Handle<Object> TranslatedValue::GetValue() {
+ Handle<Object> result;
+ // If we already have a value, then get it.
+ if (value_.ToHandle(&result)) return result;
+
+ // Otherwise we have to materialize.
+ switch (kind()) {
+ case TranslatedValue::TAGGED:
+ case TranslatedValue::INT32:
+ case TranslatedValue::UINT32:
+ case TranslatedValue::BOOLBIT:
+ case TranslatedValue::DOUBLE: {
+ MaterializeSimple();
+ return value_.ToHandleChecked();
+ }
+
+ case TranslatedValue::ARGUMENTS_OBJECT:
+ case TranslatedValue::DEFERRED_OBJECT:
+ case TranslatedValue::DUPLICATE_OBJECT:
+ return container_->MaterializeObjectAt(ObjectIndex());
+
+ case TranslatedValue::UNKNOWN:
+ FATAL("unexpected case");
+ return Handle<Object>::null();
+ }
+
+ FATAL("internal error: value missing");
+ return Handle<Object>::null();
+}
+
+
+void TranslatedValue::MaterializeSimple() {
+ // If we already have materialized, return.
+ if (!value_.is_null()) return;
+
+ Object* raw_value = GetRawValue();
+ if (raw_value != isolate()->heap()->arguments_marker()) {
+ // We can get the value without allocation, just return it here.
+ value_ = Handle<Object>(raw_value, isolate());
+ return;
+ }
+
+ switch (kind()) {
+ case INT32: {
+ int32_t i32_value = static_cast<int32_t>(integral_value_);
Benedikt Meurer 2015/06/03 04:02:17 Use a bit_cast<int32_t> here, or if you turn the f
Jarin 2015/06/03 09:28:07 Turned to unions.
+ value_ = Handle<Object>(isolate()->factory()->NewNumber(i32_value));
+ return;
+ }
+
+ case UINT32:
+ value_ = Handle<Object>(isolate()->factory()->NewNumber(integral_value_));
+ return;
+
+ case DOUBLE:
+ value_ = Handle<Object>(isolate()->factory()->NewNumber(double_value_));
+ return;
+
+ case DEFERRED_OBJECT:
+ case DUPLICATE_OBJECT:
+ case ARGUMENTS_OBJECT:
+ case UNKNOWN:
+ case TAGGED:
+ case BOOLBIT:
+ FATAL("internal error: unexpected materialization.");
+ break;
+ }
+}
+
+
+bool TranslatedValue::IsMaterializedObject() {
+ switch (kind()) {
+ case DEFERRED_OBJECT:
+ case DUPLICATE_OBJECT:
+ case ARGUMENTS_OBJECT:
+ return true;
+ default:
+ return false;
+ }
+}
+
+
+int TranslatedState::SlotOffsetFp(int slot_index) {
+ if (slot_index >= 0) {
+ const int offset = StandardFrameConstants::kExpressionsOffset;
+ return offset - (slot_index * kPointerSize);
+ } else {
+ const int offset = StandardFrameConstants::kCallerSPOffset;
+ return offset - ((slot_index + 1) * kPointerSize);
+ }
+}
+
+
+Address TranslatedState::SlotAddress(Address fp, int slot_index) {
+ return fp + SlotOffsetFp(slot_index);
+}
+
+
+uint32_t TranslatedState::GetUInt32Slot(Address fp, int slot_offset) {
+ Address address = fp + slot_offset;
+#if V8_TARGET_BIG_ENDIAN && V8_HOST_ARCH_64_BIT
+ return Memory::uint32_at(address + kIntSize);
+#else
+ return Memory::uint32_at(address);
+#endif
+}
+
+
+void TranslatedValue::Handlify() {
+ if (raw_literal_ != nullptr) {
+ value_ = Handle<Object>(raw_literal_, isolate());
+ raw_literal_ = nullptr;
+ }
+}
+
+
+TranslatedFrame TranslatedFrame::JSFrame(BailoutId node_id,
+ JSFunction* function, int height) {
+ TranslatedFrame frame(Function, function->GetIsolate(), function, height);
+ frame.node_id_ = node_id;
+ return frame;
+}
+
+
+TranslatedFrame TranslatedFrame::AccessorFrame(Kind kind,
+ JSFunction* function) {
+ DCHECK(kind == Setter || kind == Getter);
+ return TranslatedFrame(kind, function->GetIsolate(), function);
+}
+
+
+TranslatedFrame TranslatedFrame::ArgumentsAdaptorFrame(JSFunction* function,
+ int height) {
+ return TranslatedFrame(ArgumentsAdaptor, function->GetIsolate(), function,
+ height);
+}
+
+
+TranslatedFrame TranslatedFrame::ConstructStubFrame(JSFunction* function,
+ int height) {
+ return TranslatedFrame(ConstructStub, function->GetIsolate(), function,
+ height);
+}
+
+
+int TranslatedFrame::GetValueCount() {
+ switch (kind()) {
+ case Function: {
+ int parameter_count =
+ (raw_function_ == nullptr
+ ? function_->shared()->internal_formal_parameter_count()
+ : raw_function_->shared()->internal_formal_parameter_count()) +
+ 1;
+ return height_ + parameter_count;
+ }
+
+ case Getter:
+ return 1; // Receiver.
+
+ case Setter:
+ return 2; // Receiver and the value to set.
+
+ case ArgumentsAdaptor:
+ case ConstructStub:
+ case CompiledStub:
+ return height_;
+
+ case Invalid:
+ UNREACHABLE();
+ break;
+ }
+ UNREACHABLE();
+ return -1;
+}
+
+
+void TranslatedFrame::Handlify(Isolate* isolate) {
+ if (raw_function_ != nullptr) {
+ function_ = Handle<JSFunction>(raw_function_, isolate);
+ raw_function_ = nullptr;
+ }
+ for (auto& value : values_) {
+ value.Handlify();
+ }
+}
+
+
+TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
+ TranslationIterator* iterator, FixedArray* literal_array, Address fp,
+ JSFunction* frame_function, FILE* trace_file) {
+ Translation::Opcode opcode =
+ static_cast<Translation::Opcode>(iterator->Next());
+ switch (opcode) {
+ case Translation::JS_FRAME: {
+ BailoutId node_id = BailoutId(iterator->Next());
+ int closure_id = iterator->Next();
+ JSFunction* function =
+ (closure_id == Translation::kSelfLiteralId)
+ ? frame_function
+ : JSFunction::cast(literal_array->get(closure_id));
+ int height = iterator->Next();
+ if (trace_file != nullptr) {
+ PrintF(trace_file, " reading input frame ");
+ function->PrintName(trace_file);
+ int arg_count =
+ function->shared()->internal_formal_parameter_count() + 1;
+ PrintF(trace_file, " => node=%d, args=%d, height=%d; inputs:\n",
+ arg_count, node_id.ToInt(), height);
+ }
+ return TranslatedFrame::JSFrame(node_id, function, height);
+ }
+
+ case Translation::ARGUMENTS_ADAPTOR_FRAME: {
+ JSFunction* function =
+ JSFunction::cast(literal_array->get(iterator->Next()));
+ int height = iterator->Next();
+ if (trace_file != nullptr) {
+ PrintF(trace_file, " reading arguments adaptor frame");
+ function->PrintName(trace_file);
+ PrintF(trace_file, " => height=%d; inputs:\n", height);
+ }
+ return TranslatedFrame::ArgumentsAdaptorFrame(function, height);
+ }
+
+ case Translation::CONSTRUCT_STUB_FRAME: {
+ JSFunction* function =
+ JSFunction::cast(literal_array->get(iterator->Next()));
+ int height = iterator->Next();
+ if (trace_file != nullptr) {
+ PrintF(trace_file, " reading construct stub frame ");
+ function->PrintName(trace_file);
+ PrintF(trace_file, " => height=%d; inputs:\n", height);
+ }
+ return TranslatedFrame::ConstructStubFrame(function, height);
+ }
+
+ case Translation::GETTER_STUB_FRAME: {
+ JSFunction* function =
+ JSFunction::cast(literal_array->get(iterator->Next()));
+ if (trace_file != nullptr) {
+ PrintF(trace_file, " reading getter frame ");
+ function->PrintName(trace_file);
+ PrintF(trace_file, "; inputs:\n");
+ }
+ return TranslatedFrame::AccessorFrame(TranslatedFrame::Getter, function);
+ }
+
+ case Translation::SETTER_STUB_FRAME: {
+ JSFunction* function =
+ JSFunction::cast(literal_array->get(iterator->Next()));
+ if (trace_file != nullptr) {
+ PrintF(trace_file, " reading setter frame ");
+ function->PrintName(trace_file);
+ PrintF(trace_file, "; inputs:\n");
+ }
+ return TranslatedFrame::AccessorFrame(TranslatedFrame::Setter, function);
+ }
+
+ case Translation::COMPILED_STUB_FRAME: {
+ int height = iterator->Next();
+ if (trace_file != nullptr) {
+ PrintF(trace_file,
+ " reading compiler stub frame => height=%d; inputs:\n", height);
+ }
+ return TranslatedFrame::CompiledStubFrame(height,
+ literal_array->GetIsolate());
+ }
+
+ case Translation::BEGIN:
+ case Translation::DUPLICATED_OBJECT:
+ case Translation::ARGUMENTS_OBJECT:
+ case Translation::CAPTURED_OBJECT:
+ case Translation::REGISTER:
+ case Translation::INT32_REGISTER:
+ case Translation::UINT32_REGISTER:
+ case Translation::BOOL_REGISTER:
+ case Translation::DOUBLE_REGISTER:
+ case Translation::STACK_SLOT:
+ case Translation::INT32_STACK_SLOT:
+ case Translation::UINT32_STACK_SLOT:
+ case Translation::BOOL_STACK_SLOT:
+ case Translation::DOUBLE_STACK_SLOT:
+ case Translation::LITERAL:
+ break;
+ }
+ FATAL("We should never get here - unexpected deopt info.");
+ return TranslatedFrame::InvalidFrame();
+}
+
+
+// static
+void TranslatedFrame::AdvanceIterator(
+ std::deque<TranslatedValue>::iterator* iter) {
+ int values_to_skip = 1;
+ while (values_to_skip > 0) {
+ // Consume the current element.
+ values_to_skip--;
+ // Add all the children.
+ values_to_skip += (*iter)->GetChildrenCount();
+
+ (*iter)++;
+ }
+}
+
+
+// We can't intermix stack decoding and allocations because
+// deoptimization infrastracture is not GC safe.
+// Thus we build a temporary structure in malloced space.
+TranslatedValue TranslatedState::CreateNextTranslatedValue(
+ int frame_index, int value_index, TranslationIterator* iterator,
+ FixedArray* literal_array, Address fp, RegisterValues* registers,
+ FILE* trace_file) {
+ disasm::NameConverter converter;
+
+ Translation::Opcode opcode =
+ static_cast<Translation::Opcode>(iterator->Next());
+ switch (opcode) {
+ case Translation::BEGIN:
+ case Translation::JS_FRAME:
+ case Translation::ARGUMENTS_ADAPTOR_FRAME:
+ case Translation::CONSTRUCT_STUB_FRAME:
+ case Translation::GETTER_STUB_FRAME:
+ case Translation::SETTER_STUB_FRAME:
+ case Translation::COMPILED_STUB_FRAME:
+ // Peeled off before getting here.
+ break;
case Translation::DUPLICATED_OBJECT: {
- return SlotRef::NewDuplicateObject(iterator->Next());
+ int object_id = iterator->Next();
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "duplicated object #%d", object_id);
+ }
+ object_positions_.push_back(object_positions_[object_id]);
+ return TranslatedValue::NewDuplicateObject(this, object_id);
+ }
+
+ case Translation::ARGUMENTS_OBJECT: {
+ int arg_count = iterator->Next();
+ int object_index = static_cast<int>(object_positions_.size());
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "argumets object #%d (length = %d)", object_index,
+ arg_count);
+ }
+ object_positions_.push_back({frame_index, value_index});
+ return TranslatedValue::NewArgumentsObject(this, arg_count, object_index);
+ }
+
+ case Translation::CAPTURED_OBJECT: {
+ int field_count = iterator->Next();
+ int object_index = static_cast<int>(object_positions_.size());
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "captured object #%d (length = %d)", object_index,
+ field_count);
+ }
+ object_positions_.push_back({frame_index, value_index});
+ return TranslatedValue::NewDeferredObject(this, field_count,
+ object_index);
+ }
+
+ case Translation::REGISTER: {
+ int input_reg = iterator->Next();
+ if (registers == nullptr) return TranslatedValue::NewInvalid();
+ intptr_t value = registers->GetRegister(input_reg);
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "0x%08" V8PRIxPTR " ; %s ", value,
+ converter.NameOfCPURegister(input_reg));
+ reinterpret_cast<Object*>(value)->ShortPrint(trace_file);
+ }
+ return TranslatedValue::NewTagged(this, reinterpret_cast<Object*>(value));
}
- case Translation::ARGUMENTS_OBJECT:
- return SlotRef::NewArgumentsObject(iterator->Next());
+ case Translation::INT32_REGISTER: {
+ int input_reg = iterator->Next();
+ if (registers == nullptr) return TranslatedValue::NewInvalid();
+ intptr_t value = registers->GetRegister(input_reg);
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "%" V8PRIdPTR " ; %s ", value,
+ converter.NameOfCPURegister(input_reg));
+ }
+ return TranslatedValue::NewInt32(this, static_cast<uint32_t>(value));
+ }
- case Translation::CAPTURED_OBJECT: {
- return SlotRef::NewDeferredObject(iterator->Next());
+ case Translation::UINT32_REGISTER: {
+ int input_reg = iterator->Next();
+ if (registers == nullptr) return TranslatedValue::NewInvalid();
+ intptr_t value = registers->GetRegister(input_reg);
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "%" V8PRIuPTR " ; %s (uint)", value,
+ converter.NameOfCPURegister(input_reg));
+ reinterpret_cast<Object*>(value)->ShortPrint(trace_file);
+ }
+ return TranslatedValue::NewUInt32(this, static_cast<uint32_t>(value));
}
- case Translation::REGISTER:
- case Translation::INT32_REGISTER:
- case Translation::UINT32_REGISTER:
- case Translation::BOOL_REGISTER:
- case Translation::DOUBLE_REGISTER:
- // We are at safepoint which corresponds to call. All registers are
- // saved by caller so there would be no live registers at this
- // point. Thus these translation commands should not be used.
- break;
+ case Translation::BOOL_REGISTER: {
+ int input_reg = iterator->Next();
+ if (registers == nullptr) return TranslatedValue::NewInvalid();
+ intptr_t value = registers->GetRegister(input_reg);
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "%" V8PRIdPTR " ; %s (bool)", value,
+ converter.NameOfCPURegister(input_reg));
+ }
+ return TranslatedValue::NewBool(this, static_cast<uint32_t>(value));
+ }
+
+ case Translation::DOUBLE_REGISTER: {
+ int input_reg = iterator->Next();
+ if (registers == nullptr) return TranslatedValue::NewInvalid();
+ double value = registers->GetDoubleRegister(input_reg);
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "%e ; %s (bool)", value,
+ DoubleRegister::AllocationIndexToString(input_reg));
+ }
+ return TranslatedValue::NewDouble(this, value);
+ }
case Translation::STACK_SLOT: {
- int slot_index = iterator->Next();
- Address slot_addr = SlotAddress(frame, slot_index);
- return SlotRef(slot_addr, SlotRef::TAGGED);
+ int slot_offset = SlotOffsetFp(iterator->Next());
+ intptr_t value = *(reinterpret_cast<intptr_t*>(fp + slot_offset));
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "0x%08" V8PRIxPTR " ; [fp %c %d] ", value,
+ slot_offset < 0 ? '-' : '+', std::abs(slot_offset));
+ reinterpret_cast<Object*>(value)->ShortPrint(trace_file);
+ }
+ return TranslatedValue::NewTagged(this, reinterpret_cast<Object*>(value));
}
case Translation::INT32_STACK_SLOT: {
- int slot_index = iterator->Next();
- Address slot_addr = SlotAddress(frame, slot_index);
- return SlotRef(slot_addr, SlotRef::INT32);
+ int slot_offset = SlotOffsetFp(iterator->Next());
+ uint32_t value = GetUInt32Slot(fp, slot_offset);
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "%d ; (int) [fp %c %d] ",
+ static_cast<int32_t>(value), slot_offset < 0 ? '-' : '+',
+ std::abs(slot_offset));
+ }
+ return TranslatedValue::NewInt32(this, value);
}
case Translation::UINT32_STACK_SLOT: {
- int slot_index = iterator->Next();
- Address slot_addr = SlotAddress(frame, slot_index);
- return SlotRef(slot_addr, SlotRef::UINT32);
+ int slot_offset = SlotOffsetFp(iterator->Next());
+ uint32_t value = GetUInt32Slot(fp, slot_offset);
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "%u ; (uint) [fp %c %d] ", value,
+ slot_offset < 0 ? '-' : '+', std::abs(slot_offset));
+ }
+ return TranslatedValue::NewUInt32(this, value);
}
case Translation::BOOL_STACK_SLOT: {
- int slot_index = iterator->Next();
- Address slot_addr = SlotAddress(frame, slot_index);
- return SlotRef(slot_addr, SlotRef::BOOLBIT);
+ int slot_offset = SlotOffsetFp(iterator->Next());
+ uint32_t value = GetUInt32Slot(fp, slot_offset);
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "%u ; (bool) [fp %c %d] ", value,
+ slot_offset < 0 ? '-' : '+', std::abs(slot_offset));
+ }
+ return TranslatedValue::NewBool(this, value);
}
case Translation::DOUBLE_STACK_SLOT: {
- int slot_index = iterator->Next();
- Address slot_addr = SlotAddress(frame, slot_index);
- return SlotRef(slot_addr, SlotRef::DOUBLE);
+ int slot_offset = SlotOffsetFp(iterator->Next());
+ double value = *(reinterpret_cast<double*>(fp + slot_offset));
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "%e ; (double) [fp %c %d] ", value,
+ slot_offset < 0 ? '-' : '+', std::abs(slot_offset));
+ }
+ return TranslatedValue::NewDouble(this, value);
}
case Translation::LITERAL: {
int literal_index = iterator->Next();
- return SlotRef(data->GetIsolate(),
- data->LiteralArray()->get(literal_index));
- }
+ Object* value = literal_array->get(literal_index);
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "0x%08" V8PRIxPTR " ; (literal %d) ",
+ reinterpret_cast<intptr_t>(value), literal_index);
+ reinterpret_cast<Object*>(value)->ShortPrint(trace_file);
+ }
- case Translation::COMPILED_STUB_FRAME:
- UNREACHABLE();
- break;
+ return TranslatedValue::NewTagged(this, value);
+ }
}
FATAL("We should never get here - unexpected deopt info.");
- return SlotRef();
+ return TranslatedValue(nullptr, TranslatedValue::UNKNOWN);
}
-SlotRefValueBuilder::SlotRefValueBuilder(JavaScriptFrame* frame,
- int inlined_jsframe_index,
- int formal_parameter_count)
- : current_slot_(0),
- args_length_(-1),
- first_slot_index_(-1),
- should_deoptimize_(false) {
- DisallowHeapAllocation no_gc;
-
+TranslatedState::TranslatedState(JavaScriptFrame* frame)
+ : isolate_(nullptr),
+ stack_frame_pointer_(nullptr),
+ has_adapted_arguments_(false) {
int deopt_index = Safepoint::kNoDeoptimizationIndex;
DeoptimizationInputData* data =
static_cast<OptimizedFrame*>(frame)->GetDeoptimizationData(&deopt_index);
TranslationIterator it(data->TranslationByteArray(),
data->TranslationIndex(deopt_index)->value());
- Translation::Opcode opcode = static_cast<Translation::Opcode>(it.Next());
- CHECK_EQ(opcode, Translation::BEGIN);
- it.Next(); // Drop frame count.
-
- stack_frame_id_ = frame->fp();
-
- int jsframe_count = it.Next();
- CHECK_GT(jsframe_count, inlined_jsframe_index);
- int jsframes_to_skip = inlined_jsframe_index;
- int number_of_slots = -1; // Number of slots inside our frame (yet unknown)
- while (number_of_slots != 0) {
- opcode = static_cast<Translation::Opcode>(it.Next());
- bool processed = false;
- if (opcode == Translation::ARGUMENTS_ADAPTOR_FRAME) {
- if (jsframes_to_skip == 0) {
- CHECK_EQ(Translation::NumberOfOperandsFor(opcode), 2);
-
- it.Skip(1); // literal id
- int height = it.Next();
-
- // Skip the translation command for the receiver.
- it.Skip(Translation::NumberOfOperandsFor(
- static_cast<Translation::Opcode>(it.Next())));
-
- // We reached the arguments adaptor frame corresponding to the
- // inlined function in question. Number of arguments is height - 1.
- first_slot_index_ = slot_refs_.length();
- args_length_ = height - 1;
- number_of_slots = height - 1;
- processed = true;
- }
- } else if (opcode == Translation::JS_FRAME) {
- if (jsframes_to_skip == 0) {
- // Skip over operands to advance to the next opcode.
- it.Skip(Translation::NumberOfOperandsFor(opcode));
-
- // Skip the translation command for the receiver.
- it.Skip(Translation::NumberOfOperandsFor(
- static_cast<Translation::Opcode>(it.Next())));
-
- // We reached the frame corresponding to the inlined function
- // in question. Process the translation commands for the
- // arguments. Number of arguments is equal to the number of
- // format parameter count.
- first_slot_index_ = slot_refs_.length();
- args_length_ = formal_parameter_count;
- number_of_slots = formal_parameter_count;
- processed = true;
- }
- jsframes_to_skip--;
- } else if (opcode != Translation::BEGIN &&
- opcode != Translation::CONSTRUCT_STUB_FRAME &&
- opcode != Translation::GETTER_STUB_FRAME &&
- opcode != Translation::SETTER_STUB_FRAME &&
- opcode != Translation::COMPILED_STUB_FRAME) {
- slot_refs_.Add(ComputeSlotForNextArgument(opcode, &it, data, frame));
-
- if (first_slot_index_ >= 0) {
- // We have found the beginning of our frame -> make sure we count
- // the nested slots of captured objects
- number_of_slots--;
- SlotRef& slot = slot_refs_.last();
- CHECK_NE(slot.Representation(), SlotRef::ARGUMENTS_OBJECT);
- number_of_slots += slot.GetChildrenCount();
- if (slot.Representation() == SlotRef::DEFERRED_OBJECT ||
- slot.Representation() == SlotRef::DUPLICATE_OBJECT) {
- should_deoptimize_ = true;
- }
- }
-
- processed = true;
- }
- if (!processed) {
- // Skip over operands to advance to the next opcode.
- it.Skip(Translation::NumberOfOperandsFor(opcode));
- }
- }
- if (should_deoptimize_) {
- List<JSFunction*> functions(2);
- frame->GetFunctions(&functions);
- Deoptimizer::DeoptimizeFunction(functions[0]);
- }
+ Init(frame->fp(), frame->function(), &it, data->LiteralArray(),
+ nullptr /* registers */, nullptr /* trace file */);
}
-Handle<Object> SlotRef::GetValue(Isolate* isolate) {
- switch (representation_) {
- case TAGGED: {
- Handle<Object> value(Memory::Object_at(addr_), isolate);
- if (value->IsMutableHeapNumber()) {
- HeapNumber::cast(*value)->set_map(isolate->heap()->heap_number_map());
- }
- return value;
- }
+TranslatedState::TranslatedState()
+ : isolate_(nullptr),
+ stack_frame_pointer_(nullptr),
+ has_adapted_arguments_(false) {}
- case INT32: {
-#if V8_TARGET_BIG_ENDIAN && V8_HOST_ARCH_64_BIT
- int value = Memory::int32_at(addr_ + kIntSize);
-#else
- int value = Memory::int32_at(addr_);
-#endif
- if (Smi::IsValid(value)) {
- return Handle<Object>(Smi::FromInt(value), isolate);
- } else {
- return isolate->factory()->NewNumberFromInt(value);
+
+void TranslatedState::Init(Address input_frame_pointer,
+ JSFunction* input_frame_function,
+ TranslationIterator* iterator,
+ FixedArray* literal_array, RegisterValues* registers,
+ FILE* trace_file) {
+ DCHECK(frames_.empty());
+
+ isolate_ = literal_array->GetIsolate();
+ // Read out the 'header' translation.
+ Translation::Opcode opcode =
+ static_cast<Translation::Opcode>(iterator->Next());
+ CHECK(opcode == Translation::BEGIN);
+
+ int count = iterator->Next();
+ iterator->Next(); // Drop JS frames count.
+
+ frames_.reserve(count);
+
+ std::stack<int> nested_counts;
+
+ // Read the frames
+ for (int i = 0; i < count; i++) {
+ // Read the frame descriptor.
+ frames_.push_back(
+ CreateNextTranslatedFrame(iterator, literal_array, input_frame_pointer,
+ input_frame_function, trace_file));
+ TranslatedFrame& frame = frames_.back();
+
+ // Read the values.
+ int values_to_process = frame.GetValueCount();
+ while (values_to_process > 0 || !nested_counts.empty()) {
+ if (trace_file != nullptr) {
+ if (nested_counts.empty()) {
+ // For top level values, print the value number.
+ PrintF(trace_file, " %3i: ",
+ frame.GetValueCount() - values_to_process);
+ } else {
+ // Take care of indenting for nested values.
+ PrintF(trace_file, " ");
+ for (size_t j = 0; j < nested_counts.size(); j++) {
+ PrintF(trace_file, " ");
+ }
+ }
}
- }
- case UINT32: {
-#if V8_TARGET_BIG_ENDIAN && V8_HOST_ARCH_64_BIT
- uint32_t value = Memory::uint32_at(addr_ + kIntSize);
-#else
- uint32_t value = Memory::uint32_at(addr_);
-#endif
- if (value <= static_cast<uint32_t>(Smi::kMaxValue)) {
- return Handle<Object>(Smi::FromInt(static_cast<int>(value)), isolate);
- } else {
- return isolate->factory()->NewNumber(static_cast<double>(value));
+ TranslatedValue value = CreateNextTranslatedValue(
+ i, static_cast<int>(frame.values_.size()), iterator, literal_array,
+ input_frame_pointer, registers, trace_file);
+ frame.Add(value);
+
+ if (trace_file != nullptr) {
+ PrintF(trace_file, "\n");
}
- }
- case BOOLBIT: {
-#if V8_TARGET_BIG_ENDIAN && V8_HOST_ARCH_64_BIT
- uint32_t value = Memory::uint32_at(addr_ + kIntSize);
-#else
- uint32_t value = Memory::uint32_at(addr_);
-#endif
- if (value == 0) {
- return isolate->factory()->false_value();
+ // Update the value count and resolve the nesting.
+ values_to_process--;
+ int children_count = value.GetChildrenCount();
+ if (children_count > 0) {
+ nested_counts.push(values_to_process);
+ values_to_process = children_count;
} else {
- DCHECK_EQ(1U, value);
- return isolate->factory()->true_value();
+ while (values_to_process == 0 && !nested_counts.empty()) {
+ values_to_process = nested_counts.top();
+ nested_counts.pop();
+ }
}
}
+ }
- case DOUBLE: {
- double value = read_double_value(addr_);
- return isolate->factory()->NewNumber(value);
- }
+ CHECK(!iterator->HasNext() ||
+ static_cast<Translation::Opcode>(iterator->Next()) ==
+ Translation::BEGIN);
+}
- case LITERAL:
- return literal_;
- default:
- FATAL("We should never get here - unexpected deopt info.");
- return Handle<Object>::null();
+void TranslatedState::Prepare(bool has_adapted_arguments,
+ Address stack_frame_pointer) {
+ for (auto& frame : frames_) {
+ frame.Handlify(isolate_);
}
-}
+ stack_frame_pointer_ = stack_frame_pointer;
+ has_adapted_arguments_ = has_adapted_arguments;
-void SlotRefValueBuilder::Prepare(Isolate* isolate) {
- MaterializedObjectStore* materialized_store =
- isolate->materialized_object_store();
- previously_materialized_objects_ = materialized_store->Get(stack_frame_id_);
- prev_materialized_count_ = previously_materialized_objects_.is_null()
- ? 0 : previously_materialized_objects_->length();
-
- // Skip any materialized objects of the inlined "parent" frames.
- // (Note that we still need to materialize them because they might be
- // referred to as duplicated objects.)
- while (current_slot_ < first_slot_index_) {
- GetNext(isolate, 0);
- }
- CHECK_EQ(current_slot_, first_slot_index_);
+ UpdateFromPreviouslyMaterializedObjects();
}
-Handle<Object> SlotRefValueBuilder::GetPreviouslyMaterialized(
- Isolate* isolate, int length) {
- int object_index = materialized_objects_.length();
- Handle<Object> return_value = Handle<Object>(
- previously_materialized_objects_->get(object_index), isolate);
- materialized_objects_.Add(return_value);
+Handle<Object> TranslatedState::MaterializeAt(int frame_index,
+ int* value_index) {
+ TranslatedFrame* frame = &(frames_[frame_index]);
+ DCHECK(static_cast<size_t>(*value_index) < frame->values_.size());
- // Now need to skip all the nested objects (and possibly read them from
- // the materialization store, too).
- for (int i = 0; i < length; i++) {
- SlotRef& slot = slot_refs_[current_slot_];
- current_slot_++;
-
- // We need to read all the nested objects - add them to the
- // number of objects we need to process.
- length += slot.GetChildrenCount();
-
- // Put the nested deferred/duplicate objects into our materialization
- // array.
- if (slot.Representation() == SlotRef::DEFERRED_OBJECT ||
- slot.Representation() == SlotRef::DUPLICATE_OBJECT) {
- int nested_object_index = materialized_objects_.length();
- Handle<Object> nested_object = Handle<Object>(
- previously_materialized_objects_->get(nested_object_index),
- isolate);
- materialized_objects_.Add(nested_object);
- }
- }
-
- return return_value;
-}
-
-
-Handle<Object> SlotRefValueBuilder::GetNext(Isolate* isolate, int lvl) {
- SlotRef& slot = slot_refs_[current_slot_];
- current_slot_++;
- switch (slot.Representation()) {
- case SlotRef::TAGGED:
- case SlotRef::INT32:
- case SlotRef::UINT32:
- case SlotRef::BOOLBIT:
- case SlotRef::DOUBLE:
- case SlotRef::LITERAL:
- return slot.GetValue(isolate);
-
- case SlotRef::ARGUMENTS_OBJECT: {
- // We should never need to materialize an arguments object,
- // but we still need to put something into the array
- // so that the indexing is consistent.
- materialized_objects_.Add(isolate->factory()->undefined_value());
- int length = slot.GetChildrenCount();
- for (int i = 0; i < length; ++i) {
- // We don't need the argument, just ignore it
- GetNext(isolate, lvl + 1);
+ TranslatedValue* slot = &(frame->values_[*value_index]);
+ (*value_index)++;
+
+ switch (slot->kind()) {
+ case TranslatedValue::TAGGED:
+ case TranslatedValue::INT32:
+ case TranslatedValue::UINT32:
+ case TranslatedValue::BOOLBIT:
+ case TranslatedValue::DOUBLE: {
+ slot->MaterializeSimple();
+ Handle<Object> value = slot->GetValue();
+ if (value->IsMutableHeapNumber()) {
+ HeapNumber::cast(*value)->set_map(isolate()->heap()->heap_number_map());
+ }
+ return value;
+ }
+
+ case TranslatedValue::ARGUMENTS_OBJECT: {
+ int length = slot->GetChildrenCount();
+ Handle<JSObject> arguments;
+ if (GetAdaptedArguments(&arguments, frame_index)) {
+ // Store the materialized object and consume the nested values.
+ for (int i = 0; i < length; ++i) {
+ MaterializeAt(frame_index, value_index);
+ }
+ } else {
+ Handle<JSFunction> function = frame->function();
+ arguments = isolate_->factory()->NewArgumentsObject(function, length);
+ Handle<FixedArray> array = isolate_->factory()->NewFixedArray(length);
+ DCHECK_EQ(array->length(), length);
+ arguments->set_elements(*array);
+ for (int i = 0; i < length; ++i) {
+ Handle<Object> value = MaterializeAt(frame_index, value_index);
+ array->set(i, *value);
+ }
}
- return isolate->factory()->undefined_value();
+ slot->value_ = arguments;
+ return arguments;
}
- case SlotRef::DEFERRED_OBJECT: {
- int length = slot.GetChildrenCount();
- CHECK(slot_refs_[current_slot_].Representation() == SlotRef::LITERAL ||
- slot_refs_[current_slot_].Representation() == SlotRef::TAGGED);
+ case TranslatedValue::DEFERRED_OBJECT: {
+ int length = slot->GetChildrenCount();
+
+ // The map must be a tagged object.
+ CHECK(frame->values_[*value_index].kind() == TranslatedValue::TAGGED);
+
+ Handle<Object> result;
+ if (slot->value_.ToHandle(&result)) {
+ // This has been previously materialized, return the previous value.
+ // We still need to skip all the nested objects.
+ for (int i = 0; i < length; i++) {
+ MaterializeAt(frame_index, value_index);
+ }
- int object_index = materialized_objects_.length();
- if (object_index < prev_materialized_count_) {
- return GetPreviouslyMaterialized(isolate, length);
+ return result;
}
- Handle<Object> map_object = slot_refs_[current_slot_].GetValue(isolate);
- Handle<Map> map = Map::GeneralizeAllFieldRepresentations(
- Handle<Map>::cast(map_object));
- current_slot_++;
- // TODO(jarin) this should be unified with the code in
- // Deoptimizer::MaterializeNextHeapObject()
+ Handle<Object> map_object = MaterializeAt(frame_index, value_index);
+ Handle<Map> map =
+ Map::GeneralizeAllFieldRepresentations(Handle<Map>::cast(map_object));
switch (map->instance_type()) {
case MUTABLE_HEAP_NUMBER_TYPE:
case HEAP_NUMBER_TYPE: {
// Reuse the HeapNumber value directly as it is already properly
// tagged and skip materializing the HeapNumber explicitly.
- Handle<Object> object = GetNext(isolate, lvl + 1);
- materialized_objects_.Add(object);
+ Handle<Object> object = MaterializeAt(frame_index, value_index);
+ slot->value_ = object;
// On 32-bit architectures, there is an extra slot there because
// the escape analysis calculates the number of slots as
// object-size/pointer-size. To account for this, we read out
// any extra slots.
for (int i = 0; i < length - 2; i++) {
- GetNext(isolate, lvl + 1);
+ MaterializeAt(frame_index, value_index);
}
return object;
}
case JS_OBJECT_TYPE: {
Handle<JSObject> object =
- isolate->factory()->NewJSObjectFromMap(map, NOT_TENURED, false);
- materialized_objects_.Add(object);
- Handle<Object> properties = GetNext(isolate, lvl + 1);
- Handle<Object> elements = GetNext(isolate, lvl + 1);
+ isolate_->factory()->NewJSObjectFromMap(map, NOT_TENURED, false);
+ slot->value_ = object;
+ Handle<Object> properties = MaterializeAt(frame_index, value_index);
+ Handle<Object> elements = MaterializeAt(frame_index, value_index);
object->set_properties(FixedArray::cast(*properties));
object->set_elements(FixedArrayBase::cast(*elements));
for (int i = 0; i < length - 3; ++i) {
- Handle<Object> value = GetNext(isolate, lvl + 1);
+ Handle<Object> value = MaterializeAt(frame_index, value_index);
FieldIndex index = FieldIndex::ForPropertyIndex(object->map(), i);
object->FastPropertyAtPut(index, *value);
}
@@ -3636,33 +3287,47 @@ Handle<Object> SlotRefValueBuilder::GetNext(Isolate* isolate, int lvl) {
}
case JS_ARRAY_TYPE: {
Handle<JSArray> object =
- isolate->factory()->NewJSArray(0, map->elements_kind());
- materialized_objects_.Add(object);
- Handle<Object> properties = GetNext(isolate, lvl + 1);
- Handle<Object> elements = GetNext(isolate, lvl + 1);
- Handle<Object> length = GetNext(isolate, lvl + 1);
+ isolate_->factory()->NewJSArray(0, map->elements_kind());
+ slot->value_ = object;
+ Handle<Object> properties = MaterializeAt(frame_index, value_index);
+ Handle<Object> elements = MaterializeAt(frame_index, value_index);
+ Handle<Object> length = MaterializeAt(frame_index, value_index);
object->set_properties(FixedArray::cast(*properties));
object->set_elements(FixedArrayBase::cast(*elements));
object->set_length(*length);
return object;
}
default:
- PrintF(stderr,
- "[couldn't handle instance type %d]\n", map->instance_type());
- UNREACHABLE();
- break;
+ PrintF(stderr, "[couldn't handle instance type %d]\n",
+ map->instance_type());
+ FATAL("unreachable");
+ return Handle<Object>::null();
}
UNREACHABLE();
break;
}
- case SlotRef::DUPLICATE_OBJECT: {
- int object_index = slot.DuplicateObjectId();
- Handle<Object> object = materialized_objects_[object_index];
- materialized_objects_.Add(object);
+ case TranslatedValue::DUPLICATE_OBJECT: {
+ int object_index = slot->ObjectIndex();
+ TranslatedState::ObjectPosition pos = object_positions_[object_index];
+
+ // Make sure the duplicate is refering to a previous object.
+ DCHECK(pos.frame_index_ < frame_index ||
+ (pos.frame_index_ == frame_index &&
+ pos.value_index_ < *value_index - 1));
+
+ Handle<Object> object =
+ frames_[pos.frame_index_].values_[pos.value_index_].GetValue();
+
+ // The object should have a (non-sentinel) value.
+ DCHECK(!object.is_null() &&
+ !object.is_identical_to(isolate_->factory()->arguments_marker()));
+
+ slot->value_ = object;
return object;
}
- default:
+
+ case TranslatedValue::UNKNOWN:
UNREACHABLE();
break;
}
@@ -3672,180 +3337,150 @@ Handle<Object> SlotRefValueBuilder::GetNext(Isolate* isolate, int lvl) {
}
-void SlotRefValueBuilder::Finish(Isolate* isolate) {
- // We should have processed all the slots
- CHECK_EQ(slot_refs_.length(), current_slot_);
-
- if (should_deoptimize_ &&
- materialized_objects_.length() > prev_materialized_count_) {
- // We have materialized some new objects and they might be accessible
- // from the arguments object, so we have to store them
- // to prevent duplicate materialization.
- Handle<FixedArray> array = isolate->factory()->NewFixedArray(
- materialized_objects_.length());
- for (int i = 0; i < materialized_objects_.length(); i++) {
- array->set(i, *(materialized_objects_.at(i)));
- }
- isolate->materialized_object_store()->Set(stack_frame_id_, array);
- }
-}
-
-
-Handle<FixedArray> MaterializedObjectStore::Get(Address fp) {
- int index = StackIdToIndex(fp);
- if (index == -1) {
- return Handle<FixedArray>::null();
- }
- Handle<FixedArray> array = GetStackEntries();
- CHECK_GT(array->length(), index);
- return Handle<FixedArray>::cast(Handle<Object>(array->get(index),
- isolate()));
-}
-
-
-void MaterializedObjectStore::Set(Address fp,
- Handle<FixedArray> materialized_objects) {
- int index = StackIdToIndex(fp);
- if (index == -1) {
- index = frame_fps_.length();
- frame_fps_.Add(fp);
- }
-
- Handle<FixedArray> array = EnsureStackEntries(index + 1);
- array->set(index, *materialized_objects);
+Handle<Object> TranslatedState::MaterializeObjectAt(int object_index) {
+ TranslatedState::ObjectPosition pos = object_positions_[object_index];
+ return MaterializeAt(pos.frame_index_, &(pos.value_index_));
}
-bool MaterializedObjectStore::Remove(Address fp) {
- int index = StackIdToIndex(fp);
- if (index == -1) {
- return false;
- }
- CHECK_GE(index, 0);
+bool TranslatedState::GetAdaptedArguments(Handle<JSObject>* result,
+ int frame_index) {
+ if (frame_index == 0) {
+ // Top level frame -> we need to go to the parent frame on the stack.
+ if (!has_adapted_arguments_) return false;
- frame_fps_.Remove(index);
- FixedArray* array = isolate()->heap()->materialized_objects();
- CHECK_LT(index, array->length());
- for (int i = index; i < frame_fps_.length(); i++) {
- array->set(i, array->get(i + 1));
+ // This is top level frame, so we need to go to the stack to get
+ // this function's argument. (Note that this relies on not inlining
+ // recursive functions!)
+ Handle<JSFunction> function = frames_[frame_index].function();
+ *result = Handle<JSObject>::cast(Accessors::FunctionGetArguments(function));
+ return true;
+ } else {
+ TranslatedFrame* previous_frame = &(frames_[frame_index]);
+ if (previous_frame->kind() != TranslatedFrame::ArgumentsAdaptor) {
+ return false;
+ }
+ // We get the adapted arguments from the parent translation.
+ int length = previous_frame->GetValueCount();
+ Handle<JSFunction> function = previous_frame->function();
+ Handle<JSObject> arguments =
+ isolate_->factory()->NewArgumentsObject(function, length);
+ Handle<FixedArray> array = isolate_->factory()->NewFixedArray(length);
+ arguments->set_elements(*array);
+ TranslatedFrame::ValueIterator arg_iterator = previous_frame->begin();
+ for (int i = 0; i < length; ++i) {
+ Handle<Object> value = arg_iterator->GetValue();
+ array->set(i, *value);
+ arg_iterator++;
+ }
+ CHECK(arg_iterator == previous_frame->end());
+ *result = arguments;
+ return true;
}
- array->set(frame_fps_.length(), isolate()->heap()->undefined_value());
- return true;
}
-int MaterializedObjectStore::StackIdToIndex(Address fp) {
- for (int i = 0; i < frame_fps_.length(); i++) {
- if (frame_fps_[i] == fp) {
- return i;
+TranslatedFrame* TranslatedState::GetArgumentsInfoFromJSFrameIndex(
+ int jsframe_index, int* args_count) {
+ for (size_t i = 0; i < frames_.size(); i++) {
+ if (frames_[i].kind() == TranslatedFrame::Function) {
+ if (jsframe_index > 0) {
+ jsframe_index--;
+ } else {
+ // We have the JS function frame, now check if it has arguments adaptor.
+ if (i > 0 &&
+ frames_[i - 1].kind() == TranslatedFrame::ArgumentsAdaptor) {
+ *args_count = frames_[i - 1].height();
+ return &(frames_[i - 1]);
+ }
+ *args_count =
+ frames_[i].function()->shared()->internal_formal_parameter_count() +
+ 1;
+ return &(frames_[i]);
+ }
}
}
- return -1;
+ return nullptr;
}
-Handle<FixedArray> MaterializedObjectStore::GetStackEntries() {
- return Handle<FixedArray>(isolate()->heap()->materialized_objects());
-}
-
+void TranslatedState::StoreMaterializedValuesAndDeopt() {
+ MaterializedObjectStore* materialized_store =
+ isolate_->materialized_object_store();
+ Handle<FixedArray> previously_materialized_objects =
+ materialized_store->Get(stack_frame_pointer_);
-Handle<FixedArray> MaterializedObjectStore::EnsureStackEntries(int length) {
- Handle<FixedArray> array = GetStackEntries();
- if (array->length() >= length) {
- return array;
- }
+ Handle<Object> marker = isolate_->factory()->arguments_marker();
- int new_length = length > 10 ? length : 10;
- if (new_length < 2 * array->length()) {
- new_length = 2 * array->length();
+ int length = static_cast<int>(object_positions_.size());
+ bool new_store = false;
+ if (previously_materialized_objects.is_null()) {
+ previously_materialized_objects =
+ isolate_->factory()->NewFixedArray(length);
+ for (int i = 0; i < length; i++) {
+ previously_materialized_objects->set(i, *marker);
+ }
+ new_store = true;
}
- Handle<FixedArray> new_array =
- isolate()->factory()->NewFixedArray(new_length, TENURED);
- for (int i = 0; i < array->length(); i++) {
- new_array->set(i, array->get(i));
- }
- for (int i = array->length(); i < length; i++) {
- new_array->set(i, isolate()->heap()->undefined_value());
- }
- isolate()->heap()->public_set_materialized_objects(*new_array);
- return new_array;
-}
+ DCHECK_EQ(length, previously_materialized_objects->length());
+ bool value_changed = false;
+ for (int i = 0; i < length; i++) {
+ TranslatedState::ObjectPosition pos = object_positions_[i];
+ TranslatedValue* value_info =
+ &(frames_[pos.frame_index_].values_[pos.value_index_]);
-DeoptimizedFrameInfo::DeoptimizedFrameInfo(Deoptimizer* deoptimizer,
- int frame_index,
- bool has_arguments_adaptor,
- bool has_construct_stub) {
- FrameDescription* output_frame = deoptimizer->output_[frame_index];
- function_ = output_frame->GetFunction();
- context_ = reinterpret_cast<Object*>(output_frame->GetContext());
- has_construct_stub_ = has_construct_stub;
- expression_count_ = output_frame->GetExpressionCount();
- expression_stack_ = new Object*[expression_count_];
- // Get the source position using the unoptimized code.
- Address pc = reinterpret_cast<Address>(output_frame->GetPc());
- Code* code = Code::cast(deoptimizer->isolate()->FindCodeObject(pc));
- source_position_ = code->SourcePosition(pc);
+ DCHECK(value_info->IsMaterializedObject());
- for (int i = 0; i < expression_count_; i++) {
- SetExpression(i, output_frame->GetExpression(i));
- }
+ Handle<Object> value(value_info->GetRawValue(), isolate_);
- if (has_arguments_adaptor) {
- output_frame = deoptimizer->output_[frame_index - 1];
- CHECK_EQ(output_frame->GetFrameType(), StackFrame::ARGUMENTS_ADAPTOR);
+ if (!value.is_identical_to(marker)) {
+ if (previously_materialized_objects->get(i) == *marker) {
+ previously_materialized_objects->set(i, *value);
+ value_changed = true;
+ } else {
+ DCHECK(previously_materialized_objects->get(i) == *value);
+ }
+ }
}
-
- parameters_count_ = output_frame->ComputeParametersCount();
- parameters_ = new Object*[parameters_count_];
- for (int i = 0; i < parameters_count_; i++) {
- SetParameter(i, output_frame->GetParameter(i));
+ if (new_store && value_changed) {
+ materialized_store->Set(stack_frame_pointer_,
+ previously_materialized_objects);
+ DCHECK(frames_[0].kind() == TranslatedFrame::Function);
+ Deoptimizer::DeoptimizeFunction(*(frames_[0].function()));
}
}
-DeoptimizedFrameInfo::~DeoptimizedFrameInfo() {
- delete[] expression_stack_;
- delete[] parameters_;
-}
-
+void TranslatedState::UpdateFromPreviouslyMaterializedObjects() {
+ MaterializedObjectStore* materialized_store =
+ isolate_->materialized_object_store();
+ Handle<FixedArray> previously_materialized_objects =
+ materialized_store->Get(stack_frame_pointer_);
-void DeoptimizedFrameInfo::Iterate(ObjectVisitor* v) {
- v->VisitPointer(bit_cast<Object**>(&function_));
- v->VisitPointer(&context_);
- v->VisitPointers(parameters_, parameters_ + parameters_count_);
- v->VisitPointers(expression_stack_, expression_stack_ + expression_count_);
-}
+ // If we have no previously materialized objects, there is nothing to do.
+ if (previously_materialized_objects.is_null()) return;
+ Handle<Object> marker = isolate_->factory()->arguments_marker();
-const char* Deoptimizer::GetDeoptReason(DeoptReason deopt_reason) {
- DCHECK(deopt_reason < kLastDeoptReason);
-#define DEOPT_MESSAGES_TEXTS(C, T) T,
- static const char* deopt_messages_[] = {
- DEOPT_MESSAGES_LIST(DEOPT_MESSAGES_TEXTS)};
-#undef DEOPT_MESSAGES_TEXTS
- return deopt_messages_[deopt_reason];
-}
+ int length = static_cast<int>(object_positions_.size());
+ DCHECK_EQ(length, previously_materialized_objects->length());
+ for (int i = 0; i < length; i++) {
+ // For a previously materialized objects, inject their value into the
+ // translated values.
+ if (previously_materialized_objects->get(i) != *marker) {
+ TranslatedState::ObjectPosition pos = object_positions_[i];
+ TranslatedValue* value_info =
+ &(frames_[pos.frame_index_].values_[pos.value_index_]);
+ DCHECK(value_info->IsMaterializedObject());
-Deoptimizer::DeoptInfo Deoptimizer::GetDeoptInfo(Code* code, Address pc) {
- SourcePosition last_position = SourcePosition::Unknown();
- Deoptimizer::DeoptReason last_reason = Deoptimizer::kNoReason;
- int mask = RelocInfo::ModeMask(RelocInfo::DEOPT_REASON) |
- RelocInfo::ModeMask(RelocInfo::POSITION);
- for (RelocIterator it(code, mask); !it.done(); it.next()) {
- RelocInfo* info = it.rinfo();
- if (info->pc() >= pc) return DeoptInfo(last_position, NULL, last_reason);
- if (info->rmode() == RelocInfo::POSITION) {
- int raw_position = static_cast<int>(info->data());
- last_position = raw_position ? SourcePosition::FromRaw(raw_position)
- : SourcePosition::Unknown();
- } else if (info->rmode() == RelocInfo::DEOPT_REASON) {
- last_reason = static_cast<Deoptimizer::DeoptReason>(info->data());
+ value_info->value_ =
+ Handle<Object>(previously_materialized_objects->get(i), isolate_);
}
}
- return DeoptInfo(SourcePosition::Unknown(), NULL, Deoptimizer::kNoReason);
}
+
} // namespace internal
} // namespace v8
« src/deoptimizer.h ('K') | « src/deoptimizer.h ('k') | src/ia32/lithium-codegen-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698