Changeset 14092

Timestamp:

08/15/12 07:12:24 (13 years ago)

Author:

rschlatte

Message:

Don't clobber class hierarchy when defining forward-referenced classes

• Use initargs when calling change-class for the class metaobject

• Robustify make-instances-obsolete against non-finalized classes (e.g. forward-referenced-class)

• Report and diagnosis by Stas Boukarev to armedbear-devel on August 11, 2012 ("Forward referenced classes woes")

• Fixes ansi tests DEFCLASS.FORWARD-REF.3, DEFCLASS.FORWARD-REF.4

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Layout.java (modified) (1 diff)
• clos.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Layout.java ¶

@@ -266 +266 @@
         final LispObject lispClass = arg;
         LispObject oldLayout;
-        if (lispClass instanceof LispClass)
-            oldLayout = ((LispClass)lispClass).getClassLayout();
-        else
-            oldLayout = Symbol.CLASS_LAYOUT.execute(lispClass);
+        // Non-finalized classes might not have a valid layout, but they do
+        // not have instances either so we can abort.
+        if (lispClass instanceof LispClass) {
+          if (!((LispClass)lispClass).isFinalized())
+            return arg;
+          oldLayout = ((LispClass)lispClass).getClassLayout();
+        } else if (lispClass instanceof StandardObject) {
+          if (((StandardObject)arg)
+              .getInstanceSlotValue(StandardClass.symFinalizedP) == NIL)
+            return arg;
+          oldLayout = Symbol.CLASS_LAYOUT.execute(lispClass);
+        } else {
+          return error(new TypeError(arg, Symbol.CLASS));
+        }
 
         Layout newLayout = new Layout((Layout)oldLayout);

trunk/abcl/src/org/armedbear/lisp/clos.lisp ¶

@@ -3126 +3126 @@
   (remf all-keys :metaclass)
   (unless (classp metaclass) (setf metaclass (find-class metaclass)))
-  (change-class class metaclass)
+  (apply #'change-class class metaclass all-keys)
   (apply #'reinitialize-instance class
          :name name