From d665146e9a74773943b9f1a439deebcb53ba8333 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 5 Dec 2013 13:29:47 +0400 Subject: [PATCH] No real need to check whether expressions have already been marked --- .../src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java | 2 -- compiler/testData/cfg/ArrayAccess.instructions | 1 + compiler/testData/cfg/arraySetPlusAssign.instructions | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index a8bacaf8daa..b3ae47f17ce 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -64,7 +64,6 @@ public class JetControlFlowProcessor { private final JetControlFlowBuilder builder; private final BindingTrace trace; - private final Set marked = new HashSet(); public JetControlFlowProcessor(BindingTrace trace) { this.builder = new JetControlFlowInstructionsGenerator(); @@ -142,7 +141,6 @@ public class JetControlFlowProcessor { } private void mark(JetElement element) { - if (!marked.add(element)) return; builder.mark(element); } diff --git a/compiler/testData/cfg/ArrayAccess.instructions b/compiler/testData/cfg/ArrayAccess.instructions index 7b84e4843fb..6e78e9886af 100644 --- a/compiler/testData/cfg/ArrayAccess.instructions +++ b/compiler/testData/cfg/ArrayAccess.instructions @@ -35,6 +35,7 @@ L0: call(a[10], get) r(1) call(+=, plus) + mark(a[10]) r(a) r(10) r(1) diff --git a/compiler/testData/cfg/arraySetPlusAssign.instructions b/compiler/testData/cfg/arraySetPlusAssign.instructions index 04367b2808f..180a9ab35ce 100644 --- a/compiler/testData/cfg/arraySetPlusAssign.instructions +++ b/compiler/testData/cfg/arraySetPlusAssign.instructions @@ -15,6 +15,7 @@ L0: call(a[0], get) r(1) call(+=, plus) + mark(a[0]) r(a) r(0) r(1)