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

[multiple changes]

Browse source 
2005-02-21  Bryce McKinlay  <mckinlay@redhat.com>

	Merge serialization from GNU Classpath.
	* gcj/method.h: Add missing #includes.
	* java/io/ObjectInputStream.java (readClassDescriptor): Check for
	primitive class IDs on the stream here...
	(resolveClass): ...not here.
	* java/io/ObjectStreamField.java: Use VMObjectStream class calls to set
	fields.
	* java/io/VMObjectStreamClass.java (setDoubleNative, setFloatNative,
	setLongNative, setIntNative, setShortNative, setCharNative,
	setByteNative, setBooleanNative, setObjectNative): New native methods.
	* java/io/natVMObjectStreamClass.java (setDoubleNative, setFloatNative,
	setLongNative, setIntNative, setShortNative, setCharNative,
	setByteNative, setBooleanNative, setObjectNative): Implement them.
	* java/io/natObjectInputStream.cc (allocateObject): Add new parameters
	from Classpath's version. Use _Jv_FromReflectedConstructor(). Call
	the constructor here.
	(callConstructor): Removed.
	(getCallersClassLoader): Removed.
	* java/lang/reflect/Field.java (setByte, setShort, setInt, setLong,
	setFloat, setDouble, setChar, setBoolean): Add 'checkFinal' parameter
	to control whether setting final field values is permitted. Call
	getAddr() with checkFinal parameter instead of setAddr().
	* java/lang/reflect/natField.cc (getType): Lookup and resolve field
	only if not done already.
	(getAddr): Add checkFinal parameter. Do the final field check only if
	checkFinal is set.
	(setAddr): Removed.

2005-02-21  Mark Wielaard  <mark@klomp.org>

	# Fixes bug #11957
	* java/io/ObjectInputStream.java (resolveClass): Don't check "void"
	twice.

2005-02-21  Mark Wielaard  <mark@klomp.org>

	Fixes bug #11618.
	* java/io/ObjectInputStream.java (readClassDescriptor): Handle classes
	without a super class and us ObjectStreamClass.lookupForClassObject().
	(resolveClass): Check for primitive types.
	(lookupClass): Return null when argument is null.

2005-02-21  Jeroen Frijters  <jeroen@frijters.net>

	* java/io/ObjectInputStream.java
	(readObject): Fix to consume TC_ENDBLOCKDATA after readExternal.

2005-02-21  Jeroen Frijters  <jeroen@frijters.net>

	* java/io/ObjectOutputStream.java
	(writeObject, callWriteMethod): Replaced reflection with accessing
	cached info in ObjectStreamClass.
	(getMethod): Removed.
	* java/io/ObjectStreamClass.java
	(findMethod): Added check to make sure the method found has the
	right modifiers.
	(cacheMethods): Added writeReplace and writeObject methods.
	(setFlags): Look at new writeObjectMethod field instead of doing
	reflection again.
	(writeReplaceMethod): New field.
	(writeObjectMethod): New field.

2005-02-21  Guilhem Lavaux  <guilhem@kaffe.org>
	Jeroen Frijters  <jeroen@frijters.net>

	* java/io/ObjectInputStream.java
	(newObject): Changed prototype. Get a constructor reflect object
	directly.
	(callConstructor): Removed.
	(allocateObject): Changed prototype.
	(readClassDescriptor): Build the constructor reflection directly.
	(readObject): Invoke newObject using the new prototype.

	* java/io/ObjectStreamClass.java
	(firstNonSerializableParent): Removed.
	(firstNonSerializableParentConstructor): Added.

From-SVN: r95378
This commit is contained in:
Bryce McKinlay 2005-02-22 03:13:35 +00:00
parent bb2e164049
commit f4294557b7
10 changed files with 454 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

64
libjava/java/io/natVMObjectStreamClass.cc
View file

@ -13,11 +13,75 @@ details. */
#include <java/io/VMObjectStreamClass.h>
#include <java/lang/Class.h>
#include <java/lang/reflect/Field.h>
using namespace java::lang::reflect;
jboolean
java::io::VMObjectStreamClass::hasClassInitializer (jclass klass)
{
if (klass->isPrimitive())
return false;
_Jv_Method *meth = _Jv_GetMethodLocal(klass, gcj::clinit_name,
gcj::void_signature);
return (meth != NULL);
}
void
java::io::VMObjectStreamClass::setDoubleNative (Field *f, jobject obj,
jdouble val)
{
f->setDouble (NULL, obj, val, false);
}
void
java::io::VMObjectStreamClass::setFloatNative (Field *f, jobject obj,
jfloat val)
{
f->setFloat (NULL, obj, val, false);
}
void
java::io::VMObjectStreamClass::setLongNative (Field *f, jobject obj, jlong val)
{
f->setLong (NULL, obj, val, false);
}
void
java::io::VMObjectStreamClass::setIntNative (Field *f, jobject obj, jint val)
{
f->setInt (NULL, obj, val, false);
}
void
java::io::VMObjectStreamClass::setShortNative (Field *f, jobject obj,
jshort val)
{
f->setShort (NULL, obj, val, false);
}
void
java::io::VMObjectStreamClass::setCharNative (Field *f, jobject obj, jchar val)
{
f->setChar (NULL, obj, val, false);
}
void
java::io::VMObjectStreamClass::setByteNative (Field *f, jobject obj, jbyte val)
{
f->setByte (NULL, obj, val, false);
}
void
java::io::VMObjectStreamClass::setBooleanNative (Field *f, jobject obj,
jboolean val)
{
f->setBoolean (NULL, obj, val, false);
}
void
java::io::VMObjectStreamClass::setObjectNative (Field *f, jobject obj,
jobject val)
{
f->set (NULL, obj, val, f->getType(), false);
}