Merge revision 6500-6600 from bleeding_edge to the isolates branch.

src/deoptimizer.h

-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 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
 //       with the distribution.
@@ skipping 135 matching lines @@
   static void DeoptimizeGlobalObject(JSObject* object);
 
   static void VisitAllOptimizedFunctionsForContext(
       Context* context, OptimizedFunctionVisitor* visitor);
 
   static void VisitAllOptimizedFunctionsForGlobalObject(
       JSObject* object, OptimizedFunctionVisitor* visitor);
 
   static void VisitAllOptimizedFunctions(OptimizedFunctionVisitor* visitor);
 
+  // The size in bytes of the code required at a lazy deopt patch site.
+  static int patch_size();
+
   // Patch all stack guard checks in the unoptimized code to
   // unconditionally call replacement_code.
   static void PatchStackCheckCode(Code* unoptimized_code,
                                   Code* check_code,
                                   Code* replacement_code);
 
+  // Patch stack guard check at instruction before pc_after in
+  // the unoptimized code to unconditionally call replacement_code.
+  static void PatchStackCheckCodeAt(Address pc_after,
+                                    Code* check_code,
+                                    Code* replacement_code);
+
   // Change all patched stack guard checks in the unoptimized code
   // back to a normal stack guard check.
   static void RevertStackCheckCode(Code* unoptimized_code,
                                    Code* check_code,
                                    Code* replacement_code);
 
+  // Change all patched stack guard checks in the unoptimized code
+  // back to a normal stack guard check.
+  static void RevertStackCheckCodeAt(Address pc_after,
+                                     Code* check_code,
+                                     Code* replacement_code);
+
   ~Deoptimizer();
 
   void InsertHeapNumberValues(int index, JavaScriptFrame* frame);
 
   static void ComputeOutputFrames(Deoptimizer* deoptimizer, Isolate* isolate);
 
   static Address GetDeoptimizationEntry(int id, BailoutType type);
   static int GetDeoptimizationId(Address addr, BailoutType type);
   static int GetOutputInfo(DeoptimizationOutputData* data,
                            unsigned node_id,
@@ skipping 341 matching lines @@
   Handle<Code> code_;
 
   // Next pointer for linked list.
   DeoptimizingCodeListNode* next_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_DEOPTIMIZER_H_