Part of patch for XALANJ-1324 and others.
References to serializer methods in byte code generated for xsl:message were
using virtual method invocation on ToXMLStream. This causes problems for
method outlining, as the variable involved is marked as being of type
SerializationHandler. If this part of a method is outlined, the value will
be copied into the outlined method as a SerializationHandler, and the JVM's byte
code verifier will report an VerifyError for the references to the virtual
methods on ToXMLStream.
Replaced virtual method references on ToXMLStream with equivalent interface
method references on SerializationHandler. Though the performance could be
slightly worse, performance is probably not of great importance for xsl:message.
See org.apache.xalan.xsltc.compiler.util.MethodGenerator.outlineChunks for more
information.
Patch reviewed by Christine Li and Erin Harris.
diff --git a/src/org/apache/xalan/xsltc/compiler/Message.java b/src/org/apache/xalan/xsltc/compiler/Message.java
index f4bc54d..d5fd918 100644
--- a/src/org/apache/xalan/xsltc/compiler/Message.java
+++ b/src/org/apache/xalan/xsltc/compiler/Message.java
@@ -20,6 +20,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
import org.apache.bcel.generic.INVOKESPECIAL;
import org.apache.bcel.generic.INVOKEVIRTUAL;
import org.apache.bcel.generic.InstructionList;
@@ -93,36 +94,41 @@
// Invoke output.setWriter(STRING_WRITER)
il.append(methodGen.loadHandler());
il.append(SWAP);
- il.append(new INVOKEVIRTUAL(
- cpg.addMethodref(OUTPUT_BASE, "setWriter",
- "("+WRITER_SIG+")V")));
+ il.append(new INVOKEINTERFACE(
+ cpg.addInterfaceMethodref(TRANSLET_OUTPUT_INTERFACE,
+ "setWriter",
+ "("+WRITER_SIG+")V"), 2));
// Invoke output.setEncoding("UTF-8")
il.append(methodGen.loadHandler());
il.append(new PUSH(cpg, "UTF-8")); // other encodings?
- il.append(new INVOKEVIRTUAL(
- cpg.addMethodref(OUTPUT_BASE, "setEncoding",
- "("+STRING_SIG+")V")));
+ il.append(new INVOKEINTERFACE(
+ cpg.addInterfaceMethodref(TRANSLET_OUTPUT_INTERFACE,
+ "setEncoding",
+ "("+STRING_SIG+")V"), 2));
// Invoke output.setOmitXMLDeclaration(true)
il.append(methodGen.loadHandler());
il.append(ICONST_1);
- il.append(new INVOKEVIRTUAL(
- cpg.addMethodref(OUTPUT_BASE, "setOmitXMLDeclaration",
- "(Z)V")));
+ il.append(new INVOKEINTERFACE(
+ cpg.addInterfaceMethodref(TRANSLET_OUTPUT_INTERFACE,
+ "setOmitXMLDeclaration",
+ "(Z)V"), 2));
il.append(methodGen.loadHandler());
- il.append(new INVOKEVIRTUAL(
- cpg.addMethodref(OUTPUT_BASE, "startDocument",
- "()V")));
+ il.append(new INVOKEINTERFACE(
+ cpg.addInterfaceMethodref(TRANSLET_OUTPUT_INTERFACE,
+ "startDocument",
+ "()V"), 1));
// Inline translation of contents
translateContents(classGen, methodGen);
il.append(methodGen.loadHandler());
- il.append(new INVOKEVIRTUAL(
- cpg.addMethodref(OUTPUT_BASE, "endDocument",
- "()V")));
+ il.append(new INVOKEINTERFACE(
+ cpg.addInterfaceMethodref(TRANSLET_OUTPUT_INTERFACE,
+ "endDocument",
+ "()V"), 1));
// Call toString() on StringWriter
il.append(new INVOKEVIRTUAL(
