diff options
| author | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-01-18 19:11:15 +0000 |
|---|---|---|
| committer | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-01-18 19:11:15 +0000 |
| commit | 841874f8d7f6408b3d65a784af741c2dc7c40b25 (patch) | |
| tree | 6e423098942edd6f114e8f8bf8b5dc8f3c051ffe /libjava | |
| parent | 2eefde6dc4e8ea1d7e1720b93b2f9799421c66b1 (diff) | |
| download | gcc-841874f8d7f6408b3d65a784af741c2dc7c40b25.tar.gz | |
PR c++/33887
* link.cc (_Jv_Linker::prepare_constant_time_tables):
has_interfaces is boolean, treat it as such.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131632 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/link.cc | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 207248ff871..ab4058775b3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2008-01-18 Alexandre Oliva <aoliva@redhat.com> + + PR c++/33887 + * link.cc (_Jv_Linker::prepare_constant_time_tables): + has_interfaces is boolean, treat it as such. + 2008-01-04 Andrew Haley <aph@redhat.com> PR libgcj/34444 diff --git a/libjava/link.cc b/libjava/link.cc index 3b4f37d1d3c..d6fd2ddafbd 100644 --- a/libjava/link.cc +++ b/libjava/link.cc @@ -1,6 +1,7 @@ // link.cc - Code for linking and resolving classes and pool entries. -/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation +/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation This file is part of libgcj. @@ -662,10 +663,11 @@ _Jv_Linker::prepare_constant_time_tables (jclass klass) // interfaces or primitive types. jclass klass0 = klass; - jboolean has_interfaces = 0; + jboolean has_interfaces = false; while (klass0 != &java::lang::Object::class$) { - has_interfaces += klass0->interface_count; + if (klass0->interface_count) + has_interfaces = true; klass0 = klass0->superclass; klass->depth++; } |