Revert "Fixes SI-6236."

This reverts commit faa114e.
scala · gkossakowski · Sep 18, 2012 · Sep 14, 2012 · Sep 14, 2012 · Sep 14, 2012
commit 6854842cf88f020289b783983d13ebef4d7605f4
diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
@@ -911,19 +911,8 @@ abstract class GenICode extends SubComponent  {
           generatedType = toTypeKind(sym.accessed.info)
           val hostOwner = qual.tpe.typeSymbol.orElse(sym.owner)
           val hostClass = hostOwner.companionClass
-          val staticfield = hostClass.info.findMember(sym.accessed.name, NoFlags, NoFlags, false) orElse {
-            if (!currentRun.compiles(hostOwner)) {
-              // hostOwner was separately compiled -- the static field symbol needs to be recreated in hostClass
-              import Flags._
-              debuglog("recreating sym.accessed.name: " + sym.accessed.name)
-              val objectfield = hostOwner.info.findMember(sym.accessed.name, NoFlags, NoFlags, false)
-              val staticfield = hostClass.newVariable(newTermName(sym.accessed.name.toString), tree.pos, STATIC | SYNTHETIC | FINAL) setInfo objectfield.tpe
-              staticfield.addAnnotation(definitions.StaticClass)
-              hostClass.info.decls enter staticfield
-              staticfield
-            } else NoSymbol
-          }
-
+          val staticfield = hostClass.info.findMember(sym.accessed.name, NoFlags, NoFlags, false)
+
           if (sym.isGetter) {
             ctx.bb.emit(LOAD_FIELD(staticfield, true) setHostClass hostClass, tree.pos)
             ctx

diff --git a/src/compiler/scala/tools/nsc/transform/CleanUp.scala b/src/compiler/scala/tools/nsc/transform/CleanUp.scala
@@ -594,7 +594,7 @@ abstract class CleanUp extends Transform with ast.TreeDSL {
           // create a static field in the companion class for this @static field
           val stfieldSym = linkedClass.newVariable(newTermName(name), tree.pos, STATIC | SYNTHETIC | FINAL) setInfo sym.tpe
           stfieldSym.addAnnotation(StaticClass)
-
+          
           val names = classNames.getOrElseUpdate(linkedClass, linkedClass.info.decls.collect {
             case sym if sym.name.isTermName => sym.name
           } toSet)

diff --git a/test/files/run/static-annot/field.scala b/test/files/run/static-annot/field.scala
@@ -23,10 +23,8 @@ class Foo
 trait Check {
   def checkStatic(cls: Class[_]) {
     cls.getDeclaredFields.find(_.getName == "bar") match {
-      case Some(f) =>
-        assert(Modifier.isStatic(f.getModifiers), "no static modifier")
-      case None =>
-        assert(false, "no static field bar in class")
+      case Some(f) => assert(Modifier.isStatic(f.getModifiers), "no static modifier")
+      case None => assert(false, "no static field bar in class")
     }
   }
 
@@ -172,20 +170,13 @@ object Foo7 {
     @static val bar = "string"
   }
   class AndHisFriend
-
-  object AndHisLonelyFriend {
-    @static val bar = "another"
-  }
 }
 
 
 object Test7 extends Check {
   def test() {
     checkStatic(classOf[Foo7.AndHisFriend])
     assert(Foo7.AndHisFriend.bar == "string")
-
-    checkStatic(Class.forName("Foo7$AndHisLonelyFriend"))
-    assert(Foo7.AndHisLonelyFriend.bar == "another")
   }
 }
 

diff --git a/test/files/run/t6236.check b/test/files/run/t6236.check
diff --git a/test/files/run/t6236/file_1.scala b/test/files/run/t6236/file_1.scala
diff --git a/test/files/run/t6236/file_2.scala b/test/files/run/t6236/file_2.scala