Mercurial > hg > shark > hotspot
changeset 2575:266d7c5a4b50 default tip
Merge
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Tue, 12 Apr 2011 14:03:10 +0100 |
| parents | 8f28c5ab24b3 (diff) 4b95bbb36464 (current diff) |
| children | |
| files | src/cpu/zero/vm/bytecodeInterpreter_zero.hpp src/cpu/zero/vm/cppInterpreter_zero.cpp src/cpu/zero/vm/cppInterpreter_zero.hpp src/cpu/zero/vm/interpreter_zero.cpp src/cpu/zero/vm/methodHandles_zero.cpp src/share/vm/interpreter/bytecodeInterpreter.cpp src/share/vm/interpreter/bytecodeInterpreter.hpp |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp Tue Apr 12 02:40:23 2011 -0700 +++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp Tue Apr 12 14:03:10 2011 +0100 @@ -2352,6 +2352,7 @@ } callee = (methodOop) cache->f1(); } + CHECK_NULL(callee); istate->set_callee(callee); istate->set_callee_entry_point(callee->from_interpreted_entry());