diff options
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 23 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala | 82 | ||||
-rw-r--r-- | test/disabled/run/spec-matrix.check (renamed from test/files/run/spec-matrix.check) | 0 | ||||
-rw-r--r-- | test/disabled/run/spec-matrix.scala (renamed from test/files/run/spec-matrix.scala) | 0 | ||||
-rw-r--r-- | test/files/jvm/actor-getstate.check (renamed from test/disabled/jvm/actor-getstate.check) | 0 | ||||
-rw-r--r-- | test/files/jvm/actor-getstate.scala (renamed from test/disabled/jvm/actor-getstate.scala) | 0 | ||||
-rw-r--r-- | test/files/jvm/actor-receivewithin.check (renamed from test/disabled/jvm/actor-receivewithin.check) | 0 | ||||
-rw-r--r-- | test/files/jvm/actor-receivewithin.scala (renamed from test/disabled/jvm/actor-receivewithin.scala) | 0 | ||||
-rw-r--r-- | test/files/run/Course-2002-10-msil.check (renamed from test/disabled/run/Course-2002-10-msil.check) | 0 | ||||
-rw-r--r-- | test/files/run/Course-2002-10.check (renamed from test/disabled/run/Course-2002-10.check) | 0 | ||||
-rw-r--r-- | test/files/run/Course-2002-10.scala (renamed from test/disabled/run/Course-2002-10.scala) | 0 | ||||
-rw-r--r-- | test/files/run/Course-2002-13.check (renamed from test/disabled/run/Course-2002-13.check) | 0 | ||||
-rw-r--r-- | test/files/run/Course-2002-13.scala (renamed from test/disabled/run/Course-2002-13.scala) | 0 | ||||
-rw-r--r-- | test/files/run/infiniteloop.check (renamed from test/disabled/run/infiniteloop.check) | 0 | ||||
-rw-r--r-- | test/files/run/infiniteloop.scala (renamed from test/disabled/run/infiniteloop.scala) | 0 | ||||
-rw-r--r-- | test/files/run/streamWithFilter.check (renamed from test/disabled/run/streamWithFilter.check) | 0 | ||||
-rw-r--r-- | test/files/run/streamWithFilter.scala (renamed from test/disabled/run/streamWithFilter.scala) | 0 |
17 files changed, 66 insertions, 39 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 3a8d93a7a7..c78664bc19 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -221,9 +221,14 @@ abstract class ClassfileParser { val ownerTpe = getClassOrArrayType(in.getChar(start + 1)) if (settings.debug.value) log("getMemberSymbol(static: " + static + "): owner type: " + ownerTpe + " " + ownerTpe.typeSymbol.originalName) - val (name, tpe) = getNameAndType(in.getChar(start + 3), ownerTpe) + val (name0, tpe0) = getNameAndType(in.getChar(start + 3), ownerTpe) if (settings.debug.value) - log("getMemberSymbol: name and tpe: " + name + ": " + tpe) + log("getMemberSymbol: name and tpe: " + name0 + ": " + tpe0) + + forceMangledName(tpe0.typeSymbol.name, false) + val (name, tpe) = getNameAndType(in.getChar(start + 3), ownerTpe) +// println("new tpe: " + tpe + " at phase: " + phase) + if (name == nme.MODULE_INSTANCE_FIELD) { val index = in.getChar(start + 1) val name = getExternalName(in.getChar(starts(index) + 1)) @@ -240,9 +245,10 @@ abstract class ClassfileParser { f = owner.info.member(newTermName(origName.toString + nme.LOCAL_SUFFIX)).suchThat(_.tpe =:= tpe) if (f == NoSymbol) { // if it's an impl class, try to find it's static member inside the class - if (ownerTpe.typeSymbol.isImplClass) + if (ownerTpe.typeSymbol.isImplClass) { +// println("impl class, member: " + owner.tpe.member(origName) + ": " + owner.tpe.member(origName).tpe) f = ownerTpe.member(origName).suchThat(_.tpe =:= tpe) - else { + } else { log("Couldn't find " + name + ": " + tpe + " inside: \n" + ownerTpe) f = if (tpe.isInstanceOf[MethodType]) owner.newMethod(owner.pos, name).setInfo(tpe) else owner.newValue(owner.pos, name).setInfo(tpe).setFlag(MUTABLE) @@ -384,11 +390,14 @@ abstract class ClassfileParser { * flatten would not lift classes that were not referenced in the source code. */ def forceMangledName(name: Name, module: Boolean): Symbol = { - val parts = name.toString.split(Array('.', '$')) + val parts = name.decode.toString.split(Array('.', '$')) var sym: Symbol = definitions.RootClass atPhase(currentRun.flattenPhase.prev) { - for (part0 <- parts; val part = newTermName(part0)) { - val sym1 = sym.info.decl(part.encode)//.suchThat(module == _.isModule) + for (part0 <- parts; if !(part0 == ""); val part = newTermName(part0)) { + val sym1 = atPhase(currentRun.icodePhase) { + sym.linkedClassOfClass.info + sym.info.decl(part.encode) + }//.suchThat(module == _.isModule) if (sym1 == NoSymbol) sym = sym.info.decl(part.encode.toTypeName) else diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala index 92dfb3749a..e129737ebd 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala @@ -99,26 +99,34 @@ abstract class ICodeReader extends ClassfileParser { val owner = getOwner(jflags) val dummySym = owner.newMethod(owner.pos, name).setFlag(javaToScalaFlags(jflags)) - var tpe = pool.getType(dummySym, in.nextChar) - - if ("<clinit>" == name.toString) - (jflags, NoSymbol) - else { - val owner = getOwner(jflags) - var sym = owner.info.member(name).suchThat(old => sameType(old.tpe, tpe)); - if (sym == NoSymbol) - sym = owner.info.member(newTermName(name.toString + nme.LOCAL_SUFFIX)).suchThat(old => old.tpe =:= tpe); - if (sym == NoSymbol) { - log("Could not find symbol for " + name + ": " + tpe + " in " + owner.info.decls) - log(owner.info.member(name).tpe + " : " + tpe) - if (field) - sym = owner.newValue(owner.pos, name).setInfo(tpe).setFlag(MUTABLE | javaToScalaFlags(jflags)) - else - sym = dummySym.setInfo(tpe) - owner.info.decls.enter(sym) - log("added " + sym + ": " + sym.tpe) + try { + val ch = in.nextChar + var tpe = pool.getType(dummySym, ch) + + if ("<clinit>" == name.toString) + (jflags, NoSymbol) + else { + val owner = getOwner(jflags) + var sym = owner.info.member(name).suchThat(old => sameType(old.tpe, tpe)); + if (sym == NoSymbol) + sym = owner.info.member(newTermName(name.toString + nme.LOCAL_SUFFIX)).suchThat(old => old.tpe =:= tpe); + if (sym == NoSymbol) { + log("Could not find symbol for " + name + ": " + tpe + " in " + owner.info.decls) + log(owner.info.member(name).tpe + " : " + tpe) + if (name.toString() == "toMap") + tpe = pool.getType(dummySym, ch) + if (field) + sym = owner.newValue(owner.pos, name).setInfo(tpe).setFlag(MUTABLE | javaToScalaFlags(jflags)) + else + sym = dummySym.setInfo(tpe) + owner.info.decls.enter(sym) + log("added " + sym + ": " + sym.tpe) + } + (jflags, sym) } - (jflags, sym) + } catch { + case e: MissingRequirementError => + (jflags, NoSymbol) } } @@ -149,18 +157,25 @@ abstract class ICodeReader extends ClassfileParser { override def parseMethod() { val (jflags, sym) = parseMember(false) - if (sym != NoSymbol) { - log("Parsing method " + sym.fullName + ": " + sym.tpe); - this.method = new IMethod(sym); - this.method.returnType = toTypeKind(sym.tpe.resultType) - getCode(jflags).addMethod(this.method) - if ((jflags & JAVA_ACC_NATIVE) != 0) - this.method.native = true - val attributeCount = in.nextChar - for (i <- 0 until attributeCount) parseAttribute() - } else { - if (settings.debug.value) log("Skipping non-existent method."); - skipAttributes(); + var beginning = in.bp + try { + if (sym != NoSymbol) { + log("Parsing method " + sym.fullName + ": " + sym.tpe); + this.method = new IMethod(sym); + this.method.returnType = toTypeKind(sym.tpe.resultType) + getCode(jflags).addMethod(this.method) + if ((jflags & JAVA_ACC_NATIVE) != 0) + this.method.native = true + val attributeCount = in.nextChar + for (i <- 0 until attributeCount) parseAttribute() + } else { + if (settings.debug.value) log("Skipping non-existent method."); + skipAttributes(); + } + } catch { + case e: MissingRequirementError => + in.bp = beginning; skipAttributes + if (settings.debug.value) log("Skipping non-existent method. " + e.msg); } } @@ -187,12 +202,15 @@ abstract class ICodeReader extends ClassfileParser { definitions.getClass(name) } else if (name.endsWith("$")) { val sym = forceMangledName(name.subName(0, name.length -1).decode, true) +// println("classNameToSymbol: " + name + " sym: " + sym) + if (name.toString == "scala.collection.immutable.Stream$$hash$colon$colon$") + print("") if (sym == NoSymbol) definitions.getModule(name.subName(0, name.length - 1)) else sym } else { forceMangledName(name, false) - definitions.getClass(name) + atPhase(currentRun.flattenPhase.next)(definitions.getClass(name)) } if (sym.isModule) sym.moduleClass diff --git a/test/files/run/spec-matrix.check b/test/disabled/run/spec-matrix.check index 72e8ffc0db..72e8ffc0db 100644 --- a/test/files/run/spec-matrix.check +++ b/test/disabled/run/spec-matrix.check diff --git a/test/files/run/spec-matrix.scala b/test/disabled/run/spec-matrix.scala index 81e3eaf212..81e3eaf212 100644 --- a/test/files/run/spec-matrix.scala +++ b/test/disabled/run/spec-matrix.scala diff --git a/test/disabled/jvm/actor-getstate.check b/test/files/jvm/actor-getstate.check index 2c94e48371..2c94e48371 100644 --- a/test/disabled/jvm/actor-getstate.check +++ b/test/files/jvm/actor-getstate.check diff --git a/test/disabled/jvm/actor-getstate.scala b/test/files/jvm/actor-getstate.scala index a6e15a8721..a6e15a8721 100644 --- a/test/disabled/jvm/actor-getstate.scala +++ b/test/files/jvm/actor-getstate.scala diff --git a/test/disabled/jvm/actor-receivewithin.check b/test/files/jvm/actor-receivewithin.check index a6a3e88c61..a6a3e88c61 100644 --- a/test/disabled/jvm/actor-receivewithin.check +++ b/test/files/jvm/actor-receivewithin.check diff --git a/test/disabled/jvm/actor-receivewithin.scala b/test/files/jvm/actor-receivewithin.scala index a5c87c2722..a5c87c2722 100644 --- a/test/disabled/jvm/actor-receivewithin.scala +++ b/test/files/jvm/actor-receivewithin.scala diff --git a/test/disabled/run/Course-2002-10-msil.check b/test/files/run/Course-2002-10-msil.check index bbd9414370..bbd9414370 100644 --- a/test/disabled/run/Course-2002-10-msil.check +++ b/test/files/run/Course-2002-10-msil.check diff --git a/test/disabled/run/Course-2002-10.check b/test/files/run/Course-2002-10.check index 207b671f05..207b671f05 100644 --- a/test/disabled/run/Course-2002-10.check +++ b/test/files/run/Course-2002-10.check diff --git a/test/disabled/run/Course-2002-10.scala b/test/files/run/Course-2002-10.scala index e978bc8258..e978bc8258 100644 --- a/test/disabled/run/Course-2002-10.scala +++ b/test/files/run/Course-2002-10.scala diff --git a/test/disabled/run/Course-2002-13.check b/test/files/run/Course-2002-13.check index 7664f70576..7664f70576 100644 --- a/test/disabled/run/Course-2002-13.check +++ b/test/files/run/Course-2002-13.check diff --git a/test/disabled/run/Course-2002-13.scala b/test/files/run/Course-2002-13.scala index c016d41a90..c016d41a90 100644 --- a/test/disabled/run/Course-2002-13.scala +++ b/test/files/run/Course-2002-13.scala diff --git a/test/disabled/run/infiniteloop.check b/test/files/run/infiniteloop.check index 6f8cf6e4d9..6f8cf6e4d9 100644 --- a/test/disabled/run/infiniteloop.check +++ b/test/files/run/infiniteloop.check diff --git a/test/disabled/run/infiniteloop.scala b/test/files/run/infiniteloop.scala index f15674a676..f15674a676 100644 --- a/test/disabled/run/infiniteloop.scala +++ b/test/files/run/infiniteloop.scala diff --git a/test/disabled/run/streamWithFilter.check b/test/files/run/streamWithFilter.check index 6b0e91a147..6b0e91a147 100644 --- a/test/disabled/run/streamWithFilter.check +++ b/test/files/run/streamWithFilter.check diff --git a/test/disabled/run/streamWithFilter.scala b/test/files/run/streamWithFilter.scala index cb919d4f55..cb919d4f55 100644 --- a/test/disabled/run/streamWithFilter.scala +++ b/test/files/run/streamWithFilter.scala |