From 7c3637af676c999a6fc8233838c5453b5d864641 Mon Sep 17 00:00:00 2001 From: tromey Date: Tue, 16 May 2006 22:06:25 +0000 Subject: [PATCH] * verify-impl.c (verify_instructions_0) : Special case for Object.. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113830 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/java/ChangeLog | 5 +++++ gcc/java/verify-impl.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 3d2e47cc168..46777907a69 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2006-05-16 Tom Tromey + + * verify-impl.c (verify_instructions_0) : Special case + for Object.. + 2006-05-16 H.J. Lu PR driver/26885 diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c index fc154076279..f672fcf7881 100644 --- a/gcc/java/verify-impl.c +++ b/gcc/java/verify-impl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation This file is part of libgcj. @@ -2887,9 +2887,11 @@ verify_instructions_0 (void) invalidate_pc (); break; case op_return: - /* We only need to check this when the return type is - void, because all instance initializers return void. */ - if (this_is_init) + /* We only need to check this when the return type is void, + because all instance initializers return void. We also + need to special-case Object constructors, as they can't + call a superclass . */ + if (this_is_init && vfr->current_class != vfy_object_type ()) state_check_this_initialized (vfr->current_state); check_return_type (make_type (void_type)); invalidate_pc (); -- 2.11.4.GIT