*** empty log message ***

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4976 5e8d7ff9-d8ef-0310-90f0-a4852d11357a

sources/scala/tools/nsc/symtab/Symbols.scala

@@ -605,7 +605,7 @@ import Flags._;
      *  term symbol rename it by expanding its name to avoid name clashes
      */
     final def makeNotPrivate(base: Symbol): unit =
-      if (isTerm && (this hasFlag PRIVATE)) {
+      if (isTerm && !(this hasFlag notPRIVATE) && (this hasFlag PRIVATE) || this.owner.isTerm) {
         setFlag(notPRIVATE);
         if (!hasFlag(DEFERRED)) setFlag(lateFINAL);
         expandName(base)

sources/scala/tools/nsc/transform/Erasure.scala

@@ -519,6 +519,7 @@ abstract class Erasure extends AddInterfaces with typechecker.Analyzer {
         if (tree.symbol == ArrayClass) return tree;
         val tree1 = tree match {
           case ClassDef(mods, name, tparams, tpt, impl) => 
+            if (settings.debug.value) log("defs of " + tree.symbol + " = " + tree.symbol.info.decls);
             copy.ClassDef(tree, mods, name, List(), tpt, impl)
           case DefDef(mods, name, tparams, vparamss, tpt, rhs) =>
             copy.DefDef(tree, mods, name, List(), vparamss, tpt, rhs)