pool/groovy18
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/groovy18?expand=0&rev=49

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-26 20:34:15 +00:00 committed by Git OBS Bridge
parent f78527acbe
commit 2ce0396a50
1 changed files with 121 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
groovy18-reproducible-bytecode.patch
View File

@ -1,3 +1,23 @@
--- groovy-core-GROOVY_1_8_9/src/main/groovy/lang/MetaClassImpl.java 2023-09-26 13:31:23.326209336 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/groovy/lang/MetaClassImpl.java 2023-09-26 22:32:37.407884437 +0200
@@ -135,7 +135,7 @@
private Index classPropertyIndexForSuper = new MethodIndex();
private final SingleKeyHashMap staticPropertyIndex = new SingleKeyHashMap();
- private final Map<String, MetaMethod> listeners = new HashMap<String, MetaMethod>();
+ private final Map<String, MetaMethod> listeners = new TreeMap<String, MetaMethod>();
private FastArray constructors;
private final List<MetaMethod> allMethods = new ArrayList<MetaMethod>();
private boolean initialized;
@@ -143,7 +143,7 @@
private final MetaProperty arrayLengthProperty = new MetaArrayLengthProperty();
private static final MetaMethod AMBIGUOUS_LISTENER_METHOD = new DummyMetaMethod();
private static final Object[] EMPTY_ARGUMENTS = {};
- private final Set<MetaMethod> newGroovyMethodsSet = new HashSet<MetaMethod>();
+ private final Set<MetaMethod> newGroovyMethodsSet = new LinkedHashSet<MetaMethod>();
private MetaMethod genericGetMethod;
private MetaMethod genericSetMethod;
--- groovy-core-GROOVY_1_8_9/src/main/groovy/util/ProxyGenerator.java 2023-09-26 13:31:23.332876047 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/groovy/util/ProxyGenerator.java 2023-09-26 22:14:38.014274779 +0200
@@ -96,7 +96,7 @@
@ -106,6 +126,107 @@
referencedClassVariables.put(var.getName(), var);
}
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java 2023-09-26 13:31:23.342876115 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java 2023-09-26 22:27:19.219143281 +0200
@@ -15,7 +15,7 @@
*/
package org.codehaus.groovy.classgen.asm;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Iterator;
import java.util.List;
@@ -54,12 +54,12 @@
protected interface UseExistingReference {}
- private HashMap<Expression,ClassNode> closureClassMap;
+ private LinkedHashMap<Expression,ClassNode> closureClassMap;
private WriterController controller;
public ClosureWriter(WriterController wc) {
this.controller = wc;
- closureClassMap = new HashMap<Expression,ClassNode>();
+ closureClassMap = new LinkedHashMap<Expression,ClassNode>();
}
public void writeClosure(ClosureExpression expression) {
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java 2023-09-26 13:31:23.342876115 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java 2023-09-26 22:29:22.783273049 +0200
@@ -16,7 +16,7 @@
package org.codehaus.groovy.classgen.asm;
import java.lang.reflect.Modifier;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
@@ -78,7 +78,7 @@
* @see #generateMopCalls(LinkedList, boolean)
*/
private void visitMopMethodList(List methods, boolean isThis) {
- HashMap<MopKey, MethodNode> mops = new HashMap<MopKey, MethodNode>();
+ LinkedHashMap<MopKey, MethodNode> mops = new LinkedHashMap<MopKey, MethodNode>();
LinkedList<MethodNode> mopCalls = new LinkedList<MethodNode>();
for (Object method : methods) {
MethodNode mn = (MethodNode) method;
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-26 13:31:23.342876115 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-26 22:31:15.637347467 +0200
@@ -139,7 +139,7 @@
for (ClassNode classNode : classNodes) {
interfaces.add(classNode.getName());
}
- Set<String> interfaceSet = new HashSet<String>(interfaces);
+ Set<String> interfaceSet = new TreeSet<String>(interfaces);
if (interfaceSet.size() != interfaces.size()) {
throw new RuntimeParserException("Duplicate interfaces in implements list: " + interfaces, classNode);
}
@@ -832,7 +832,7 @@
List<Statement> staticStatements = new ArrayList<Statement>();
final boolean isEnum = node.isEnum();
List<Statement> initStmtsAfterEnumValuesInit = new ArrayList<Statement>();
- Set<String> explicitStaticPropsInEnum = new HashSet<String>();
+ Set<String> explicitStaticPropsInEnum = new TreeSet<String>();
if (isEnum) {
for (PropertyNode propNode : node.getProperties()) {
if (!propNode.isSynthetic() && propNode.getField().isStatic()) {
@@ -1051,12 +1051,12 @@
}
protected void addCovariantMethods(ClassNode classNode) {
- Map methodsToAdd = new HashMap();
- Map genericsSpec = new HashMap();
+ Map methodsToAdd = new LinkedHashMap();
+ Map genericsSpec = new LinkedHashMap();
// unimplemented abstract methods from interfaces
- Map abstractMethods = new HashMap();
- Map<String, MethodNode> allInterfaceMethods = new HashMap<String, MethodNode>();
+ Map abstractMethods = new LinkedHashMap();
+ Map<String, MethodNode> allInterfaceMethods = new TreeMap<String, MethodNode>();
ClassNode[] interfaces = classNode.getInterfaces();
for (ClassNode iface : interfaces) {
Map ifaceMethodsMap = iface.getDeclaredMethodsMap();
@@ -1086,7 +1086,7 @@
addCovariantMethods(classNode, declaredMethods, abstractMethods, methodsToAdd, genericsSpec);
- Map<String, MethodNode> declaredMethodsMap = new HashMap<String, MethodNode>();
+ Map<String, MethodNode> declaredMethodsMap = new TreeMap<String, MethodNode>();
if (methodsToAdd.size() > 0) {
for (MethodNode mn : declaredMethods) {
declaredMethodsMap.put(mn.getTypeDescriptor(), mn);
@@ -1336,7 +1336,7 @@
}
private Map createGenericsSpec(ClassNode current, Map oldSpec) {
- Map ret = new HashMap(oldSpec);
+ Map ret = new LinkedHashMap(oldSpec);
// ret contains the type specs, what we now need is the type spec for the
// current class. To get that we first apply the type parameters to the
// current class and then use the type names of the current class to reset
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java 2023-09-26 13:31:23.362876249 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java 2023-09-26 19:55:46.378599493 +0200
@@ -59,7 +59,7 @@