Fix OSR for nested loops.

src/deoptimizer.h

 // Copyright 2012 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 192 matching lines @@
 
   static void VisitAllOptimizedFunctionsForContext(
       Context* context, OptimizedFunctionVisitor* visitor);
 
   static void VisitAllOptimizedFunctions(Isolate* isolate,
                                          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
+  // Patch all interrupts with allowed loop depth in the unoptimized code to
   // unconditionally call replacement_code.
-  static void PatchStackCheckCode(Code* unoptimized_code,
-                                  Code* check_code,
-                                  Code* replacement_code);
+  static void PatchInterruptCode(Code* unoptimized_code,
+                                 Code* interrupt_code,
+                                 Code* replacement_code);
 
-  // Patch stack guard check at instruction before pc_after in
+  // Patch interrupts at instruction before pc_after in
   // the unoptimized code to unconditionally call replacement_code.
-  static void PatchStackCheckCodeAt(Code* unoptimized_code,
+  static void PatchInterruptCodeAt(Code* unoptimized_code,
+                                   Address pc_after,
+                                   Code* interrupt_code,
+                                   Code* replacement_code);
+
+  // Change all patched interrupts patched in the unoptimized code
+  // back to a normal interrupts.

[Jakob Kummerow, 2013/04/09 17:23:25]

nit: s/interrupts/interrupt/

[Yang, 2013/04/10 08:08:30]

Done.

+  static void RevertInterruptCode(Code* unoptimized_code,
+                                   Code* interrupt_code,

[Jakob Kummerow, 2013/04/09 17:23:25]

nit: indentation

[Yang, 2013/04/10 08:08:30]

Done.

+                                   Code* replacement_code);
+
+  // Change patched interrupt in the unoptimized code
+  // back to a normal interrupts.

[Jakob Kummerow, 2013/04/09 17:23:25]

nit: s/interrupts/interrupt/

[Yang, 2013/04/10 08:08:30]

Done.

+  static void RevertInterruptCodeAt(Code* unoptimized_code,
                                     Address pc_after,
-                                    Code* check_code,
+                                    Code* interrupt_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);
+#ifdef DEBUG
+  static bool InterruptCodeIsPatched(Code* unoptimized_code,
+                                     Address pc_after,
+                                     Code* interrupt_code,
+                                     Code* replacement_code);
 
-  // Change all patched stack guard checks in the unoptimized code
-  // back to a normal stack guard check.
-  static void RevertStackCheckCodeAt(Code* unoptimized_code,
-                                     Address pc_after,
-                                     Code* check_code,
-                                     Code* replacement_code);
+  // Verify that all back edges of a certain loop depth are patched.
+  static void VerifyInterruptCode(Code* unoptimized_code,
+                                  Code* interrupt_code,
+                                  Code* replacement_code,
+                                  int loop_nesting_level);
+#endif  // DEBUG
 
   ~Deoptimizer();
 
   void MaterializeHeapObjects(JavaScriptFrameIterator* it);
 #ifdef ENABLE_DEBUGGER_SUPPORT
   void MaterializeHeapNumbersForDebuggerInspectableFrame(
       Address parameters_top,
       uint32_t parameters_size,
       Address expressions_top,
       uint32_t expressions_size,
@@ skipping 182 matching lines @@
   // Array of output frame descriptions.
   FrameDescription** output_;
 
   List<Object*> deferred_arguments_objects_values_;
   List<ArgumentsObjectMaterializationDescriptor> deferred_arguments_objects_;
   List<HeapNumberMaterializationDescriptor> deferred_heap_numbers_;
 
   bool trace_;
 
   static const int table_entry_size_;
+  static const int kBackEdgeEntrySize = 2 * kIntSize + kOneByteSize;

[Jakob Kummerow, 2013/04/09 17:23:25]

This constant belongs close to the definition of the BackEdgeEntry struct in
objects.h. Is there any reason you can't move it there, and remove it both here,
in objects.cc and in runtime.cc?

[Yang, 2013/04/10 08:08:30]

Done.

 
   friend class FrameDescription;
   friend class DeoptimizingCodeListNode;
   friend class DeoptimizedFrameInfo;
 };
 
 
 class FrameDescription {
  public:
   FrameDescription(uint32_t frame_size,
@@ skipping 453 matching lines @@
   Object** expression_stack_;
   int source_position_;
 
   friend class Deoptimizer;
 };
 #endif
 
 } }  // namespace v8::internal
 
 #endif  // V8_DEOPTIMIZER_H_