procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR java/5165 (Loading class fields with a ConstantValue attribute)

Browse source 
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
This commit is contained in:
Tom Tromey 2001-12-21 21:59:27 +00:00 • committed by Tom Tromey
parent 655781b7af
commit d47eb5d3f2
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,5 +1,10 @@
2001-12-21 Tom Tromey <tromey@redhat.com>
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.

8
libjava/java/lang/natClassLoader.cc
View file

@ -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)