azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-2643 Support multi-declarations in Data-Flow analysis

Browse Source 
#KT-2643 fixed
This commit is contained in:
Svetlana Isakova
2012-08-20 18:48:09 +04:00
parent f817eba7aa
commit 8860bab9f1
17 changed files with 126 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
+1 -1
View File
@@ -78,7 +78,7 @@ public interface JetControlFlowBuilder {
void write(@NotNull JetElement assignment, @NotNull JetElement lValue);
void declare(@NotNull JetParameter parameter);
void declare(@NotNull JetProperty property);
void declare(@NotNull JetVariableDeclaration property);
// Other
void unsupported(JetElement element);
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java
+1 -1
View File
@@ -208,7 +208,7 @@ public class JetControlFlowBuilderAdapter implements JetControlFlowBuilder {
}
@Override
public void declare(@NotNull JetProperty property) {
public void declare(@NotNull JetVariableDeclaration property) {
assert builder != null;
builder.declare(property);
}
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+13
View File
@@ -742,6 +742,19 @@ public class JetControlFlowProcessor {
}
}
@Override
public void visitMultiDeclaration(JetMultiDeclaration declaration) {
JetExpression initializer = declaration.getInitializer();
if (initializer != null) {
builder.read(initializer);
}
List<JetMultiDeclarationEntry> entries = declaration.getEntries();
for (JetMultiDeclarationEntry entry : entries) {
builder.declare(entry);
builder.write(entry, entry);
}
}
@Override
public void visitPropertyAccessor(JetPropertyAccessor accessor) {
processLocalDeclaration(accessor);
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
+13 -8
View File
@@ -451,8 +451,8 @@ public class JetFlowInformationProvider {
PsiElement nameIdentifier = ((JetNamedDeclaration) element).getNameIdentifier();
if (nameIdentifier == null) return;
if (!VariableUseState.isUsed(variableUseState)) {
if (element instanceof JetProperty) {
trace.report(Errors.UNUSED_VARIABLE.on((JetProperty) element, variableDescriptor));
if (element instanceof JetVariableDeclaration) {
trace.report(Errors.UNUSED_VARIABLE.on((JetVariableDeclaration) element, variableDescriptor));
}
else if (element instanceof JetParameter) {
PsiElement psiElement = element.getParent().getParent();
@@ -468,13 +468,18 @@ public class JetFlowInformationProvider {
}
}
}
else if (variableUseState == ONLY_WRITTEN_NEVER_READ && element instanceof JetProperty) {
trace.report(Errors.ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE.on((JetNamedDeclaration) element, variableDescriptor));
else if (variableUseState == ONLY_WRITTEN_NEVER_READ && element instanceof JetVariableDeclaration) {
trace.report(Errors.ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE.on((JetVariableDeclaration) element, variableDescriptor));
}
else if (variableUseState == LAST_WRITTEN && element instanceof JetProperty) {
JetExpression initializer = ((JetProperty) element).getInitializer();
if (initializer != null) {
trace.report(Errors.VARIABLE_WITH_REDUNDANT_INITIALIZER.on(initializer, variableDescriptor));
else if (variableUseState == LAST_WRITTEN && element instanceof JetVariableDeclaration) {
if (element instanceof JetProperty) {
JetExpression initializer = ((JetProperty) element).getInitializer();
if (initializer != null) {
trace.report(Errors.VARIABLE_WITH_REDUNDANT_INITIALIZER.on(initializer, variableDescriptor));
}
}
else if (element instanceof JetMultiDeclarationEntry) {
trace.report(VARIABLE_WITH_REDUNDANT_INITIALIZER.on(element, variableDescriptor));
}
}
}
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
+1 -1
View File
@@ -229,7 +229,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
}
@Override
public void declare(@NotNull JetProperty property) {
public void declare(@NotNull JetVariableDeclaration property) {
add(new VariableDeclarationInstruction(property));
}
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/VariableDeclarationInstruction.java
+2 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lang.psi.JetParameter;
import org.jetbrains.jet.lang.psi.JetProperty;
import org.jetbrains.jet.lang.psi.JetVariableDeclaration;
/**
* @author svtk
@@ -29,7 +30,7 @@ public class VariableDeclarationInstruction extends InstructionWithNext {
super(element);
}
protected VariableDeclarationInstruction(@NotNull JetProperty element) {
protected VariableDeclarationInstruction(@NotNull JetVariableDeclaration element) {
super(element);
}
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+1 -1
View File
@@ -151,7 +151,7 @@ public interface Errors {
DiagnosticFactory1<JetSimpleNameExpression, VariableDescriptor> UNINITIALIZED_VARIABLE = DiagnosticFactory1.create(ERROR);
DiagnosticFactory1<JetSimpleNameExpression, ValueParameterDescriptor> UNINITIALIZED_PARAMETER = DiagnosticFactory1.create(ERROR);
UnusedElementDiagnosticFactory<JetProperty, VariableDescriptor> UNUSED_VARIABLE = UnusedElementDiagnosticFactory.create(WARNING, NAME_IDENTIFIER);
UnusedElementDiagnosticFactory<JetVariableDeclaration, VariableDescriptor> UNUSED_VARIABLE = UnusedElementDiagnosticFactory.create(WARNING, NAME_IDENTIFIER);
UnusedElementDiagnosticFactory<JetParameter, VariableDescriptor> UNUSED_PARAMETER = UnusedElementDiagnosticFactory.create(WARNING, NAME_IDENTIFIER);
UnusedElementDiagnosticFactory<JetNamedDeclaration, DeclarationDescriptor> ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE = UnusedElementDiagnosticFactory.create(WARNING, NAME_IDENTIFIER);
DiagnosticFactory1<JetExpression, DeclarationDescriptor> VARIABLE_WITH_REDUNDANT_INITIALIZER = DiagnosticFactory1.create(WARNING);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class BindingContextUtils {
@Nullable
public static VariableDescriptor extractVariableDescriptorIfAny(@NotNull BindingContext bindingContext, @Nullable JetElement element, boolean onlyReference) {
DeclarationDescriptor descriptor = null;
if (!onlyReference && (element instanceof JetProperty || element instanceof JetParameter)) {
if (!onlyReference && (element instanceof JetVariableDeclaration || element instanceof JetParameter)) {
descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element);
}
else if (element instanceof JetSimpleNameExpression) {
compiler/testData/cfg/MultiDecl.instructions
+40
View File
@@ -0,0 +1,40 @@
== C ==
class C {
fun component1() = 1
fun component2() = 2
}
---------------------
l0:
<START> NEXT:[<END>] PREV:[]
l1:
<END> NEXT:[<SINK>] PREV:[<START>]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== test ==
fun test(c: C) {
val (a, b) = c
val d = 1
}
---------------------
l0:
<START> NEXT:[v(c: C)] PREV:[]
v(c: C) NEXT:[w(c)] PREV:[<START>]
w(c) NEXT:[r(c)] PREV:[v(c: C)]
r(c) NEXT:[v(a)] PREV:[w(c)]
v(a) NEXT:[w(a)] PREV:[r(c)]
w(a) NEXT:[v(b)] PREV:[v(a)]
v(b) NEXT:[w(b)] PREV:[w(a)]
w(b) NEXT:[v(val d = 1)] PREV:[v(b)]
v(val d = 1) NEXT:[r(1)] PREV:[w(b)]
r(1) NEXT:[w(d)] PREV:[v(val d = 1)]
w(d) NEXT:[<END>] PREV:[r(1)]
l1:
<END> NEXT:[<SINK>] PREV:[w(d)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/MultiDecl.jet
+11
View File
@@ -0,0 +1,11 @@
package n
class C {
fun component1() = 1
fun component2() = 2
}
fun test(c: C) {
val (a, b) = c
val d = 1
}
compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.kt
+2 -2
View File
@@ -3,6 +3,6 @@ class A {
fun component2() : Int = 2
}
fun a(<!UNUSED_PARAMETER!>aa<!> : A) {
val (a: String, b1: String) = <!COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH, COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH!>aa<!>
fun a(aa : A) {
val (<!UNUSED_VARIABLE!>a<!>: String, <!UNUSED_VARIABLE!>b1<!>: String) = <!COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH, COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH!>aa<!>
}
compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.kt
+3 -3
View File
@@ -5,10 +5,10 @@ class A {
fun a(aa : A?, b : Any) {
if (aa != null) {
val (a1, b1) = aa;
val (<!UNUSED_VARIABLE!>a1<!>, <!UNUSED_VARIABLE!>b1<!>) = aa;
}
if (b is A) {
val (a1, b1) = b;
val (<!UNUSED_VARIABLE!>a1<!>, <!UNUSED_VARIABLE!>b1<!>) = b;
}
}
}
compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
+1 -1
View File
@@ -9,7 +9,7 @@ class MyClass2 {}
<!CONFLICTING_OVERLOADS!>fun MyClass2.component1()<!> = 1.2
<!CONFLICTING_OVERLOADS!>fun MyClass2.component1()<!> = 1.3
fun test(<!UNUSED_PARAMETER!>mc1<!>: MyClass, <!UNUSED_PARAMETER!>mc2<!>: MyClass2) {
fun test(mc1: MyClass, mc2: MyClass2) {
val (a, b) = <!COMPONENT_FUNCTION_MISSING, COMPONENT_FUNCTION_MISSING!>mc1<!>
val (c) = <!COMPONENT_FUNCTION_AMBIGUITY!>mc2<!>
compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.kt
+3 -3
View File
@@ -4,11 +4,11 @@ class A {
}
fun a() {
val (<!REDECLARATION!>a<!>, <!REDECLARATION!>a<!>) = A()
val (x, <!REDECLARATION!>y<!>) = A();
val (<!REDECLARATION, UNUSED_VARIABLE!>a<!>, <!REDECLARATION, UNUSED_VARIABLE!>a<!>) = A()
val (<!UNUSED_VARIABLE!>x<!>, <!REDECLARATION, UNUSED_VARIABLE!>y<!>) = A();
val <!REDECLARATION!>b<!> = 1
use(b)
val (<!REDECLARATION!>b<!>, <!REDECLARATION!>y<!>) = A();
val (<!REDECLARATION, UNUSED_VARIABLE!>b<!>, <!REDECLARATION, UNUSED_VARIABLE!>y<!>) = A();
}
compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt
+1 -1
View File
@@ -10,7 +10,7 @@ class MyClass2 {}
fun MyClass2.component1() = 1.2
fun test(<!UNUSED_PARAMETER!>mc1<!>: MyClass, <!UNUSED_PARAMETER!>mc2<!>: MyClass2) {
fun test(mc1: MyClass, mc2: MyClass2) {
val (a, b) = mc1
a : Int
b : String
compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.kt
+27
View File
@@ -0,0 +1,27 @@
//KT-2643 Support multi-declarations in Data-Flow analysis
package n
class C {
fun component1() = 1
fun component2() = 2
}
fun test1(c: C) {
val (<!UNUSED_VARIABLE!>a<!>, <!UNUSED_VARIABLE!>b<!>) = c
}
fun test2(c: C) {
val (a, <!UNUSED_VARIABLE!>b<!>) = c
a + 3
}
fun test3(c: C) {
var (<!ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE!>a<!>, <!UNUSED_VARIABLE!>b<!>) = c
a = <!UNUSED_VALUE!>3<!>
}
fun test4(c: C) {
var (<!VARIABLE_WITH_REDUNDANT_INITIALIZER!>a<!>, <!UNUSED_VARIABLE!>b<!>) = c
a = 3
a + 1
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+5
View File
@@ -1088,6 +1088,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
doTest("compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt");
}
@TestMetadata("kt2643MultiDeclInControlFlow.kt")
public void testKt2643MultiDeclInControlFlow() throws Exception {
doTest("compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.kt");
}
@TestMetadata("kt559.kt")
public void testKt559() throws Exception {
doTest("compiler/testData/diagnostics/tests/declarationChecks/kt559.kt");