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

ControlFlowBuilder: converted to Kotlin

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-01-26 18:13:42 +03:00
parent 41eed948be
commit 605da5b7b9
3 changed files with 105 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowBuilder.kt
+86 -109
View File
@@ -14,151 +14,128 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.cfg;
package org.jetbrains.kotlin.cfg
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue;
import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode;
import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*;
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant;
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode
import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
import java.util.List;
import java.util.Map;
public interface ControlFlowBuilder {
interface ControlFlowBuilder {
// Subroutines
void enterSubroutine(@NotNull KtElement subroutine);
fun enterSubroutine(subroutine: KtElement)
@NotNull
Pseudocode exitSubroutine(@NotNull KtElement subroutine);
fun exitSubroutine(subroutine: KtElement): Pseudocode
@NotNull
KtElement getCurrentSubroutine();
@Nullable
KtElement getReturnSubroutine();
val currentSubroutine: KtElement
val returnSubroutine: KtElement?
// Lexical scopes
void enterLexicalScope(@NotNull KtElement element);
void exitLexicalScope(@NotNull KtElement element);
fun enterLexicalScope(element: KtElement)
fun exitLexicalScope(element: KtElement)
// Entry/exit points
@NotNull
Label getEntryPoint(@NotNull KtElement labelElement);
@NotNull
Label getExitPoint(@NotNull KtElement labelElement);
@NotNull
Label getConditionEntryPoint(@NotNull KtElement labelElement);
fun getEntryPoint(labelElement: KtElement): Label
fun getExitPoint(labelElement: KtElement): Label
fun getConditionEntryPoint(labelElement: KtElement): Label
// Declarations
void declareParameter(@NotNull KtParameter parameter);
void declareVariable(@NotNull KtVariableDeclaration property);
void declareFunction(@NotNull KtElement subroutine, @NotNull Pseudocode pseudocode);
fun declareParameter(parameter: KtParameter)
fun declareVariable(property: KtVariableDeclaration)
fun declareFunction(subroutine: KtElement, pseudocode: Pseudocode)
// Labels
@NotNull
Label createUnboundLabel();
@NotNull
Label createUnboundLabel(@NotNull String name);
fun createUnboundLabel(): Label
void bindLabel(@NotNull Label label);
fun createUnboundLabel(name: String): Label
fun bindLabel(label: Label)
// Jumps
void jump(@NotNull Label label, @NotNull KtElement element);
void jumpOnFalse(@NotNull Label label, @NotNull KtElement element, @Nullable PseudoValue conditionValue);
void jumpOnTrue(@NotNull Label label, @NotNull KtElement element, @Nullable PseudoValue conditionValue);
void nondeterministicJump(@NotNull Label label, @NotNull KtElement element, @Nullable PseudoValue inputValue); // Maybe, jump to label
void nondeterministicJump(@NotNull List<Label> label, @NotNull KtElement element);
void jumpToError(@NotNull KtElement element);
fun jump(label: Label, element: KtElement)
void returnValue(@NotNull KtExpression returnExpression, @NotNull PseudoValue returnValue, @NotNull KtElement subroutine);
void returnNoValue(@NotNull KtReturnExpression returnExpression, @NotNull KtElement subroutine);
fun jumpOnFalse(label: Label, element: KtElement, conditionValue: PseudoValue?)
fun jumpOnTrue(label: Label, element: KtElement, conditionValue: PseudoValue?)
fun nondeterministicJump(label: Label, element: KtElement, inputValue: PseudoValue?) // Maybe, jump to label
fun nondeterministicJump(label: List<Label>, element: KtElement)
fun jumpToError(element: KtElement)
void throwException(@NotNull KtThrowExpression throwExpression, @NotNull PseudoValue thrownValue);
fun returnValue(returnExpression: KtExpression, returnValue: PseudoValue, subroutine: KtElement)
fun returnNoValue(returnExpression: KtReturnExpression, subroutine: KtElement)
fun throwException(throwExpression: KtThrowExpression, thrownValue: PseudoValue)
// Loops
@NotNull
LoopInfo enterLoop(@NotNull KtLoopExpression expression);
void enterLoopBody(@NotNull KtLoopExpression expression);
void exitLoopBody(@NotNull KtLoopExpression expression);
@Nullable
KtLoopExpression getCurrentLoop();
fun enterLoop(expression: KtLoopExpression): LoopInfo
fun enterLoopBody(expression: KtLoopExpression)
fun exitLoopBody(expression: KtLoopExpression)
val currentLoop: KtLoopExpression?
// Try-Finally
void enterTryFinally(@NotNull GenerationTrigger trigger);
void exitTryFinally();
fun enterTryFinally(trigger: GenerationTrigger)
void repeatPseudocode(@NotNull Label startLabel, @NotNull Label finishLabel);
fun exitTryFinally()
fun repeatPseudocode(startLabel: Label, finishLabel: Label)
// Reading values
void mark(@NotNull KtElement element);
fun mark(element: KtElement)
@Nullable
PseudoValue getBoundValue(@Nullable KtElement element);
void bindValue(@NotNull PseudoValue value, @NotNull KtElement element);
@NotNull
PseudoValue newValue(@Nullable KtElement element);
fun getBoundValue(element: KtElement?): PseudoValue?
fun bindValue(value: PseudoValue, element: KtElement)
fun newValue(element: KtElement?): PseudoValue
void loadUnit(@NotNull KtExpression expression);
fun loadUnit(expression: KtExpression)
@NotNull
InstructionWithValue loadConstant(@NotNull KtExpression expression, @Nullable CompileTimeConstant<?> constant);
@NotNull
InstructionWithValue createAnonymousObject(@NotNull KtObjectLiteralExpression expression);
@NotNull
InstructionWithValue createLambda(@NotNull KtFunction expression);
@NotNull
InstructionWithValue loadStringTemplate(@NotNull KtStringTemplateExpression expression, @NotNull List<PseudoValue> inputValues);
fun loadConstant(expression: KtExpression, constant: CompileTimeConstant<*>?): InstructionWithValue
fun createAnonymousObject(expression: KtObjectLiteralExpression): InstructionWithValue
fun createLambda(expression: KtFunction): InstructionWithValue
fun loadStringTemplate(expression: KtStringTemplateExpression, inputValues: List<PseudoValue>): InstructionWithValue
@NotNull
MagicInstruction magic(
@NotNull KtElement instructionElement,
@Nullable KtElement valueElement,
@NotNull List<PseudoValue> inputValues,
@NotNull MagicKind kind
);
fun magic(
instructionElement: KtElement,
valueElement: KtElement?,
inputValues: List<PseudoValue>,
kind: MagicKind): MagicInstruction
@NotNull
MergeInstruction merge(
@NotNull KtExpression expression,
@NotNull List<PseudoValue> inputValues
);
fun merge(
expression: KtExpression,
inputValues: List<PseudoValue>): MergeInstruction
@NotNull
ReadValueInstruction readVariable(
@NotNull KtExpression expression,
@NotNull ResolvedCall<?> resolvedCall,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues
);
fun readVariable(
expression: KtExpression,
resolvedCall: ResolvedCall<*>,
receiverValues: Map<PseudoValue, ReceiverValue>): ReadValueInstruction
@NotNull
CallInstruction call(
@NotNull KtElement valueElement,
@NotNull ResolvedCall<?> resolvedCall,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues,
@NotNull Map<PseudoValue, ValueParameterDescriptor> arguments
);
fun call(
valueElement: KtElement,
resolvedCall: ResolvedCall<*>,
receiverValues: Map<PseudoValue, ReceiverValue>,
arguments: Map<PseudoValue, ValueParameterDescriptor>): CallInstruction
enum PredefinedOperation {
enum class PredefinedOperation {
AND,
OR,
NOT_NULL_ASSERTION
}
@NotNull
OperationInstruction predefinedOperation(
@NotNull KtExpression expression,
@NotNull PredefinedOperation operation,
@NotNull List<PseudoValue> inputValues
);
void write(
@NotNull KtElement assignment,
@NotNull KtElement lValue,
@NotNull PseudoValue rValue,
@NotNull AccessTarget target,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues);
fun predefinedOperation(
expression: KtExpression,
operation: PredefinedOperation,
inputValues: List<PseudoValue>): OperationInstruction
fun write(
assignment: KtElement,
lValue: KtElement,
rValue: PseudoValue,
target: AccessTarget,
receiverValues: Map<PseudoValue, ReceiverValue>)
}
compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowBuilderAdapter.java
+9 -9
View File
@@ -60,7 +60,7 @@ public abstract class ControlFlowBuilderAdapter implements ControlFlowBuilder {
@NotNull
@Override
public InstructionWithValue loadStringTemplate(@NotNull KtStringTemplateExpression expression, @NotNull List<PseudoValue> inputValues) {
public InstructionWithValue loadStringTemplate(@NotNull KtStringTemplateExpression expression, @NotNull List<? extends PseudoValue> inputValues) {
return getDelegateBuilder().loadStringTemplate(expression, inputValues);
}
@@ -69,7 +69,7 @@ public abstract class ControlFlowBuilderAdapter implements ControlFlowBuilder {
public MagicInstruction magic(
@NotNull KtElement instructionElement,
@Nullable KtElement valueElement,
@NotNull List<PseudoValue> inputValues,
@NotNull List<? extends PseudoValue> inputValues,
@NotNull MagicKind kind
) {
return getDelegateBuilder().magic(instructionElement, valueElement, inputValues, kind);
@@ -77,7 +77,7 @@ public abstract class ControlFlowBuilderAdapter implements ControlFlowBuilder {
@NotNull
@Override
public MergeInstruction merge(@NotNull KtExpression expression, @NotNull List<PseudoValue> inputValues) {
public MergeInstruction merge(@NotNull KtExpression expression, @NotNull List<? extends PseudoValue> inputValues) {
return getDelegateBuilder().merge(expression, inputValues);
}
@@ -86,7 +86,7 @@ public abstract class ControlFlowBuilderAdapter implements ControlFlowBuilder {
public ReadValueInstruction readVariable(
@NotNull KtExpression expression,
@NotNull ResolvedCall<?> resolvedCall,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues
@NotNull Map<PseudoValue, ? extends ReceiverValue> receiverValues
) {
return getDelegateBuilder().readVariable(expression, resolvedCall, receiverValues);
}
@@ -96,8 +96,8 @@ public abstract class ControlFlowBuilderAdapter implements ControlFlowBuilder {
public CallInstruction call(
@NotNull KtElement valueElement,
@NotNull ResolvedCall<?> resolvedCall,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues,
@NotNull Map<PseudoValue, ValueParameterDescriptor> arguments
@NotNull Map<PseudoValue, ? extends ReceiverValue> receiverValues,
@NotNull Map<PseudoValue, ? extends ValueParameterDescriptor> arguments
) {
return getDelegateBuilder().call(valueElement, resolvedCall, receiverValues, arguments);
}
@@ -107,7 +107,7 @@ public abstract class ControlFlowBuilderAdapter implements ControlFlowBuilder {
public OperationInstruction predefinedOperation(
@NotNull KtExpression expression,
@NotNull PredefinedOperation operation,
@NotNull List<PseudoValue> inputValues
@NotNull List<? extends PseudoValue> inputValues
) {
return getDelegateBuilder().predefinedOperation(expression, operation, inputValues);
}
@@ -150,7 +150,7 @@ public abstract class ControlFlowBuilderAdapter implements ControlFlowBuilder {
}
@Override
public void nondeterministicJump(@NotNull List<Label> labels, @NotNull KtElement element) {
public void nondeterministicJump(@NotNull List<? extends Label> labels, @NotNull KtElement element) {
getDelegateBuilder().nondeterministicJump(labels, element);
}
@@ -253,7 +253,7 @@ public abstract class ControlFlowBuilderAdapter implements ControlFlowBuilder {
@NotNull KtElement lValue,
@NotNull PseudoValue rValue,
@NotNull AccessTarget target,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues) {
@NotNull Map<PseudoValue, ? extends ReceiverValue> receiverValues) {
getDelegateBuilder().write(assignment, lValue, rValue, target, receiverValues);
}
compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/ControlFlowInstructionsGenerator.java
+10 -10
View File
@@ -323,7 +323,7 @@ public class ControlFlowInstructionsGenerator extends ControlFlowBuilderAdapter
@NotNull KtElement lValue,
@NotNull PseudoValue rValue,
@NotNull AccessTarget target,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues) {
@NotNull Map<PseudoValue, ? extends ReceiverValue> receiverValues) {
add(new WriteValueInstruction(assignment, getCurrentScope(), target, receiverValues, lValue, rValue));
}
@@ -377,7 +377,7 @@ public class ControlFlowInstructionsGenerator extends ControlFlowBuilderAdapter
}
@Override
public void nondeterministicJump(@NotNull List<Label> labels, @NotNull KtElement element) {
public void nondeterministicJump(@NotNull List<? extends Label> labels, @NotNull KtElement element) {
//todo
//handleJumpInsideTryFinally(label);
add(new NondeterministicJumpInstruction(element, labels, getCurrentScope(), null));
@@ -431,7 +431,7 @@ public class ControlFlowInstructionsGenerator extends ControlFlowBuilderAdapter
@NotNull
@Override
public InstructionWithValue loadStringTemplate(@NotNull KtStringTemplateExpression expression, @NotNull List<PseudoValue> inputValues) {
public InstructionWithValue loadStringTemplate(@NotNull KtStringTemplateExpression expression, @NotNull List<? extends PseudoValue> inputValues) {
return inputValues.isEmpty() ? read(expression) : magic(expression, expression, inputValues, MagicKind.STRING_TEMPLATE);
}
@@ -440,7 +440,7 @@ public class ControlFlowInstructionsGenerator extends ControlFlowBuilderAdapter
public MagicInstruction magic(
@NotNull KtElement instructionElement,
@Nullable KtElement valueElement,
@NotNull List<PseudoValue> inputValues,
@NotNull List<? extends PseudoValue> inputValues,
@NotNull MagicKind kind
) {
MagicInstruction instruction = new MagicInstruction(
@@ -452,7 +452,7 @@ public class ControlFlowInstructionsGenerator extends ControlFlowBuilderAdapter
@NotNull
@Override
public MergeInstruction merge(@NotNull KtExpression expression, @NotNull List<PseudoValue> inputValues) {
public MergeInstruction merge(@NotNull KtExpression expression, @NotNull List<? extends PseudoValue> inputValues) {
MergeInstruction instruction = new MergeInstruction(expression, getCurrentScope(), inputValues, valueFactory);
add(instruction);
return instruction;
@@ -463,7 +463,7 @@ public class ControlFlowInstructionsGenerator extends ControlFlowBuilderAdapter
public ReadValueInstruction readVariable(
@NotNull KtExpression expression,
@NotNull ResolvedCall<?> resolvedCall,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues
@NotNull Map<PseudoValue, ? extends ReceiverValue> receiverValues
) {
return read(expression, resolvedCall, receiverValues);
}
@@ -473,8 +473,8 @@ public class ControlFlowInstructionsGenerator extends ControlFlowBuilderAdapter
public CallInstruction call(
@NotNull KtElement valueElement,
@NotNull ResolvedCall<?> resolvedCall,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues,
@NotNull Map<PseudoValue, ValueParameterDescriptor> arguments
@NotNull Map<PseudoValue, ? extends ReceiverValue> receiverValues,
@NotNull Map<PseudoValue, ? extends ValueParameterDescriptor> arguments
) {
KotlinType returnType = resolvedCall.getResultingDescriptor().getReturnType();
CallInstruction instruction = new CallInstruction(
@@ -494,7 +494,7 @@ public class ControlFlowInstructionsGenerator extends ControlFlowBuilderAdapter
public OperationInstruction predefinedOperation(
@NotNull KtExpression expression,
@NotNull PredefinedOperation operation,
@NotNull List<PseudoValue> inputValues
@NotNull List<? extends PseudoValue> inputValues
) {
return magic(expression, expression, inputValues, getMagicKind(operation));
}
@@ -517,7 +517,7 @@ public class ControlFlowInstructionsGenerator extends ControlFlowBuilderAdapter
private ReadValueInstruction read(
@NotNull KtExpression expression,
@Nullable ResolvedCall<?> resolvedCall,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues
@NotNull Map<PseudoValue, ? extends ReceiverValue> receiverValues
) {
AccessTarget accessTarget = resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE;
ReadValueInstruction instruction = new ReadValueInstruction(