This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: avoid trampolies in java.io
- From: Tom Tromey <tromey at redhat dot com>
- To: classpath-patches at gnu dot org
- Cc: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 06 Nov 2004 15:54:03 -0700
- Subject: Patch: FYI: avoid trampolies in java.io
- Reply-to: tromey at redhat dot com
I'm checking this in to classpath and libgcj (except the
DeleteFileHelper part, libgcj doesn't have this).
This lets us avoid trampolines in java.io.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* java/io/ObjectOutputStream.java (currentObjectStreamClass): Now
package-private.
(setBlockDataMode): Likewise.
* java/io/DeleteFileHelper.java (DeleteFileHelper): Now
package-private.
Index: java/io/ObjectOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectOutputStream.java,v
retrieving revision 1.50
diff -u -r1.50 ObjectOutputStream.java
--- java/io/ObjectOutputStream.java 3 Nov 2004 17:40:12 -0000 1.50
+++ java/io/ObjectOutputStream.java 6 Nov 2004 22:56:13 -0000
@@ -1239,7 +1239,8 @@
// Toggles writing primitive data to block-data buffer.
- private boolean setBlockDataMode(boolean on) throws IOException
+ // Package-private to avoid a trampoline constructor.
+ boolean setBlockDataMode(boolean on) throws IOException
{
if (on == writeDataAsBlocks)
return on;
@@ -1563,7 +1564,8 @@
private byte[] blockData;
private int blockDataCount;
private Object currentObject;
- private ObjectStreamClass currentObjectStreamClass;
+ // Package-private to avoid a trampoline.
+ ObjectStreamClass currentObjectStreamClass;
private PutField currentPutField;
private boolean fieldsAlreadyWritten;
private boolean replacementEnabled;
Index: java/io/DeleteFileHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/DeleteFileHelper.java,v
retrieving revision 1.3
diff -u -r1.3 DeleteFileHelper.java
--- java/io/DeleteFileHelper.java 4 Sep 2004 18:13:44 -0000 1.3
+++ java/io/DeleteFileHelper.java 6 Nov 2004 22:56:13 -0000
@@ -97,7 +97,8 @@
}
}
- private DeleteFileHelper()
+ // Package-private to avoid a trampoline constructor.
+ DeleteFileHelper()
{
}