infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-01 14:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

8273278: Support XSLT on GraalVM Native Image--deterministic bytecode generation in XSLT

Browse Source 
Reviewed-by: joehw
This commit is contained in:
jovanstevanovic 2021-09-10 19:13:20 +00:00 committed by Joe Wang
parent 5e1df2c7d7
commit f690a01f1e
4 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -33,6 +33,7 @@ import com.sun.org.apache.xml.internal.serializer.ElemDesc;
import com.sun.org.apache.xml.internal.serializer.ToHTMLStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
@ -42,7 +43,7 @@ import java.util.Set;
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
* @LastModified: Oct 2017
* @LastModified: Sep 2021
*/
final class LiteralElement extends Instruction {
@ -202,7 +203,7 @@ final class LiteralElement extends Instruction {
* to _ANY_ namespace URI. Used by literal result elements to determine
*/
public Set<Map.Entry<String, String>> getNamespaceScope(SyntaxTreeNode node) {
Map<String, String> all = new HashMap<>();
Map<String, String> all = new LinkedHashMap<>();
while (node != null) {
Map<String, String> mapping = node.getPrefixMapping();

17
src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -48,6 +48,7 @@ import com.sun.org.apache.xml.internal.dtm.Axis;
import com.sun.org.apache.xml.internal.dtm.DTM;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@ -62,7 +63,7 @@ import java.util.Set;
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author G. Todd Miller
* @LastModified: Nov 2017
* @LastModified: Sep 2021
*/
final class Mode implements Constants {
@ -129,13 +130,15 @@ final class Mode implements Constants {
/**
* A mapping between templates and test sequences.
* {@link LinkedHashMap} is necessary to make traversal order consistent across runs.
*/
private Map<Template, Object> _neededTemplates = new HashMap<>();
private Map<Template, Object> _neededTemplates = new LinkedHashMap<>();
/**
* A mapping between named templates and Mode objects.
* {@link LinkedHashMap} is necessary to make traversal order consistent across runs.
*/
private Map<Template, Mode> _namedTemplates = new HashMap<>();
private Map<Template, Mode> _namedTemplates = new LinkedHashMap<>();
/**
* A mapping between templates and instruction handles.
@ -198,7 +201,7 @@ final class Mode implements Constants {
public String functionName(int min, int max) {
if (_importLevels == null) {
_importLevels = new HashMap<>();
_importLevels = new LinkedHashMap<>();
}
_importLevels.put(max, min);
return _methodName + '_' + max;
@ -1053,8 +1056,8 @@ final class Mode implements Constants {
final List<String> names = xsltc.getNamesIndex();
// Clear some datastructures
_namedTemplates = new HashMap<>();
_neededTemplates = new HashMap<>();
_namedTemplates = new LinkedHashMap<>();
_neededTemplates = new LinkedHashMap<>();
_templateIHs = new HashMap<>();
_templateILs = new HashMap<>();
_patternGroups = (List<LocationPathPattern>[])new ArrayList[32];

6
src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -53,7 +53,7 @@ import java.util.List;
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @LastModified: Nov 2017
* @LastModified: Sep 2021
*/
final class Number extends Instruction implements Closure {
private static final int LEVEL_SINGLE = 0;
@ -383,7 +383,7 @@ final class Number extends Instruction implements Closure {
_className = getXSLTC().getHelperClassName();
nodeCounterGen = new NodeCounterGenerator(_className,
ClassNames[_level],
toString(),
getClass().getName(), // Name of this node should be consistent across runs.
ACC_PUBLIC | ACC_SUPER,
null,
classGen.getStylesheet());

11
src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -67,6 +67,7 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@ -75,7 +76,7 @@ import java.util.Stack;
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @LastModified: July 2019
* @LastModified: Sep 2021
*/
public class MethodGenerator extends MethodGen
implements com.sun.org.apache.xalan.internal.xsltc.compiler.Constants {
@ -283,7 +284,7 @@ public class MethodGenerator extends MethodGen
/**
* Maps a name to a {@link LocalVariableGen}
*/
protected Map<String, Object> _nameToLVGMap = new HashMap<>();
protected Map<String, Object> _nameToLVGMap = new LinkedHashMap<>();
/**
* Registers a {@link org.apache.bcel.generic.LocalVariableGen}
@ -1330,8 +1331,8 @@ public class MethodGenerator extends MethodGen
// to local variables in the outlined method.
HashMap<LocalVariableGen, LocalVariableGen> localVarMap = new HashMap<>();
HashMap<LocalVariableGen, InstructionHandle> revisedLocalVarStart = new HashMap<>();
HashMap<LocalVariableGen, InstructionHandle> revisedLocalVarEnd = new HashMap<>();
HashMap<LocalVariableGen, InstructionHandle> revisedLocalVarStart = new LinkedHashMap<>();
HashMap<LocalVariableGen, InstructionHandle> revisedLocalVarEnd = new LinkedHashMap<>();
// Pass 1: Make copies of all instructions, append them to the new list
// and associate old instruction references with the new ones, i.e.,