Skip to content
Closed
Show file tree
Hide file tree
Changes from all 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 @@ -2906,10 +2906,6 @@ public ParameterizedExecutableType constructorFromUse(NewClassTree tree) {
AnnotatedExecutableType con = getAnnotatedType(ctor); // get unsubstituted type
constructorFromUsePreSubstitution(tree, con);

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

if (tree.getClassBody() != null) {
// Because the anonymous constructor can't have explicit annotations on its parameters,
// they are copied from the super constructor invoked in the anonymous constructor. To
Expand Down Expand Up @@ -2958,6 +2954,10 @@ public ParameterizedExecutableType constructorFromUse(NewClassTree tree) {
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tests;
package org.checkerframework.framework.test.junit;

import org.checkerframework.framework.test.CheckerFrameworkPerDirectoryTest;
import org.junit.runners.Parameterized;
Expand Down
65 changes: 65 additions & 0 deletions framework/tests/viewpointtest/VarargsConstructor.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// Test case for EISOP issue #777:
// https://github.com/eisop/checker-framework/issues/777
import viewpointtest.quals.*;

public class VarargsConstructor {

VarargsConstructor(String str, Object... args) {}

@SuppressWarnings({"inconsistent.constructor.type", "super.invocation.invalid"})
@ReceiverDependentQual
VarargsConstructor(@ReceiverDependentQual Object... args) {}

void foo() {
VarargsConstructor a = new VarargsConstructor("testStr", new Object());
}

void invokeConstructor(@A Object aObj, @B Object bObj, @Top Object topObj) {
@A Object a = new @A VarargsConstructor(aObj);
@B Object b = new @B VarargsConstructor(bObj);
@Top Object top = new @Top VarargsConstructor(topObj);
// :: error: (argument.type.incompatible)
new @A VarargsConstructor(bObj);
// :: error: (argument.type.incompatible)
new @B VarargsConstructor(aObj);
}

class Inner {
@SuppressWarnings({"inconsistent.constructor.type", "super.invocation.invalid"})
@ReceiverDependentQual
Inner(@ReceiverDependentQual Object... args) {}

void foo() {
Inner a = new Inner();
Inner b = new Inner(new Object());
Inner c = VarargsConstructor.this.new Inner();
Inner d = VarargsConstructor.this.new Inner(new Object());
}

void invokeConstructor(@A Object aObj, @B Object bObj, @Top Object topObj) {
@A Object a = new @A Inner(aObj);
@B Object b = new @B Inner(bObj);
@Top Object top = new @Top Inner(topObj);
// :: error: (argument.type.incompatible)
new @A Inner(bObj);
// :: error: (argument.type.incompatible)
new @B Inner(aObj);
}
}

void testAnonymousClass(@A Object aObj, @B Object bObj, @Top Object topObj) {
Object o =
new VarargsConstructor("testStr", new Object()) {
void foo() {
VarargsConstructor a = new VarargsConstructor("testStr", new Object());
}
};
@A Object a = new @A VarargsConstructor(aObj) {};
@B Object b = new @B VarargsConstructor(bObj) {};
@Top Object top = new @Top VarargsConstructor(topObj) {};
// :: error: (argument.type.incompatible)
new @A VarargsConstructor(bObj) {};
// :: error: (argument.type.incompatible)
new @B VarargsConstructor(aObj) {};
}
}