Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/interpreter/bytecodeInterpreter.cpp	Wed Jun 26 00:40:13 2013 +0200
     1.2 +++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp	Mon Jun 24 16:11:47 2013 +0200
     1.3 @@ -481,9 +481,9 @@
     1.4      // So we have a second version of the assertion which handles the case where EnableInvokeDynamic was
     1.5      // switched off because of the wrong classes.
     1.6      if (EnableInvokeDynamic || FLAG_IS_CMDLINE(EnableInvokeDynamic)) {
     1.7 -      assert(abs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + 1), "bad stack limit");
     1.8 +      assert(labs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + 1), "bad stack limit");
     1.9      } else {
    1.10 -      const int extra_stack_entries = Method::extra_stack_entries_for_indy;
    1.11 +      const int extra_stack_entries = Method::extra_stack_entries_for_jsr292;
    1.12        assert(labs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + extra_stack_entries
    1.13                                                                                                 + 1), "bad stack limit");
    1.14      }
    1.15 @@ -2233,7 +2233,7 @@
    1.16          }
    1.17  
    1.18          Method* method = cache->f1_as_method();
    1.19 -        VERIFY_OOP(method);
    1.20 +        if (VerifyOops) method->verify();
    1.21  
    1.22          if (cache->has_appendix()) {
    1.23            ConstantPool* constants = METHOD->constants();
    1.24 @@ -2265,8 +2265,7 @@
    1.25          }
    1.26  
    1.27          Method* method = cache->f1_as_method();
    1.28 -
    1.29 -        VERIFY_OOP(method);
    1.30 +        if (VerifyOops) method->verify();
    1.31  
    1.32          if (cache->has_appendix()) {
    1.33            ConstantPool* constants = METHOD->constants();