surgically fixing a broken build.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
index 92b4afce17..fca5c05586 100644
--- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
@@ -365,7 +365,7 @@ trait Definitions {
 
     private def newClass(owner: Symbol, name: Name, parents: List[Type]): Symbol = {
       val clazz = owner.newClass(NoPosition, name.toTypeName)
-      clazz.setInfo(ClassInfoType(parents, newClassScope, clazz))
+      clazz.setInfo(ClassInfoType(parents, newClassScope(clazz), clazz))
       owner.info.decls.enter(clazz)
       clazz
     }
@@ -376,7 +376,7 @@ trait Definitions {
       clazz.setInfo(
         PolyType(
           List(tparam),
-          ClassInfoType(List(parent(tparam)), newClassScope, clazz)))
+          ClassInfoType(List(parent(tparam)), newClassScope(clazz), clazz)))
     }
 
     private def newAlias(owner: Symbol, name: Name, alias: Type): Symbol = {
@@ -451,7 +451,7 @@ trait Definitions {
       val module = ScalaPackageClass.newModule(NoPosition, name)
       ScalaPackageClass.info.decls.enter(module)
       val mclass = module.moduleClass
-      mclass.setInfo(ClassInfoType(List(), newClassScope, mclass))
+      mclass.setInfo(ClassInfoType(List(), newClassScope(mclass), mclass))
       module.setInfo(mclass.tpe)
 
       val box = newMethod(mclass, nme.box, List(clazz.typeConstructor),
@@ -654,7 +654,7 @@ trait Definitions {
       if (isInitialized) return
       isInitialized = true
 
-      EmptyPackageClass.setInfo(ClassInfoType(List(), newClassScope, EmptyPackageClass))
+      EmptyPackageClass.setInfo(ClassInfoType(List(), newClassScope(EmptyPackageClass), EmptyPackageClass))
       EmptyPackage.setInfo(EmptyPackageClass.tpe)
       RootClass.info.decls.enter(EmptyPackage)
       RootClass.info.decls.enter(RootPackage)
@@ -706,7 +706,7 @@ trait Definitions {
         EqualsPatternClass.setInfo(
           PolyType(
             List(tparam),
-            ClassInfoType(List(AnyClass.typeConstructor), newClassScope, EqualsPatternClass)))
+            ClassInfoType(List(AnyClass.typeConstructor), newClassScope(EqualsPatternClass), EqualsPatternClass)))
       }
 
       /* <unapply> */