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

KT-4405 Control-flow analysis is not performed for some local declarations #KT-4405 Fixed

Browse Source
This commit is contained in:
Svetlana Isakova
2014-01-24 19:27:30 +04:00
parent aa713ef1f6
commit 791fa22abb
20 changed files with 93 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
+21 -14
View File
@@ -91,23 +91,29 @@ public class JetFlowInformationProvider {
return pseudocodeVariablesData;
}
public void checkFunction(
@NotNull JetDeclarationWithBody function,
@NotNull JetType expectedReturnType,
boolean isLocalObject
) {
public void checkForLocalClassOrObjectMode() {
// Local classes and objects are analyzed twice: when TopDownAnalyzer processes it and as a part of its container.
// Almost all checks can be done when the container is analyzed
// except recording initialized variables (this information is needed for DeclarationChecker).
recordInitializedVariables();
}
public void checkDeclaration() {
recordInitializedVariables();
checkDefiniteReturn(expectedReturnType);
checkLocalFunctions();
if (isLocalObject) return;
markUninitializedVariables();
markUnusedVariables();
markUnusedLiteralsInBlock();
}
public void checkFunction(@Nullable JetType expectedReturnType) {
checkDefiniteReturn(expectedReturnType != null ? expectedReturnType : NO_EXPECTED_TYPE);
markTailCalls();
}
@@ -175,16 +181,17 @@ public class JetFlowInformationProvider {
private void checkLocalFunctions() {
for (LocalFunctionDeclarationInstruction localDeclarationInstruction : pseudocode.getLocalDeclarations()) {
JetElement element = localDeclarationInstruction.getElement();
if (element instanceof JetNamedFunction) {
JetNamedFunction localFunction = (JetNamedFunction) element;
SimpleFunctionDescriptor functionDescriptor = trace.getBindingContext().get(BindingContext.FUNCTION, localFunction);
if (element instanceof JetDeclarationWithBody) {
JetDeclarationWithBody localDeclaration = (JetDeclarationWithBody) element;
if (localDeclaration instanceof JetFunctionLiteral) continue;
CallableDescriptor functionDescriptor =
(CallableDescriptor) trace.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, localDeclaration);
JetType expectedType = functionDescriptor != null ? functionDescriptor.getReturnType() : null;
JetFlowInformationProvider providerForLocalDeclaration =
new JetFlowInformationProvider(localFunction, trace, localDeclarationInstruction.getBody());
new JetFlowInformationProvider(localDeclaration, trace, localDeclarationInstruction.getBody());
providerForLocalDeclaration.checkDefiniteReturn(expectedType != null ? expectedType : NO_EXPECTED_TYPE);
providerForLocalDeclaration.markTailCalls();
providerForLocalDeclaration.checkFunction(expectedType);
}
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java
+13 -10
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.lang.resolve;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider;
import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor;
import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
@@ -59,8 +60,6 @@ public class ControlFlowAnalyzer {
JetType expectedReturnType = !function.hasBlockBody() && !function.hasDeclaredReturnType()
? NO_EXPECTED_TYPE
: functionDescriptor.getReturnType();
assert expectedReturnType != null
: "functionDescriptor is not yet fully initialized or broken so return type is null " + functionDescriptor;
checkFunction(function, expectedReturnType);
}
for (Map.Entry<JetProperty, PropertyDescriptor> entry : bodiesResolveContext.getProperties().entrySet()) {
@@ -75,11 +74,11 @@ public class ControlFlowAnalyzer {
// A pseudocode of class/object initialization corresponds to a class/object
// or initialization of properties corresponds to a package declared in a file
JetFlowInformationProvider flowInformationProvider = new JetFlowInformationProvider((JetElement) declarationContainer, trace);
flowInformationProvider.recordInitializedVariables();
if (topDownAnalysisParameters.isDeclaredLocally()) return;
flowInformationProvider.markUninitializedVariables();
if (topDownAnalysisParameters.isDeclaredLocally()) {
flowInformationProvider.checkForLocalClassOrObjectMode();
return;
}
flowInformationProvider.checkDeclaration();
}
private void checkProperty(JetProperty property, PropertyDescriptor propertyDescriptor) {
@@ -89,15 +88,19 @@ public class ControlFlowAnalyzer {
: propertyDescriptor.getSetter();
assert accessorDescriptor != null : "no property accessor descriptor " + accessor.getText();
JetType returnType = accessorDescriptor.getReturnType();
assert returnType != null : "property accessor has no return type " + accessorDescriptor;
checkFunction(accessor, returnType);
}
}
private void checkFunction(@NotNull JetDeclarationWithBody function, @NotNull JetType expectedReturnType) {
private void checkFunction(@NotNull JetDeclarationWithBody function, @Nullable JetType expectedReturnType) {
JetExpression bodyExpression = function.getBodyExpression();
if (bodyExpression == null) return;
JetFlowInformationProvider flowInformationProvider = new JetFlowInformationProvider(function, trace);
flowInformationProvider.checkFunction(function, expectedReturnType, topDownAnalysisParameters.isDeclaredLocally());
if (topDownAnalysisParameters.isDeclaredLocally()) {
flowInformationProvider.checkForLocalClassOrObjectMode();
return;
}
flowInformationProvider.checkDeclaration();
flowInformationProvider.checkFunction(expectedReturnType);
}
}
compiler/testData/diagnostics/tests/AnonymousInitializers.kt
+4 -4
View File
@@ -15,15 +15,15 @@ class WithC() {
{
$x = 1
<!UNRESOLVED_REFERENCE!>$y<!> = 2
val b = x
val <!UNUSED_VARIABLE!>b<!> = x
}
val a : Int get() = 1
{
val z = <!UNRESOLVED_REFERENCE!>b<!>
val zz = x
val zzz = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$a<!>
val <!UNUSED_VARIABLE!>z<!> = <!UNRESOLVED_REFERENCE!>b<!>
val <!UNUSED_VARIABLE!>zz<!> = x
val <!UNUSED_VARIABLE!>zzz<!> = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$a<!>
}
}
compiler/testData/diagnostics/tests/UninitializedOrReassignedVariables.kt
+1 -1
View File
@@ -199,7 +199,7 @@ class LocalValsVsProperties(val a: Int, w: Int) : Open(a, w) {
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val y : Int<!>
{
$x = 1
val b = x
val <!UNUSED_VARIABLE!>b<!> = x
}
val b = a
compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.kt
+1 -1
View File
@@ -1,6 +1,6 @@
class ReadForward() {
{
val x = <!UNINITIALIZED_VARIABLE!>$a<!>
val <!UNUSED_VARIABLE!>x<!> = <!UNINITIALIZED_VARIABLE!>$a<!>
}
val a = 1
compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.kt
+1 -1
View File
@@ -1,6 +1,6 @@
class ReadByAnotherPropertyInitializer() {
val a = 1
{
val x = $a
val <!UNUSED_VARIABLE!>x<!> = $a
}
}
compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.kt
+1 -1
View File
@@ -2,6 +2,6 @@ abstract class ReadNonexistent() {
abstract val aa: Int
{
val x = <!NO_BACKING_FIELD_ABSTRACT_PROPERTY!>$aa<!>
val <!UNUSED_VARIABLE!>x<!> = <!NO_BACKING_FIELD_ABSTRACT_PROPERTY!>$aa<!>
}
}
compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.kt
+1 -1
View File
@@ -3,6 +3,6 @@ class ReadNonexistent() {
get() = 1
{
val x = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$a<!>
val <!UNUSED_VARIABLE!>x<!> = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$a<!>
}
}
compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Cl() {
{
val x = <!UNRESOLVED_REFERENCE!>$a<!>
val <!UNUSED_VARIABLE!>x<!> = <!UNRESOLVED_REFERENCE!>$a<!>
}
}
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.kt
+30
View File
@@ -0,0 +1,30 @@
//KT-4405 Control-flow analysis is not performed for some local declarations
package d
val closure = {
val <!UNUSED_VARIABLE!>x4<!> = "" // error: should be UNUSED_VARIABLE
fun g() {
val <!UNUSED_VARIABLE!>x6<!> = "" // error: should be UNUSED_VARIABLE
}
fun h(): Int { // error: should be NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
}
class A {
{
fun foo(): Int {
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
val <!UNUSED_VARIABLE!>closure<!> = {
val <!UNUSED_VARIABLE!>x<!> = ""
fun local(): Int {
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
}
val <!UNUSED_VARIABLE!>y<!> = ""
}
}
compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.kt
+1 -1
View File
@@ -15,7 +15,7 @@ fun f() {
fun loc2(): Int {
val <!UNUSED_VARIABLE!>x2_<!> = "" // error: should be UNUSED_VARIABLE
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY, NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
}
val v: String
compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt
+3 -3
View File
@@ -2,20 +2,20 @@ package f
object A {
class LoginFormPage() : Request({
val failed = session.get("LOGIN_FAILED")
val <!UNUSED_VARIABLE!>failed<!> = session.get("LOGIN_FAILED")
})
}
class B {
class object {
class LoginFormPage() : Request({
val failed = session.get("LOGIN_FAILED")
val <!UNUSED_VARIABLE!>failed<!> = session.get("LOGIN_FAILED")
})
}
class C {
class LoginFormPage() : Request({
val failed = session.get("LOGIN_FAILED")
val <!UNUSED_VARIABLE!>failed<!> = session.get("LOGIN_FAILED")
})
}
}
compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.kt
+1 -1
View File
@@ -23,7 +23,7 @@ fun f() {
val closure = {
class MyClass {
{
val x: MyClass = MyClass()
val <!UNUSED_VARIABLE!>x<!>: MyClass = MyClass()
}
}
}
compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt244.kt
+1 -1
View File
@@ -16,7 +16,7 @@ class A(a: String?) {
val b = if (a != null) <!DEBUG_INFO_AUTOCAST!>a<!>.length else 1
{
if (a != null) {
val c = <!DEBUG_INFO_AUTOCAST!>a<!>.length
val <!UNUSED_VARIABLE!>c<!> = <!DEBUG_INFO_AUTOCAST!>a<!>.length
}
}
compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.kt
+1 -1
View File
@@ -4,6 +4,6 @@ import javax.swing.JFrame
class KFrame() : JFrame() {
{
val x = this.rootPaneCheckingEnabled // make sure field is visible
val <!UNUSED_VARIABLE!>x<!> = this.rootPaneCheckingEnabled // make sure field is visible
}
}
compiler/testData/diagnostics/tests/varargs/kt1838-param.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A(vararg t : Int) {
{
val t1 : IntArray = t
val <!UNUSED_VARIABLE!>t1<!> : IntArray = t
}
}
compiler/testData/diagnostics/tests/varargs/kt1838-val.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A(vararg val t : Int) {
{
val t1 : IntArray = t
val <!UNUSED_VARIABLE!>t1<!> : IntArray = t
}
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+5
View File
@@ -1618,6 +1618,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.kt");
}
@TestMetadata("kt4405.kt")
public void testKt4405() throws Exception {
doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.kt");
}
@TestMetadata("kt510.kt")
public void testKt510() throws Exception {
doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.kt");
idea/testData/checker/AnonymousInitializers.kt
+4 -4
View File
@@ -15,16 +15,16 @@ class WithC() {
{
$x = 1
<error>$y</error> = 2
val b = x
val <warning>b</warning> = x
}
val a : Int get() = 1
{
val z = <error>b</error>
val zz = x
val zzz = <error>$a</error>
val <warning>z</warning> = <error>b</error>
val <warning>zz</warning> = x
val <warning>zzz</warning> = <error>$a</error>
}
}
idea/testData/checker/regression/ScopeForSecondaryConstructors.kt
+1 -1
View File
@@ -11,7 +11,7 @@
bar = 1
this.bar
1 : Int
val a : Int =1
val <warning>a</warning> : Int =1
this : Foo
}
}