From b365e547c4e58a39b45a8afc62b4690221e154b3 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 23 Sep 2016 14:01:35 +0200
Subject: [PATCH] DelegatingBindingTrace: remove unnecessary secondary
 constructor

---
 .../org/jetbrains/kotlin/codegen/state/GenerationState.kt  | 2 +-
 .../org/jetbrains/kotlin/resolve/DelegatingBindingTrace.kt | 7 ++-----
 .../jetbrains/kotlin/resolve/TemporaryBindingTrace.java    | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
index b62d18360dd..fe974c52dc6 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
@@ -114,7 +114,7 @@ class GenerationState @JvmOverloads constructor(
         }
     }
 
-    val extraJvmDiagnosticsTrace: BindingTrace = DelegatingBindingTrace(bindingContext, false, "For extra diagnostics in ${this.javaClass}")
+    val extraJvmDiagnosticsTrace: BindingTrace = DelegatingBindingTrace(bindingContext, "For extra diagnostics in ${this.javaClass}", false)
     private val interceptedBuilderFactory: ClassBuilderFactory
     private var used = false
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.kt
index 793720687a6..f2101b875ac 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.kt
@@ -27,8 +27,8 @@ import org.jetbrains.kotlin.types.expressions.typeInfoFactory.createTypeInfo
 import org.jetbrains.kotlin.util.slicedMap.*
 
 open class DelegatingBindingTrace(private val parentContext: BindingContext,
-                                  withParentDiagnostics: Boolean,
-                                  private val name: String) : BindingTrace {
+                                  private val name: String,
+                                  withParentDiagnostics: Boolean = true) : BindingTrace {
     private val map = if (BindingTraceContext.TRACK_REWRITES) TrackingSlicedMap(BindingTraceContext.TRACK_WITH_STACK_TRACES) else SlicedMapImpl.create()
     private val mutableDiagnostics: MutableDiagnosticsWithSuppression
 
@@ -59,9 +59,6 @@ open class DelegatingBindingTrace(private val parentContext: BindingContext,
 
     private val bindingContext = MyBindingContext()
 
-    constructor(parentContext: BindingContext, debugName: String) : this(parentContext, true, debugName) {
-    }
-
     init {
         this.mutableDiagnostics = if (withParentDiagnostics)
             MutableDiagnosticsWithSuppression(bindingContext, parentContext.diagnostics)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java
index a24291fdb7e..994e68f8287 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java
@@ -34,7 +34,7 @@ public class TemporaryBindingTrace extends DelegatingBindingTrace {
     protected final BindingTrace trace;
 
     protected TemporaryBindingTrace(@NotNull BindingTrace trace, String debugName) {
-        super(trace.getBindingContext(), debugName);
+        super(trace.getBindingContext(), debugName, true);
         this.trace = trace;
     }