diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-12 19:23:26 +1000 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-07-23 15:02:25 +0200 |
commit | 6177cb44812b92b4059ec621a34cc26ddbe532c1 (patch) | |
tree | 5c2e9e9b8231088504a3fbcb7704a4325b837e8e /src/compiler | |
parent | a1d471f7ba93f5a2e3a66a77596a41f2677ca9ee (diff) | |
download | scala-6177cb44812b92b4059ec621a34cc26ddbe532c1.tar.gz scala-6177cb44812b92b4059ec621a34cc26ddbe532c1.tar.bz2 scala-6177cb44812b92b4059ec621a34cc26ddbe532c1.zip |
[backport] SI-9393 Temporarily disable two assertions in GenBCode
These cause a crash in the build of Play. We should try to bring
these back once we have suitable annotation awareness. Perhaps
they should only be `devWarning`-s, though.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala b/src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala index 8720da84e8..9bae63f1fc 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala @@ -841,16 +841,17 @@ abstract class BTypes { assert(!ClassBType.isInternalPhantomType(internalName), s"Cannot create ClassBType for phantom type $this") - assert( - if (info.get.superClass.isEmpty) { isJLO(this) || (isCompilingPrimitive && ClassBType.hasNoSuper(internalName)) } - else if (isInterface.get) isJLO(info.get.superClass.get) - else !isJLO(this) && ifInit(info.get.superClass.get)(!_.isInterface.get), - s"Invalid superClass in $this: ${info.get.superClass}" - ) - assert( - info.get.interfaces.forall(c => ifInit(c)(_.isInterface.get)), - s"Invalid interfaces in $this: ${info.get.interfaces}" - ) + // TODO bring these back in a way that doesn't trip pos/t9393 + // assert( + // if (info.get.superClass.isEmpty) { isJLO(this) || (isCompilingPrimitive && ClassBType.hasNoSuper(internalName)) } + // else if (isInterface.get) isJLO(info.get.superClass.get) + // else !isJLO(this) && ifInit(info.get.superClass.get)(!_.isInterface.get), + // s"Invalid superClass in $this: ${info.get.superClass}" + // ) + // assert( + // info.get.interfaces.forall(c => ifInit(c)(_.isInterface.get)), + // s"Invalid interfaces in $this: ${info.get.interfaces}" + // ) assert(info.get.nestedClasses.forall(c => ifInit(c)(_.isNestedClass.get)), info.get.nestedClasses) } |