- Changed setOwner to automatically update the ...

- Changed setOwner to automatically update the owner of the associated
class (for modules) and constructor (for classes).

1 files changed, 1 insertions, 2 deletions

diff --git a/sources/scalac/transformer/AddInterfaces.java b/sources/scalac/transformer/AddInterfaces.java
index 71a3a3db52..c4a1eabe9e 100644
--- a/sources/scalac/transformer/AddInterfaces.java
+++ b/sources/scalac/transformer/AddInterfaces.java
@@ -663,7 +663,6 @@ class AddInterfaces extends SubstTransformer {
                 if (ifaceToClass.containsKey(classSym.owner())) {
                     Symbol newOwner = (Symbol)ifaceToClass.get(classSym.owner());
                     classSym.setOwner(newOwner);
-                    classConstrSym.setOwner(newOwner);
                 }
 
                 Symbol[] ifaceTParams = ifaceSym.typeParams();
@@ -698,7 +697,7 @@ class AddInterfaces extends SubstTransformer {
                     ifaceMemberSym.updateInfo(tparamsSM.apply(ifaceMemberSym.info()));
 
                     if (! memberGoesInInterface(ifaceMemberSym)) {
-                        ifaceMemberSym.setOwner(classSym);
+                        if (!ifaceMemberSym.isPrimaryConstructor()) ifaceMemberSym.setOwner(classSym);
                         classMembers.enterOrOverload(ifaceMemberSym);
                         continue;
                     }