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

Unified Diff: src/compiler/code-generator.cc

Issue 492203002: Initial support for debugger frame state in Turbofan. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Another attempt to fix Win64 Created 6 years, 4 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
Index: src/compiler/code-generator.cc
diff --git a/src/compiler/code-generator.cc b/src/compiler/code-generator.cc
index 75ca96daae7716ebb1e5782a2381d69cea87101c..5a5d9f9674fcc1203f12f81b47e0dc223a25b9e5 100644
--- a/src/compiler/code-generator.cc
+++ b/src/compiler/code-generator.cc
@@ -233,6 +233,34 @@ void CodeGenerator::PopulateDeoptimizationData(Handle<Code> code_object) {
}
+void CodeGenerator::AddSafepointAndDeopt(Instruction* instr) {
+ CallDescriptor::DeoptimizationSupport deopt =
+ static_cast<CallDescriptor::DeoptimizationSupport>(
+ MiscField::decode(instr->opcode()));
+
+ if ((deopt & CallDescriptor::kLazyDeoptimization) != 0) {
+ RecordLazyDeoptimizationEntry(instr);
+ }
+
+ bool needs_frame_state = (deopt & CallDescriptor::kNeedsFrameState) != 0;
+
+ RecordSafepoint(
+ instr->pointer_map(), Safepoint::kSimple, 0,
+ needs_frame_state ? Safepoint::kLazyDeopt : Safepoint::kNoLazyDeopt);
+
+ if ((deopt & CallDescriptor::kNeedsFrameState) != 0) {
+ // If the frame state is present, it starts at argument 1
+ // (just after the code address).
+ InstructionOperandConverter converter(this, instr);
+ // Argument 1 is deoptimization id.
+ int deoptimization_id = converter.ToConstant(instr->InputAt(1)).ToInt32();
+ // The actual frame state values start with argument 2.
+ BuildTranslation(instr, 2, deoptimization_id);
+ safepoints()->RecordLazyDeoptimizationIndex(deoptimization_id);
+ }
+}
+
+
void CodeGenerator::RecordLazyDeoptimizationEntry(Instruction* instr) {
InstructionOperandConverter i(this, instr);
@@ -264,6 +292,7 @@ int CodeGenerator::DefineDeoptimizationLiteral(Handle<Object> literal) {
void CodeGenerator::BuildTranslation(Instruction* instr,
+ int first_argument_index,
int deoptimization_id) {
// We should build translation only once.
DCHECK_EQ(NULL, deoptimization_states_[deoptimization_id]);
@@ -276,7 +305,8 @@ void CodeGenerator::BuildTranslation(Instruction* instr,
descriptor->size() - descriptor->parameters_count());
for (int i = 0; i < descriptor->size(); i++) {
- AddTranslationForOperand(&translation, instr, instr->InputAt(i));
+ AddTranslationForOperand(&translation, instr,
+ instr->InputAt(i + first_argument_index));
}
deoptimization_states_[deoptimization_id] =

Powered by Google App Engine
This is Rietveld 408576698