Skip to content

Commit 812c409

Browse files
committed
Remove stray references to trait implementation classes.
1 parent 03cc6f9 commit 812c409

File tree

4 files changed

+2
-11
lines changed

4 files changed

+2
-11
lines changed

src/compiler/scala/tools/nsc/transform/AddInterfaces.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ abstract class AddInterfaces extends InfoTransform { self: Erasure =>
3838
&& (!sym.hasFlag(DEFERRED | SUPERACCESSOR) || (sym hasFlag lateDEFERRED))
3939
)
4040

41-
def implClassPhase = currentRun.erasurePhase.next
42-
4341
def transformMixinInfo(tp: Type): Type = tp match {
4442
case ClassInfoType(parents, decls, clazz) if clazz.isPackageClass || !clazz.isJavaDefined =>
4543

src/reflect/scala/reflect/runtime/JavaMirrors.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ private[scala] trait JavaMirrors extends internal.SymbolTable with api.JavaUnive
10011001
val cls =
10021002
if (jclazz.isMemberClass)
10031003
lookupClass
1004-
else if (jclazz.isLocalClass0 || scalacShouldntLoadClass(jname))
1004+
else if (jclazz.isLocalClass0)
10051005
// local classes and implementation classes not preserved by unpickling - treat as Java
10061006
//
10071007
// upd. but only if they cannot be loaded as top-level classes

src/reflect/scala/reflect/runtime/ReflectionUtils.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ object ReflectionUtils {
8080
accessor invoke outer
8181
}
8282

83-
def isTraitImplementation(fileName: String) = fileName endsWith "$class.class"
84-
85-
def scalacShouldntLoadClassfile(fileName: String) = isTraitImplementation(fileName)
86-
87-
def scalacShouldntLoadClass(name: scala.reflect.internal.SymbolTable#Name) = scalacShouldntLoadClassfile(name + ".class")
88-
8983
object PrimitiveOrArray {
9084
def unapply(jclazz: jClass[_]) = jclazz.isPrimitive || jclazz.isArray
9185
}

src/reflect/scala/reflect/runtime/SymbolLoaders.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package reflect
33
package runtime
44

55
import scala.collection.mutable
6-
import scala.reflect.runtime.ReflectionUtils.scalacShouldntLoadClass
76
import scala.reflect.internal.Flags._
87

98
private[reflect] trait SymbolLoaders { self: SymbolTable =>
@@ -125,7 +124,7 @@ private[reflect] trait SymbolLoaders { self: SymbolTable =>
125124
val e = super.lookupEntry(name)
126125
if (e != null)
127126
e
128-
else if (scalacShouldntLoadClass(name) || (negatives contains name))
127+
else if (negatives contains name)
129128
null
130129
else {
131130
val path =

0 commit comments

Comments
 (0)