You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2024/01/19 00:45:37 UTC
(groovy) branch GROOVY_4_0_X updated (94ff500f22 -> e968470c32)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
from 94ff500f22 GROOVY-11254: SC: describe method via `ClassNode` not `Class`
new ee875f188a GROOVY-11284: Generated size() method on records performs unnecessary boxing
new e968470c32 GROOVY-11285: Generated toList() and toMap() methods on records perform unnecessary wrapping
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../codehaus/groovy/transform/RecordTypeASTTransformation.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
(groovy) 02/02: GROOVY-11285: Generated toList() and toMap() methods on records perform unnecessary wrapping
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit e968470c321047d4685877d969ef62b63cadc5af
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Jan 18 21:10:31 2024 +1000
GROOVY-11285: Generated toList() and toMap() methods on records perform unnecessary wrapping
---
.../org/codehaus/groovy/transform/RecordTypeASTTransformation.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/RecordTypeASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/RecordTypeASTTransformation.java
index a2251e5ee0..32b3950c18 100644
--- a/src/main/java/org/codehaus/groovy/transform/RecordTypeASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/RecordTypeASTTransformation.java
@@ -130,9 +130,7 @@ import static org.objectweb.asm.Opcodes.IRETURN;
@GroovyASTTransformation(phase = CompilePhase.SEMANTIC_ANALYSIS)
public class RecordTypeASTTransformation extends AbstractASTTransformation implements CompilationUnitAware {
- private static final ClassNode ARRAYLIST_TYPE = makeWithoutCaching(ArrayList.class, false);
private static final ClassNode ILLEGAL_ARGUMENT = makeWithoutCaching(IllegalArgumentException.class);
- private static final ClassNode LHMAP_TYPE = makeWithoutCaching(LinkedHashMap.class, false);
private static final ClassNode NAMED_PARAM_TYPE = make(NamedParam.class);
private static final ClassNode RECORD_OPTIONS_TYPE = make(RecordOptions.class);
private static final ClassNode SIMPLE_BEAN_INFO_TYPE = make(SimpleBeanInfo.class);
@@ -383,7 +381,7 @@ public class RecordTypeASTTransformation extends AbstractASTTransformation imple
for (PropertyNode pNode : pList) {
args.add(callThisX(pNode.getName()));
}
- Statement body = returnS(ctorX(ARRAYLIST_TYPE.getPlainNodeReference(), listX(args)));
+ Statement body = returnS(listX(args));
addGeneratedMethod(cNode, TO_LIST, ACC_PUBLIC | ACC_FINAL, LIST_TYPE.getPlainNodeReference(), Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, body);
}
@@ -393,7 +391,7 @@ public class RecordTypeASTTransformation extends AbstractASTTransformation imple
String name = pNode.getName();
entries.add(mapEntryX(name, callThisX(name)));
}
- Statement body = returnS(ctorX(LHMAP_TYPE.getPlainNodeReference(), args(mapX(entries))));
+ Statement body = returnS(mapX(entries));
addGeneratedMethod(cNode, TO_MAP, ACC_PUBLIC | ACC_FINAL, MAP_TYPE.getPlainNodeReference(), Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, body);
}
(groovy) 01/02: GROOVY-11284: Generated size() method on records performs unnecessary boxing
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit ee875f188ae6cd4ab372121951152203f2f0122c
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Jan 18 20:52:21 2024 +1000
GROOVY-11284: Generated size() method on records performs unnecessary boxing
---
.../java/org/codehaus/groovy/transform/RecordTypeASTTransformation.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/RecordTypeASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/RecordTypeASTTransformation.java
index 5f961e67b8..a2251e5ee0 100644
--- a/src/main/java/org/codehaus/groovy/transform/RecordTypeASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/RecordTypeASTTransformation.java
@@ -312,7 +312,7 @@ public class RecordTypeASTTransformation extends AbstractASTTransformation imple
}
if ((options == null || !memberHasValue(options, SIZE, Boolean.FALSE)) && !hasDeclaredMethod(cNode, SIZE, 0)) {
- addGeneratedMethod(cNode, SIZE, ACC_PUBLIC | ACC_FINAL, int_TYPE, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, returnS(constX(pList.size())));
+ addGeneratedMethod(cNode, SIZE, ACC_PUBLIC | ACC_FINAL, int_TYPE, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, returnS(constX(pList.size(), true)));
}
}