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

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 93a23bce13d4bc53839bf9bb1158f706315aaaba..cfe7f4ab5ee3ec037dded9b8ea8fbe60b69106f8 100644 (file)
--- a/libjava/ChangeLog
+++ b/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.

diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index 0a069ac4e1cc2efcefce87e0738c521e625190b0..aba1e2f966e38d67a15f2971e96ee824d50b7eaf 100644 (file)
--- a/libjava/interpret.cc
+++ b/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)
          {