Implement new assert semantics in back-end
Previously, assert was just a regular function and its argument used to be computed on each call (even if assertions are disabled on JVM). This change adds support for 3 new behaviours of assert: * always-enable (independently from -ea on JVM) * always-disable (independently from -ea JVM) * runtime/jvm (compile the calls like javac generates assert-operator) * legacy (leave current eager semantics) - this already existed Default behaviour is legacy for now. The behavior is changed based on -Xassertions flag. #KT-7540: Fixed
This commit is contained in:
+33
@@ -0,0 +1,33 @@
|
||||
// FILE: inline.kt
|
||||
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
|
||||
// WITH_RUNTIME
|
||||
|
||||
inline fun inlineMe() {
|
||||
assert(false) { "FROM INLINED" }
|
||||
}
|
||||
|
||||
// FILE: inlineSite.kt
|
||||
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
|
||||
|
||||
class Checker {
|
||||
fun check() {
|
||||
inlineMe()
|
||||
assert(false) { "FROM INLINESITE" }
|
||||
}
|
||||
}
|
||||
|
||||
class Dummy
|
||||
|
||||
fun disableAssertions(): Checker {
|
||||
val loader = Dummy::class.java.classLoader
|
||||
loader.setDefaultAssertionStatus(false)
|
||||
val c = loader.loadClass("Checker")
|
||||
return c.newInstance() as Checker
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
var c = disableAssertions()
|
||||
c.check()
|
||||
|
||||
return "OK"
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
// FILE: inline.kt
|
||||
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
|
||||
// WITH_RUNTIME
|
||||
|
||||
inline fun inlineMe() {
|
||||
assert(false) { "FROM INLINED" }
|
||||
}
|
||||
|
||||
// FILE: inlineSite.kt
|
||||
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
|
||||
|
||||
class Checker {
|
||||
fun check() {
|
||||
inlineMe()
|
||||
throw RuntimeException("FAIL 0")
|
||||
}
|
||||
}
|
||||
|
||||
class Dummy
|
||||
|
||||
fun enableAssertions(): Checker {
|
||||
val loader = Dummy::class.java.classLoader
|
||||
loader.setDefaultAssertionStatus(true)
|
||||
val c = loader.loadClass("Checker")
|
||||
return c.newInstance() as Checker
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
var c = enableAssertions()
|
||||
try {
|
||||
c.check()
|
||||
return "FAIL 2"
|
||||
} catch (ignore: AssertionError) {}
|
||||
|
||||
return "OK"
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
// FILE: inline.kt
|
||||
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
|
||||
// WITH_RUNTIME
|
||||
// NO_CHECK_LAMBDA_INLINING
|
||||
|
||||
inline fun call(c: () -> Unit) {
|
||||
c()
|
||||
}
|
||||
|
||||
// FILE: inlineSite.kt
|
||||
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
|
||||
|
||||
interface Checker {
|
||||
fun checkTrue(): Boolean
|
||||
fun checkFalse(): Boolean
|
||||
fun checkTrueWithMessage(): Boolean
|
||||
fun checkFalseWithMessage(): Boolean
|
||||
}
|
||||
|
||||
class ShouldBeDisabled : Checker {
|
||||
override fun checkTrue(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; true }
|
||||
call {
|
||||
assert(l())
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkFalse(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; false }
|
||||
call {
|
||||
assert(l())
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkTrueWithMessage(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; true }
|
||||
call {
|
||||
assert(l()) { "BOOYA" }
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkFalseWithMessage(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; false }
|
||||
call {
|
||||
assert(l()) { "BOOYA" }
|
||||
}
|
||||
return hit
|
||||
}
|
||||
}
|
||||
|
||||
class ShouldBeEnabled : Checker {
|
||||
override fun checkTrue(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; true }
|
||||
call {
|
||||
assert(l())
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkFalse(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; false }
|
||||
call {
|
||||
assert(l())
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkTrueWithMessage(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; true }
|
||||
call {
|
||||
assert(l()) { "BOOYA" }
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkFalseWithMessage(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; false }
|
||||
call {
|
||||
assert(l()) { "BOOYA" }
|
||||
}
|
||||
return hit
|
||||
}
|
||||
}
|
||||
|
||||
fun setDesiredAssertionStatus(v: Boolean): Checker {
|
||||
val loader = Checker::class.java.classLoader
|
||||
loader.setDefaultAssertionStatus(v)
|
||||
val c = loader.loadClass(if (v) "ShouldBeEnabled" else "ShouldBeDisabled")
|
||||
return c.newInstance() as Checker
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
var c = setDesiredAssertionStatus(false)
|
||||
if (c.checkTrue()) return "FAIL 0"
|
||||
if (c.checkTrueWithMessage()) return "FAIL 1"
|
||||
if (c.checkFalse()) return "FAIL 2"
|
||||
if (c.checkFalseWithMessage()) return "FAIL 3"
|
||||
c = setDesiredAssertionStatus(true)
|
||||
if (!c.checkTrue()) return "FAIL 4"
|
||||
if (!c.checkTrueWithMessage()) return "FAIL 5"
|
||||
try {
|
||||
c.checkFalse()
|
||||
return "FAIL 6"
|
||||
} catch (ignore: AssertionError) {
|
||||
}
|
||||
try {
|
||||
c.checkFalseWithMessage()
|
||||
return "FAIL 7"
|
||||
} catch (ignore: AssertionError) {
|
||||
}
|
||||
|
||||
return "OK"
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
// FILE: inline.kt
|
||||
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
|
||||
// WITH_RUNTIME
|
||||
// NO_CHECK_LAMBDA_INLINING
|
||||
|
||||
inline fun call(crossinline c: () -> Unit) {
|
||||
val l = { c() }
|
||||
l()
|
||||
}
|
||||
|
||||
// FILE: inlineSite.kt
|
||||
// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
|
||||
|
||||
interface Checker {
|
||||
fun checkTrue(): Boolean
|
||||
fun checkFalse(): Boolean
|
||||
fun checkTrueWithMessage(): Boolean
|
||||
fun checkFalseWithMessage(): Boolean
|
||||
}
|
||||
|
||||
class ShouldBeDisabled : Checker {
|
||||
override fun checkTrue(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; true }
|
||||
call {
|
||||
assert(l())
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkFalse(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; false }
|
||||
call {
|
||||
assert(l())
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkTrueWithMessage(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; true }
|
||||
call {
|
||||
assert(l()) { "BOOYA" }
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkFalseWithMessage(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; false }
|
||||
call {
|
||||
assert(l()) { "BOOYA" }
|
||||
}
|
||||
return hit
|
||||
}
|
||||
}
|
||||
|
||||
class ShouldBeEnabled : Checker {
|
||||
override fun checkTrue(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; true }
|
||||
call {
|
||||
assert(l())
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkFalse(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; false }
|
||||
call {
|
||||
assert(l())
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkTrueWithMessage(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; true }
|
||||
call {
|
||||
assert(l()) { "BOOYA" }
|
||||
}
|
||||
return hit
|
||||
}
|
||||
|
||||
override fun checkFalseWithMessage(): Boolean {
|
||||
var hit = false
|
||||
val l = { hit = true; false }
|
||||
call {
|
||||
assert(l()) { "BOOYA" }
|
||||
}
|
||||
return hit
|
||||
}
|
||||
}
|
||||
|
||||
fun setDesiredAssertionStatus(v: Boolean): Checker {
|
||||
val loader = Checker::class.java.classLoader
|
||||
loader.setDefaultAssertionStatus(v)
|
||||
val c = loader.loadClass(if (v) "ShouldBeEnabled" else "ShouldBeDisabled")
|
||||
return c.newInstance() as Checker
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
var c = setDesiredAssertionStatus(false)
|
||||
if (c.checkTrue()) return "FAIL 0"
|
||||
if (c.checkTrueWithMessage()) return "FAIL 1"
|
||||
if (c.checkFalse()) return "FAIL 2"
|
||||
if (c.checkFalseWithMessage()) return "FAIL 3"
|
||||
c = setDesiredAssertionStatus(true)
|
||||
if (!c.checkTrue()) return "FAIL 4"
|
||||
if (!c.checkTrueWithMessage()) return "FAIL 5"
|
||||
try {
|
||||
c.checkFalse()
|
||||
return "FAIL 6"
|
||||
} catch (ignore: AssertionError) {
|
||||
}
|
||||
try {
|
||||
c.checkFalseWithMessage()
|
||||
return "FAIL 7"
|
||||
} catch (ignore: AssertionError) {
|
||||
}
|
||||
|
||||
return "OK"
|
||||
}
|
||||
Reference in New Issue
Block a user