From 7203a7833ac8bb8410735264d3ba3f856d430973 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 23 Jul 2015 17:30:09 +0300
Subject: [PATCH] Minor: Inject builtins in ControlFlowAnalyzer

---
 .../org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java
index 1ae7671d04f..d860f723095 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java
@@ -32,9 +32,11 @@ import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE;
 
 public class ControlFlowAnalyzer {
     @NotNull private final BindingTrace trace;
+    @NotNull private final KotlinBuiltIns builtIns;
 
-    public ControlFlowAnalyzer(@NotNull BindingTrace trace) {
+    public ControlFlowAnalyzer(@NotNull BindingTrace trace, @NotNull KotlinBuiltIns builtIns) {
         this.trace = trace;
+        this.builtIns = builtIns;
     }
 
     public void process(@NotNull BodiesResolveContext c) {
@@ -65,7 +67,7 @@ public class ControlFlowAnalyzer {
     private void checkSecondaryConstructor(@NotNull JetSecondaryConstructor constructor) {
         JetFlowInformationProvider flowInformationProvider = new JetFlowInformationProvider(constructor, trace);
         flowInformationProvider.checkDeclaration();
-        flowInformationProvider.checkFunction(KotlinBuiltIns.getInstance().getUnitType());
+        flowInformationProvider.checkFunction(builtIns.getUnitType());
     }
 
     private void checkDeclarationContainer(@NotNull BodiesResolveContext c, JetDeclarationContainer declarationContainer) {