From c1cef019cedf3a16d591f3f00c2c9e50c00b2799 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 14 May 2013 16:40:20 +0400
Subject: [PATCH] More low-level constructor added

---
 .../serialization/DescriptorDeserializer.java | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
index e2a43394e60..2163c30a787 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
@@ -43,15 +43,26 @@ public class DescriptorDeserializer {
     private final NameResolver nameResolver;
     private final TypeDeserializer typeDeserializer;
 
+    public DescriptorDeserializer(
+            @NotNull TypeDeserializer typeDeserializer,
+            @NotNull DeclarationDescriptor containingDeclaration,
+            @NotNull NameResolver nameResolver
+    ) {
+        this.typeDeserializer = typeDeserializer;
+        this.containingDeclaration = containingDeclaration;
+        this.nameResolver = nameResolver;
+    }
+
     public DescriptorDeserializer(
             @Nullable DescriptorDeserializer parent,
             @NotNull DeclarationDescriptor containingDeclaration,
             @NotNull NameResolver nameResolver
     ) {
-        TypeDeserializer parentTypeDeserializer = parent == null ? null : parent.typeDeserializer;
-        this.typeDeserializer = new TypeDeserializer(parentTypeDeserializer, nameResolver);
-        this.containingDeclaration = containingDeclaration;
-        this.nameResolver = nameResolver;
+        this(
+                new TypeDeserializer(parent == null ? null : parent.typeDeserializer, nameResolver),
+                containingDeclaration,
+                nameResolver
+        );
     }
 
     @NotNull