Experimental: thread live register references to deferred code....

src/codegen.cc

 // Copyright 2007-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 22 matching lines @@
 #include "prettyprinter.h"
 #include "scopeinfo.h"
 #include "runtime.h"
 #include "stub-cache.h"
 
 namespace v8 { namespace internal {
 
 DeferredCode::DeferredCode(CodeGenerator* generator)
   : masm_(generator->masm()),
     generator_(generator),
-    enter_(generator),
+    frame_(NULL),
     exit_(generator),
     statement_position_(masm_->last_statement_position()),
     position_(masm_->last_position()) {
   generator->AddDeferred(this);
 #ifdef DEBUG
   comment_ = "";
 #endif
 }
 
 
+void DeferredCode::BranchTo(Condition cc) {
+  // Set the register file and frame based on the first branch to the
+  // deferred code.
+  if (frame_ == NULL) {
+    generator()->allocator()->SaveTo(&registers_);
+    frame_ = new VirtualFrame(generator()->frame());
+  } else {
+    // The frame and register file must match the existing ones.
+    ASSERT(generator()->allocator()->Matches(&registers_));
+    ASSERT(generator()->frame()->Equals(frame_));
+  }
+
+  // Emit the branch.
+  masm_->j(cc, &enter_, not_taken);
+}
+
+
+void DeferredCode::BindExit() {
+  exit_.Bind();
+}
+
+void DeferredCode::ExitIfBound() {
+  if (exit_.is_bound()) {
+    // This backward jump will emit code to merge the code generator's
+    // current frame to the exit frame and then delete the current frame.
+    exit_.Jump();
+  } else {
+    // Don't leak the code generator's current frame.
+    generator()->DeleteFrame();
+  }
+}
+
+
 void CodeGenerator::ProcessDeferred() {
   while (!deferred_.is_empty()) {
     DeferredCode* code = deferred_.RemoveLast();
     MacroAssembler* masm = code->masm();
     // Record position of deferred code stub.
     if (code->statement_position() != RelocInfo::kNoPosition) {
       masm->RecordStatementPosition(code->statement_position());
     }
     if (code->position() != RelocInfo::kNoPosition) {
       masm->RecordPosition(code->position());
     }
     // Bind labels and generate the code.
-    code->enter()->Bind();
+    masm->bind(code->enter());
+    allocator()->RestoreFrom(code->registers());
+    // Transfer ownership of the deferred code's expected frame to the code
+    // generator.
+    SetFrame(code->frame());
+    code->clear_frame();
+    // For now, we spill before entering any deferred code.
     frame_->SpillAll();
     Comment cmnt(masm, code->comment());
     code->Generate();
-    if (code->exit()->is_bound()) {
-      code->exit()->Jump();
-    }
+    code->ExitIfBound();

[William Hesse, 2008/12/16 09:10:54]

Do we have any deferred code objects that don't return at the end, in which case
this would produce dead code?  Or does JumpTarget::Jump check for an empty
frame?

   }
 }
 
 
 // Generate the code. Takes a function literal, generates code for it, assemble
 // all the pieces into a Code object. This function is only to be called by
 // the compiler.cc code.
 Handle<Code> CodeGenerator::MakeCode(FunctionLiteral* flit,
                                      Handle<Script> script,
                                      bool is_eval) {
@@ skipping 408 matching lines @@
 void ArgumentsAccessStub::Generate(MacroAssembler* masm) {
   switch (type_) {
     case READ_LENGTH: GenerateReadLength(masm); break;
     case READ_ELEMENT: GenerateReadElement(masm); break;
     case NEW_OBJECT: GenerateNewObject(masm); break;
   }
 }
 
 
 } }  // namespace v8::internal