Assertions can be enabled via env var

enso-org · Sep 27, 2023 · b435b75 · b435b75
1 parent cffd2e4
commit b435b75
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -589,6 +589,11 @@ configured correctly and run the tests as following:
 LANG=C enso --run test/Tests
 ```
 
+Note that JVM assertions are not enabled by default, one has to pass `-ea`
+via `JAVA_OPTS` environment variable. There are also Enso-specific assertions
+(method `Runtime.assert`) that can be enabled when `ENSO_ENABLE_ASSERTIONS`
+environemtn variable is non-empty.
+
 #### Test Dependencies
 
 To run all the stdlib test suites, set `CI=true` environment variable:

diff --git a/...untime/src/main/java/org/enso/interpreter/node/expression/builtin/runtime/AssertNode.java b/...untime/src/main/java/org/enso/interpreter/node/expression/builtin/runtime/AssertNode.java
@@ -32,11 +32,11 @@ public static AssertNode build() {
   public abstract Object execute(
       VirtualFrame frame, State state, @Suspend Object action, Object msg);
 
-  protected Assumption getAssertionsDisabledAssumption() {
-    return EnsoContext.get(this).getAssertsDisabledAssumption();
+  protected boolean isAssertionsEnabled() {
+    return EnsoContext.get(this).isAssertionsEnabled();
   }
 
-  @Specialization(assumptions = "getAssertionsDisabledAssumption()")
+  @Specialization(guards = "!isAssertionsEnabled()")
   Object doAssertionsDisabled(VirtualFrame frame, State state, Object action, Object msg) {
     return EnsoContext.get(this).getNothing();
   }

diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java
@@ -76,7 +76,7 @@ public final class EnsoContext {
 
   private final EnsoLanguage language;
   private final Env environment;
-  private final Assumption assertsDisabledAssumption = Truffle.getRuntime().createAssumption("Enso assertions disabled");
+  private final boolean assertionsEnabled;
   private @CompilationFinal Compiler compiler;
   private final PrintStream out;
   private final PrintStream err;
@@ -135,8 +135,10 @@ public EnsoContext(
     this.isIrCachingDisabled =
         getOption(RuntimeOptions.DISABLE_IR_CACHES_KEY) || isParallelismEnabled;
     this.executionEnvironment = getOption(EnsoLanguage.EXECUTION_ENVIRONMENT);
-    if (getOption(RuntimeOptions.ENABLE_ASSERTIONS_KEY)) {
-      this.assertsDisabledAssumption.invalidate("Enso assertions are enabled");
+    if (System.getenv("ENSO_ENABLE_ASSERTIONS") != null) {
+      this.assertionsEnabled = true;
+    } else {
+      this.assertionsEnabled = false;
     }
     this.shouldWaitForPendingSerializationJobs =
         getOption(RuntimeOptions.WAIT_FOR_PENDING_SERIALIZATION_JOBS_KEY);
@@ -606,8 +608,8 @@ public boolean isUseGlobalCache() {
     return getOption(RuntimeOptions.USE_GLOBAL_IR_CACHE_LOCATION_KEY);
   }
 
-  public Assumption getAssertsDisabledAssumption() {
-    return assertsDisabledAssumption;
+  public boolean isAssertionsEnabled() {
+    return assertionsEnabled;
   }
 
   /**