Simplify deferred code by removing some unneeded or redundant stuff.

src/codegen.h

 // Copyright 2006-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 34 matching lines @@
 //   allocator
 //   AddDeferred
 //   in_spilled_code
 //   set_in_spilled_code
 //
 // These methods are either used privately by the shared code or implemented as
 // shared code:
 //   CodeGenerator
 //   ~CodeGenerator
 //   ProcessDeferred
-//   ClearDeferred
 //   GenCode
 //   BuildBoilerplate
 //   ComputeCallInitialize
 //   ComputeCallInitializeInLoop
 //   ProcessDeclarations
 //   DeclareGlobals
 //   FindInlineRuntimeLUT
 //   CheckForInlineRuntimeCall
 //   PatchInlineRuntimeEntry
 //   GenerateFastCaseSwitchStatement
@@ skipping 43 matching lines @@
     ASSERT(top_ != NULL);
     return top_;
   }
 
  private:
   static CodeGenerator* top_;
   CodeGenerator* previous_;
 };
 
 
-// Use lazy compilation; defaults to true.
-// NOTE: Do not remove non-lazy compilation until we can properly
-//       install extensions with lazy compilation enabled. At the
-//       moment, this doesn't work for the extensions in Google3,
-//       and we can only run the tests with --nolazy.
-
-
 // Deferred code objects are small pieces of code that are compiled
 // out of line. They are used to defer the compilation of uncommon
 // paths thereby avoiding expensive jumps around uncommon code parts.
 class DeferredCode: public ZoneObject {
  public:
-  explicit DeferredCode(CodeGenerator* generator);
+  DeferredCode();
   virtual ~DeferredCode() { }
 
   virtual void Generate() = 0;
 
-  // Unuse the entry and exit targets, deallocating all virtual frames
-  // held by them.  It will be impossible to emit a (correct) jump
-  // into or out of the deferred code after clearing.
-  void Clear() {
-    enter_.Unuse();
-    exit_.Unuse();
-  }
-
-  MacroAssembler* masm() const { return masm_; }
-  CodeGenerator* generator() const { return generator_; }
+  CodeGenerator* cgen() const { return CodeGeneratorScope::Current(); }
 
   // Set the virtual frame for entry to the deferred code as a
   // snapshot of the code generator's current frame (plus additional
   // results).  This is optional, but should be done before branching
   // or jumping to the deferred code.
   inline void SetEntryFrame(Result* arg);
   inline void SetEntryFrame(Result* arg0, Result* arg1);
 
   JumpTarget* enter() { return &enter_; }
 
   void BindExit() { exit_.Bind(0); }
   void BindExit(Result* result) { exit_.Bind(result, 1); }
   void BindExit(Result* result0, Result* result1) {
     exit_.Bind(result0, result1, 2);
   }
   void BindExit(Result* result0, Result* result1, Result* result2) {
     exit_.Bind(result0, result1, result2, 3);
   }
 
   int statement_position() const { return statement_position_; }
   int position() const { return position_; }
 
 #ifdef DEBUG
   void set_comment(const char* comment) { comment_ = comment; }
   const char* comment() const { return comment_; }
 #else
-  inline void set_comment(const char* comment) { }
+  void set_comment(const char* comment) { }
   const char* comment() const { return ""; }
 #endif
 
  protected:
-  CodeGenerator* const generator_;
-  MacroAssembler* const masm_;
   JumpTarget enter_;
   JumpTarget exit_;
 
  private:
   int statement_position_;
   int position_;
 #ifdef DEBUG
   const char* comment_;
 #endif
   DISALLOW_COPY_AND_ASSIGN(DeferredCode);
@@ skipping 160 matching lines @@
     PrintF("ArgumentsAccessStub (type %d)\n", type_);
   }
 #endif
 };
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CODEGEN_H_