diff options
| author | Som Snytt <som.snytt@gmail.com> | 2015-05-05 13:52:22 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2015-05-05 13:52:22 -0700 |
| commit | 92f69d253ee6e941263aaf0a09936b4e4ce21dc7 (patch) | |
| tree | 391dcd89001d0a8d7eb1d862c8e558487483f828 /src/compiler/scala/tools/nsc/transform/UnCurry.scala | |
| parent | 8200009ea5dafcdf79488f19175c53e7b571aa75 (diff) | |
| download | scala-92f69d253ee6e941263aaf0a09936b4e4ce21dc7.tar.gz scala-92f69d253ee6e941263aaf0a09936b4e4ce21dc7.tar.bz2 scala-92f69d253ee6e941263aaf0a09936b4e4ce21dc7.zip | |
SI-9302 -Xdisable-assertions raises elide level
Previously, the flag caused any elidable to be elided.
This commit simply sets -Xelide-below to ASSERTION + 1.
The flag is useful because there's no mnemonic for specifying
the magic constant as an option argument. `-Xelide-below ASSERTION`
means asserts are enabled.
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/UnCurry.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/UnCurry.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala index 836ea808ac..1020b98bb9 100644 --- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala +++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala @@ -437,9 +437,7 @@ abstract class UnCurry extends InfoTransform def isLiftedLambdaBody(target: Tree) = target.symbol.isLocalToBlock && target.symbol.isArtifact && target.symbol.name.containsName(nme.ANON_FUN_NAME) val result = ( - // TODO - settings.noassertions.value temporarily retained to avoid - // breakage until a reasonable interface is settled upon. - if ((sym ne null) && (sym.elisionLevel.exists (_ < settings.elidebelow.value || settings.noassertions))) + if ((sym ne null) && sym.elisionLevel.exists(_ < settings.elidebelow.value)) replaceElidableTree(tree) else translateSynchronized(tree) match { case dd @ DefDef(mods, name, tparams, _, tpt, rhs) => |