From d47eb5d3f27cd5a42271366d82a4691ae5b931ee Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 21 Dec 2001 21:59:27 +0000 Subject: [PATCH] re PR java/5165 (Loading class fields with a ConstantValue attribute) Fix for PR java/5165: * java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): Convert any constant string field to a String; not just final fields. From-SVN: r48255 --- libjava/ChangeLog | 5 +++++ libjava/java/lang/natClassLoader.cc | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a9ce3528f8c..b4daf82ee9c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2001-12-21 Tom Tromey + Fix for PR java/5165: + * java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): + Convert any constant string field to a String; not just final + fields. + Fix for PR libgcj/2428: * java/lang/natClass.cc: Include RuntimePermission.h. (getClassLoader): Define. diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index a6f7b60e4c5..75d9e32ff2e 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -292,12 +292,10 @@ _Jv_PrepareCompiledClass (jclass klass) for (int n = JvNumStaticFields (klass); n > 0; --n) { int mod = f->getModifiers (); - // Maybe the compiler should mark these with - // _Jv_FIELD_CONSTANT_VALUE? For now we just know that this - // only happens for constant strings. + // If we have a static String field with a non-null initial + // value, we know it points to a Utf8Const. if (f->getClass () == &StringClass - && java::lang::reflect::Modifier::isStatic (mod) - && java::lang::reflect::Modifier::isFinal (mod)) + && java::lang::reflect::Modifier::isStatic (mod)) { jstring *strp = (jstring *) f->u.addr; if (*strp)