From a3130b6cafb8561f25255c77062ef4de6c982ae9 Mon Sep 17 00:00:00 2001 From: tromey Date: Sun, 4 Nov 2001 00:45:33 +0000 Subject: [PATCH] * defineclass.cc (handleClassBegin): Use Object::class$, not Class::class$, when initializing interface superclass. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46754 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/defineclass.cc | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2b4dd9e..c8e45d0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2001-11-03 Tom Tromey + + * defineclass.cc (handleClassBegin): Use Object::class$, not + Class::class$, when initializing interface superclass. + 2001-11-02 Hans Boehm * java/util/natResourceBundle.cc:getClassContext: return diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc index 85f6ce3..7a3efa5 100644 --- a/libjava/defineclass.cc +++ b/libjava/defineclass.cc @@ -915,12 +915,12 @@ _Jv_ClassReader::handleClassBegin // interfaces have java.lang.Object as super. if (access_flags & Modifier::INTERFACE) { - def->superclass = (jclass)&java::lang::Class::class$; + def->superclass = (jclass)&java::lang::Object::class$; } // FIXME: Consider this carefully! else if (!_Jv_equalUtf8Consts (def->name, - java::lang::Class::class$.name)) + java::lang::Object::class$.name)) { throw_no_class_def_found_error ("loading java.lang.Object"); } -- 2.7.4