Changeset 12314

Timestamp:

12/30/09 22:04:55 (14 years ago)

Author:

ehuelsmann

Message:

Upon OutOfMemoryError? or StackOverflowError?, unwind the stack

to the first enclosing HANDLER-BIND, allowing it to bind a
handler to STORAGE-CONDITION.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Java.java (modified) (1 diff)
• signal.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Java.java

@@ -931 +931 @@
         }
     };
-    
+
+
+    private static final Primitive JRUN_EXCEPTION_PROTECTED =
+        new Primitive("jrun-exception-protected", PACKAGE_JAVA, true,
+                      "closure") {
+
+      @Override
+      public LispObject execute(LispObject closure) {
+          Function fun = checkFunction(closure);
+
+          try {
+              return LispThread.currentThread().execute(closure);
+          }
+          catch (OutOfMemoryError oom) {
+              return error(new StorageCondition("Out of memory."));
+          }
+          catch (StackOverflowError oos) {
+              return error(new StorageCondition("Stack overflow."));
+          }
+      }
+    };
+
     private static PropertyDescriptor getPropertyDescriptor(Object obj, LispObject propertyName) throws IntrospectionException {
         String prop = ((AbstractString) propertyName).getStringValue();

trunk/abcl/src/org/armedbear/lisp/signal.lisp

@@ -106 +106 @@
                                 bindings))
                 *handler-clusters*)))
-     (progn
-       ,@forms)))
+     (java:jrun-exception-protected
+      (lambda ()
+        (progn
+          ,@forms)))))
 
 (defmacro handler-case (form &rest cases)