From b01dc094db463fca1490a00f9b4de7bea0ac64a5 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Wed, 5 Dec 2012 12:55:33 +0400
Subject: [PATCH] parameter removed from 'jumpToError' method

---
 .../jetbrains/jet/lang/cfg/JetControlFlowBuilder.java  |  3 +--
 .../jet/lang/cfg/JetControlFlowBuilderAdapter.java     | 10 ++--------
 .../jet/lang/cfg/JetControlFlowProcessor.java          |  8 ++++----
 .../JetControlFlowInstructionsGenerator.java           |  7 +------
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
index d4629290aa8..b217df045da 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
@@ -44,8 +44,7 @@ public interface JetControlFlowBuilder {
     void jumpOnTrue(@NotNull Label label);
     void nondeterministicJump(Label label); // Maybe, jump to label
     void nondeterministicJump(List<Label> label);
-    void jumpToError(JetThrowExpression expression);
-    void jumpToError(JetExpression nothingExpression);
+    void jumpToError();
 
     // Entry/exit points
     Label getEntryPoint(@NotNull JetElement labelElement);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java
index 8fde7bb070c..d80fb19074f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java
@@ -97,15 +97,9 @@ public class JetControlFlowBuilderAdapter implements JetControlFlowBuilder {
     }
 
     @Override
-    public void jumpToError(JetThrowExpression expression) {
+    public void jumpToError() {
         assert builder != null;
-        builder.jumpToError(expression);
-    }
-
-    @Override
-    public void jumpToError(JetExpression nothingExpression) {
-        assert builder != null;
-        builder.jumpToError(nothingExpression);
+        builder.jumpToError();
     }
 
     @Override
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 9e4310230f4..b15478cc1de 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
@@ -170,7 +170,7 @@ public class JetControlFlowProcessor {
             if (trace.get(BindingContext.PROCESSED, expression)) {
                 JetType type = trace.getBindingContext().get(BindingContext.EXPRESSION_TYPE, expression);
                 if (type != null && KotlinBuiltIns.getInstance().isNothing(type)) {
-                    builder.jumpToError(expression);
+                    builder.jumpToError();
                 }
             }
         }
@@ -627,7 +627,7 @@ public class JetControlFlowProcessor {
             if (trace.get(BindingContext.PROCESSED, expression)) {
                 JetType type = trace.getBindingContext().get(BindingContext.EXPRESSION_TYPE, expression);
                 if (type != null && KotlinBuiltIns.getInstance().isNothing(type)) {
-                    builder.jumpToError(expression);
+                    builder.jumpToError();
                 }
             }
         }
@@ -669,7 +669,7 @@ public class JetControlFlowProcessor {
             if (trace.get(BindingContext.PROCESSED, expression)) {
                 JetType type = trace.getBindingContext().get(BindingContext.EXPRESSION_TYPE, expression);
                 if (type != null && KotlinBuiltIns.getInstance().isNothing(type)) {
-                    builder.jumpToError(expression);
+                    builder.jumpToError();
                 }
             }
         }
@@ -739,7 +739,7 @@ public class JetControlFlowProcessor {
             if (thrownExpression != null) {
                 value(thrownExpression, false);
             }
-            builder.jumpToError(expression);
+            builder.jumpToError();
         }
 
         @Override
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
index 86f4dfa7954..7306dada2a6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
@@ -294,15 +294,10 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
         }
 
         @Override
-        public void jumpToError(JetThrowExpression expression) {
+        public void jumpToError() {
             add(new UnconditionalJumpInstruction(error));
         }
         
-        @Override
-        public void jumpToError(JetExpression nothingExpression) {
-            add(new UnconditionalJumpInstruction(error));
-        }
-
         @Override
         public void enterTryFinally(@NotNull GenerationTrigger generationTrigger) {
             allBlocks.push(new TryFinallyBlockInfo(generationTrigger));