[GR-9505] Enable guarantees that check thread states.

PullRequest: graal/1397
oracle · May 10, 2018 · 5dc95ab · 5dc95ab
2 parents 7ebd0d8 + 6030982
commit 5dc95ab
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
@@ -308,10 +308,7 @@ private static void enterSlowPathSafepointCheck() throws Throwable {
             Safepoint.setSafepointRequested(Safepoint.SafepointRequestValues.RESET);
             return;
         }
-
-        // GR-9505
-        // VMError.guarantee(VMThreads.StatusSupport.isStatusJava(), "Attempting to do a safepoint
-        // check when not in Java mode");
+        VMError.guarantee(VMThreads.StatusSupport.isStatusJava(), "Attempting to do a safepoint check when not in Java mode");
 
         try {
             /*
@@ -363,12 +360,10 @@ public static void transitionNativeToJava() {
     @SubstrateForeignCallTarget
     @Uninterruptible(reason = "Must not contain safepoint checks")
     private static void enterSlowPathNativeToJava() {
-        // GR-9505
-        // VMError.guarantee(!VMThreads.StatusSupport.isStatusJava(),
-        // "Attempting to do a Native-to-Java transition when already in Java mode");
-        // VMError.guarantee(!VMThreads.StatusSupport.isStatusIgnoreSafepoints(CEntryPointContext.getCurrentIsolateThread()),
-        // "When safepoints are disabled, the thread can only be in Native mode, so the fast path
-        // transition must succeed and this slow path must not be called");
+        VMError.guarantee(!VMThreads.StatusSupport.isStatusJava(),
+                        "Attempting to do a Native-to-Java transition when already in Java mode");
+        VMError.guarantee(!VMThreads.StatusSupport.isStatusIgnoreSafepoints(CEntryPointContext.getCurrentIsolateThread()),
+                        "When safepoints are disabled, the thread can only be in Native mode, so the fast path transition must succeed and this slow path must not be called");
 
         Statistics.incSlowPathFrozen();
         try {