Skip to content
Open
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2925,9 +2925,12 @@ public ParameterizedExecutableType constructorFromUse(NewClassTree tree) {
AnnotatedExecutableType superCon =
getAnnotatedType(TreeUtils.getSuperConstructor(tree));
constructorFromUsePreSubstitution(tree, superCon);
// no viewpoint adaptation needed for super invocation
superCon =
AnnotatedTypes.asMemberOf(types, this, type, superCon.getElement(), superCon);
// Adapt the result from super constructor as it will be used in anonymous constructor.
if (viewpointAdapter != null) {
viewpointAdapter.viewpointAdaptConstructor(type, ctor, superCon);
}
con.computeVarargType(superCon);
if (superCon.getParameterTypes().size() == con.getParameterTypes().size()) {
con.setParameterTypes(superCon.getParameterTypes());
Expand Down Expand Up @@ -2958,13 +2961,12 @@ public ParameterizedExecutableType constructorFromUse(NewClassTree tree) {
// AnnotatedTypes.asMemberOf handles vararg type properly, so we do not need to compute
Comment thread
aosen-xiong marked this conversation as resolved.
// vararg type again.
con.computeVarargType();
if (viewpointAdapter != null) {
viewpointAdapter.viewpointAdaptConstructor(type, ctor, con);
}
con = AnnotatedTypes.asMemberOf(types, this, type, ctor, con);
}

if (viewpointAdapter != null) {
viewpointAdapter.viewpointAdaptConstructor(type, ctor, con);
}

Map<TypeVariable, AnnotatedTypeMirror> typeParamToTypeArg =
AnnotatedTypes.findTypeArguments(processingEnv, this, tree, ctor, con);
List<AnnotatedTypeMirror> typeargs;
Expand Down