diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2014-08-19 16:58:16 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2014-09-01 14:29:23 +0200 |
commit | 2256753502c2c099da17a20d45c3f23974d0eafd (patch) | |
tree | be14f6cc866a571c515ffaac102b9c23711d6ebe /src/compiler | |
parent | e3107465c3e8ac80d1cc6a759e2f3298c2531424 (diff) | |
download | scala-2256753502c2c099da17a20d45c3f23974d0eafd.tar.gz scala-2256753502c2c099da17a20d45c3f23974d0eafd.tar.bz2 scala-2256753502c2c099da17a20d45c3f23974d0eafd.zip |
Small cleanup in toTypeKind.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala index aed3654b2c..5670715cd3 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala @@ -385,17 +385,8 @@ abstract class BCodeHelpers extends BCodeIdiomatic with BytecodeWriters { */ def primitiveOrClassToBType(sym: Symbol): BType = { assertClassNotArray(sym) - primitiveTypeMap.getOrElse(sym, classOrImplClassToBType(sym)) - } - - /** - * The ClassBType for a class or interface reference. Asserts that `sym` is not an - * implementation class. - */ - def classOrImplClassToBType(sym: Symbol): ClassBType = { - assertClassNotArrayNotPrimitive(sym) - assert(!sym.isImplClass, s"typeKind of implementation class $sym") - getClassBTypeAndRegisterInnerClass(sym) + assert(!sym.isImplClass, sym) + primitiveTypeMap.getOrElse(sym, getClassBTypeAndRegisterInnerClass(sym)) } /** |