Patch for allowing several V8 instances in process:...

src/jump-target.h

 // Copyright 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 20 matching lines @@
 #include "macro-assembler.h"
 
 namespace v8 {
 namespace internal {
 
 // Forward declarations.
 class FrameElement;
 class Result;
 class VirtualFrame;
 
+typedef ZoneList<Handle<Object> > ZoneObjectList;
+
+class CodeGeneratorData {
+  CodeGenerator* top_;
+  bool compiling_deferred_code_;
+  ZoneObjectList* result_constants_list_;
+  ZoneObjectList* frame_element_constants_list_;
+
+  ZoneObjectList* result_constants_list();
+  ZoneObjectList* frame_element_constants_list();
+
+  friend class CodeGeneratorScope;
+  friend class JumpTarget;
+  friend class V8Context;
+  friend class Result;
+  friend class FrameElement;
+
+  CodeGeneratorData();
+  ~CodeGeneratorData();
+
+  DISALLOW_COPY_AND_ASSIGN(CodeGeneratorData);
+};
+
 // -------------------------------------------------------------------------
 // Jump targets
 //
 // A jump target is an abstraction of a basic-block entry in generated
 // code.  It collects all the virtual frames reaching the block by
 // forward jumps and pairs them with labels for the merge code along
 // all forward-reaching paths.  When bound, an expected frame for the
 // block is determined and code is generated to merge to the expected
 // frame.  For backward jumps, the merge code is generated at the edge
 // leaving the predecessor block.
@@ skipping 71 matching lines @@
   virtual void Bind();
   virtual void Bind(Result* arg);
 
   // Emit a call to a jump target.  There must be a current frame at
   // the call.  The frame at the target is the same as the current
   // frame except for an extra return address on top of it.  The frame
   // after the call is the same as the frame before the call.
   void Call();
 
   static void set_compiling_deferred_code(bool flag) {
-    compiling_deferred_code_ = flag;
+    v8_context()->code_generator_data_.compiling_deferred_code_ = flag;
   }
 
  protected:
   // Directionality flag set at initialization time.
   Directionality direction_;
 
   // A list of frames reaching this block via forward jumps.
   ZoneList<VirtualFrame*> reaching_frames_;
 
   // A parallel list of labels for merge code.
   ZoneList<Label> merge_labels_;
 
   // The frame used on entry to the block and expected at backward
   // jumps to the block.  Set when the jump target is bound, but may
   // or may not be set for forward-only blocks.
   VirtualFrame* entry_frame_;
 
   // The actual entry label of the block.
   Label entry_label_;
 
   // Implementations of Jump, Branch, and Bind with all arguments and
   // return values using the virtual frame.
   void DoJump();
   void DoBranch(Condition cc, Hint hint);
   void DoBind();
 
  private:
-  static bool compiling_deferred_code_;
 
   // Add a virtual frame reaching this labeled block via a forward jump,
   // and a corresponding merge code label.
   void AddReachingFrame(VirtualFrame* frame);
 
   // Perform initialization required during entry frame computation
   // after setting the virtual frame element at index in frame to be
   // target.
   inline void InitializeEntryElement(int index, FrameElement* target);
 
@@ skipping 99 matching lines @@
   bool is_shadowing_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ShadowTarget);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_JUMP_TARGET_H_