Deoptimizer support for hydrogen stubs that accept a variable number of arguments.

src/code-stubs.h

Index: src/code-stubs.h
diff --git a/src/code-stubs.h b/src/code-stubs.h
index e91b241579b0389aee2f373b262e80c0aefd7102..5529fb0a75c55962a62e546f0943dfafd7455ee4 100644
--- a/src/code-stubs.h
+++ b/src/code-stubs.h
@@ -263,11 +263,11 @@ struct CodeStubInterfaceDescriptor {
   CodeStubInterfaceDescriptor()
       : register_param_count_(-1),
         stack_parameter_count_(NULL),
-        extra_expression_stack_count_(0),
+        acting_as_js_function_(false),
         register_params_(NULL) { }
   int register_param_count_;
   const Register* stack_parameter_count_;
-  int extra_expression_stack_count_;
+  bool acting_as_js_function_;

[danno, 2013/03/22 14:06:50]

Can you please turn this bool into an enum?

[mvstanton, 2013/04/02 07:43:12]

Done.

   Register* register_params_;
   Address deoptimization_handler_;
 
@@ -1570,10 +1570,8 @@ class StoreArrayLiteralElementStub : public PlatformCodeStub {
 
 class StubFailureTrampolineStub : public PlatformCodeStub {
  public:
-  static const int kMaxExtraExpressionStackCount = 1;
-
-  explicit StubFailureTrampolineStub(int extra_expression_stack_count)
-      : extra_expression_stack_count_(extra_expression_stack_count) {}
+  explicit StubFailureTrampolineStub(bool acting_as_js_function)
+      : acting_as_js_function_(acting_as_js_function) {}
 
   virtual bool IsPregenerated() { return true; }
 
@@ -1581,11 +1579,11 @@ class StubFailureTrampolineStub : public PlatformCodeStub {
 
  private:
   Major MajorKey() { return StubFailureTrampoline; }
-  int MinorKey() { return extra_expression_stack_count_; }
+  int MinorKey() { return acting_as_js_function_; }
 
   void Generate(MacroAssembler* masm);
 
-  int extra_expression_stack_count_;
+  bool acting_as_js_function_;
 
   DISALLOW_COPY_AND_ASSIGN(StubFailureTrampolineStub);
 };