From 92f69d253ee6e941263aaf0a09936b4e4ce21dc7 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Tue, 5 May 2015 13:52:22 -0700 Subject: 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. --- test/files/run/disable-assertions.flags | 1 + test/files/run/disable-assertions.scala | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 test/files/run/disable-assertions.flags create mode 100644 test/files/run/disable-assertions.scala (limited to 'test') diff --git a/test/files/run/disable-assertions.flags b/test/files/run/disable-assertions.flags new file mode 100644 index 0000000000..afaa521a12 --- /dev/null +++ b/test/files/run/disable-assertions.flags @@ -0,0 +1 @@ +-Xdisable-assertions diff --git a/test/files/run/disable-assertions.scala b/test/files/run/disable-assertions.scala new file mode 100644 index 0000000000..7ec4cfb495 --- /dev/null +++ b/test/files/run/disable-assertions.scala @@ -0,0 +1,14 @@ + +object Elided { + import annotation._, elidable._ + @elidable(INFO) def info(): Boolean = true + @elidable(10000) def f(): Boolean = true + def g(): Boolean = { assert(false); true } +} + +object Test extends App { + import Elided._ + if (info()) println("Bad info.") + if (!f()) println("Elided f.") + if (!g()) println("Elided g?") // assert should be off +} -- cgit v1.2.3