Implement copy in FunctionDescriptorImpl, call doSubstitute only in CopyConfiguration#build

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java

@@ -269,9 +269,10 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
         ConstructorDescriptor primaryConstructor = getUnsubstitutedPrimaryConstructor();
         if (primaryConstructor != null) return primaryConstructor;
 
-        return new FunctionDescriptorImpl(LazyClassDescriptor.this, null, Annotations.Companion.getEMPTY(),
+        return new FunctionDescriptorImpl(
-                                          Name.special("<init-blocks>"),
+                LazyClassDescriptor.this, null, Annotations.Companion.getEMPTY(), Name.special("<init-blocks>"),
-                                          CallableMemberDescriptor.Kind.SYNTHESIZED, SourceElement.NO_SOURCE) {
+                CallableMemberDescriptor.Kind.SYNTHESIZED, SourceElement.NO_SOURCE
+        ) {
             @NotNull
             @Override
             protected FunctionDescriptorImpl createSubstitutedCopy(
@@ -284,18 +285,6 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
             ) {
                 throw new UnsupportedOperationException();
             }
-
-            @NotNull
-            @Override
-            public FunctionDescriptor copy(
-                    DeclarationDescriptor newOwner,
-                    Modality modality,
-                    Visibility visibility,
-                    Kind kind,
-                    boolean copyOverrides
-            ) {
-                throw new UnsupportedOperationException();
-            }
         };
     }
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ConstructorDescriptorImpl.java

@@ -156,15 +156,13 @@ public class ConstructorDescriptorImpl extends FunctionDescriptorImpl implements
 
     @NotNull
     @Override
-    public ConstructorDescriptor copy(DeclarationDescriptor newOwner, Modality modality, Visibility visibility, Kind kind, boolean copyOverrides) {
+    public ConstructorDescriptor copy(
-        //noinspection ConstantConditions
+            DeclarationDescriptor newOwner,
-        return (ConstructorDescriptor) doSubstitute(
+            Modality modality,
-                (CopyConfiguration) newCopyBuilder()
+            Visibility visibility,
-                        .setOwner(newOwner)
+            Kind kind,
-                        .setModality(modality)
+            boolean copyOverrides
-                        .setVisibility(visibility)
+    ) {
-                        .setKind(kind)
+        return (ConstructorDescriptor) super.copy(newOwner, modality, visibility, kind, copyOverrides);
-                        .setCopyOverrides(copyOverrides)
-        );
     }
 }

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java

@@ -315,7 +315,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
         if (originalSubstitutor.isEmpty()) {
             return this;
         }
-        return doSubstitute(newCopyBuilder(originalSubstitutor).setOriginal(getOriginal()));
+        return newCopyBuilder(originalSubstitutor).setOriginal(getOriginal()).build();
     }
 
     @Nullable
@@ -691,6 +691,24 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
         return substitutedDescriptor;
     }
 
+    @NotNull
+    @Override
+    public FunctionDescriptor copy(
+            DeclarationDescriptor newOwner,
+            Modality modality,
+            Visibility visibility,
+            Kind kind,
+            boolean copyOverrides
+    ) {
+        return newCopyBuilder()
+                .setOwner(newOwner)
+                .setModality(modality)
+                .setVisibility(visibility)
+                .setKind(kind)
+                .setCopyOverrides(copyOverrides)
+                .build();
+    }
+
     @NotNull
     protected abstract FunctionDescriptorImpl createSubstitutedCopy(
             @NotNull DeclarationDescriptor newOwner,

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SimpleFunctionDescriptorImpl.java

@@ -99,14 +99,7 @@ public class SimpleFunctionDescriptorImpl extends FunctionDescriptorImpl impleme
             Kind kind,
             boolean copyOverrides
     ) {
-        //noinspection ConstantConditions
+        return (SimpleFunctionDescriptor) super.copy(newOwner, modality, visibility, kind, copyOverrides);
-        return newCopyBuilder()
-                    .setOwner(newOwner)
-                    .setModality(modality)
-                    .setVisibility(visibility)
-                    .setKind(kind)
-                    .setCopyOverrides(copyOverrides)
-                    .build();
     }
 
     @NotNull