Blackbird: handle varargs constructor types as fixed arity

Fixes FasterXML#141
stevenschlansker · Jul 7, 2021 · 1d6b7c7 · 1d6b7c7
1 parent 7e6a872
commit 1d6b7c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/CreatorOptimizer.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/CreatorOptimizer.java
@@ -71,7 +71,9 @@ public ValueInstantiator createOptimized()
                                 methodType(Object.class, MethodHandle.class, Object[].class)),
                             methodType(Object.class, Object[].class))
                         .getTarget().invokeExact(
-                            argsCreatorHandle.asSpreader(
+                            argsCreatorHandle
+                                .asFixedArity()
+                                .asSpreader(
                                     Object[].class,
                                     argsCreatorHandle.type().parameterCount())
                                 .asType(methodType(Object.class, Object[].class))))
@@ -107,10 +109,7 @@ private MethodHandle directHandle(AnnotatedElement element) {
             Stream.of(element)
                 .filter(Constructor.class::isInstance)
                 .map(Constructor.class::cast)
-                .filter(c -> !Modifier.isPrivate(c.getModifiers())
-                        // 07-Jul-2021, ckozak: modules-base#141Avoid attempting to optimize varargs
-                        // methods due to class-cast edge cases
-                        && !c.isVarArgs())
+                .filter(c -> !Modifier.isPrivate(c.getModifiers()))
                 .flatMap(t -> {
                     try {
                         return Stream.of(_lookup.unreflectConstructor(t));

diff --git a/...blackbird/deser/DoubleArrayDeserTest.java → ...rimitiveArrayConstructorDeser141Test.java b/...blackbird/deser/DoubleArrayDeserTest.java → ...rimitiveArrayConstructorDeser141Test.java
@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.module.blackbird.BlackbirdTestBase;
 
-public class DoubleArrayDeserTest extends BlackbirdTestBase
+public class DoublePrimitiveArrayConstructorDeser141Test extends BlackbirdTestBase
 {
     static class Foo141 {
         @JsonProperty("bar")

diff --git a/...bird/deser/DoubleVarArgsDeser141Test.java → ...mitiveVarArgsConstructorDeser141Test.java b/...bird/deser/DoubleVarArgsDeser141Test.java → ...mitiveVarArgsConstructorDeser141Test.java
@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.module.blackbird.BlackbirdTestBase;
 
 // [modules-base#141]
-public class DoubleVarArgsDeser141Test extends BlackbirdTestBase
+public class DoublePrimitiveVarArgsConstructorDeser141Test extends BlackbirdTestBase
 {
     // [modules-base#141]
     static class Foo141 {