mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-03 09:50:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

interpret.cc (continue1): [insn_invokevirtual] Do an explicit null pointer check.

Browse Source 
2001-02-12  Jeff Sturm  <jeff.sturm@commerceone.com>
            Tom Tromey  <tromey@redhat.com>

	* interpret.cc (continue1): [insn_invokevirtual] Do an explicit
	null pointer check.

Co-Authored-By: Tom Tromey <tromey@redhat.com>

From-SVN: r39607
This commit is contained in:
Jeff Sturm 2001-02-12 17:30:00 +00:00 committed by Tom Tromey
parent 7004b11bf0
commit c6b33a47ea
2 changed files with 12 additions and 2 deletions

6
libjava/ChangeLog

@ -1,3 +1,9 @@
2001-02-12 Jeff Sturm <jeff.sturm@commerceone.com>
Tom Tromey <tromey@redhat.com>
* interpret.cc (continue1): [insn_invokevirtual] Do an explicit
null pointer check.
2001-02-09 Tom Tromey <tromey@redhat.com>
* java/util/Timer.java: New version from Classpath.

8
libjava/interpret.cc

@ -1,6 +1,6 @@
// interpret.cc - Code for the interpreter
/* Copyright (C) 1999, 2000 Free Software Foundation
/* Copyright (C) 1999, 2000, 2001 Free Software Foundation
This file is part of libgcj.
@ -678,7 +678,11 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
rmeth = (_Jv_ResolvePoolEntry (defining_class, index)).rmethod;
sp -= rmeth->stack_item_count;
NULLCHECK (sp[0].o);
// We don't use NULLCHECK here because we can't rely on that
// working if the method is final. So instead we do an
// explicit test.
if (! sp[0].o)
throw new java::lang::NullPointerException ();
if (rmeth->vtable_index == -1)
{