Part of patch for XALANJ-1324 and others.
Removed code that was removing xsl:variable declarations from the list of
children of the LRE. This caused problems with annotating LocalVariableGen
objects with the range of instructions over which the variable is actually
alive. This is in support of method splitting and outlining.
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/LiteralElement.java b/src/org/apache/xalan/xsltc/compiler/LiteralElement.java
index 88e5bc8..47f3398 100644
--- a/src/org/apache/xalan/xsltc/compiler/LiteralElement.java
+++ b/src/org/apache/xalan/xsltc/compiler/LiteralElement.java
@@ -340,23 +340,14 @@
il.append(methodGen.startElement());
// The value of an attribute may depend on a (sibling) variable
- int j=0;
- while (j < elementCount())
- {
- final SyntaxTreeNode item = (SyntaxTreeNode) elementAt(j);
- if (item instanceof Variable) {
- item.translate(classGen, methodGen);
- removeElement(item); // avoid translating it twice
- /* When removing an element we do not increment j
- * but the removal will reduce the value of elementCount()
- * so this loop WILL end. The next iteration will process
- * elementAt(j), but with the old element removed
- * we are actually processing the next element.
- */
- }
- else
+ int j=0;
+ while (j < elementCount()) {
+ final SyntaxTreeNode item = (SyntaxTreeNode) elementAt(j);
+ if (item instanceof Variable) {
+ item.translate(classGen, methodGen);
+ }
j++;
- }
+ }
// Compile code to emit namespace attributes
if (_accessedPrefixes != null) {
