--- old/src/share/vm/oops/method.hpp	2013-03-21 10:59:51.627439068 +0100
+++ new/src/share/vm/oops/method.hpp	2013-03-21 10:59:51.458993529 +0100
@@ -273,9 +273,9 @@
 
   // max stack
   // return original max stack size for method verification
-  int  verifier_max_stack() const                { return constMethod()->max_stack(); }
-  int           max_stack() const                { return constMethod()->max_stack() + extra_stack_entries(); }
-  void      set_max_stack(int size)              {        constMethod()->set_max_stack(size); }
+  int  verifier_max_stack() const                { return constMethod()->max_stack() - extra_stack_entries(); }
+  int           max_stack() const                { return constMethod()->max_stack(); }
+  void      set_max_stack(int size)              {        constMethod()->set_max_stack(size + extra_stack_entries()); }
 
   // max locals
   int  max_locals() const                        { return constMethod()->max_locals(); }
@@ -628,10 +628,8 @@
   static Klass* check_non_bcp_klass(Klass* klass);
   // these operate only on invoke methods:
   // presize interpreter frames for extra interpreter stack entries, if needed
-  // method handles want to be able to push a few extra values (e.g., a bound receiver), and
-  // invokedynamic sometimes needs to push a bootstrap method, call site, and arglist,
-  // all without checking for a stack overflow
-  static int extra_stack_entries() { return EnableInvokeDynamic ? 2 : 0; }
+  // Account for the extra appendix argument for invokehandle/invokedynamic
+  static int extra_stack_entries() { return EnableInvokeDynamic ? 1 : 0; }
   static int extra_stack_words();  // = extra_stack_entries() * Interpreter::stackElementSize()
 
   // RedefineClasses() support: