[armedbear-cvs] r14137 - trunk/abcl/src/org/armedbear/lisp

[rschlatte at common-lisp.net]

Author: rschlatte
Date: Sun Aug 26 12:23:15 2012
New Revision: 14137

Log:
Update instance layout in (set-)standard-instance-access if necessary.

- Reported by Pascal Costanza

Modified:
   trunk/abcl/src/org/armedbear/lisp/StandardObject.java

Modified: trunk/abcl/src/org/armedbear/lisp/StandardObject.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardObject.java	Sun Aug 26 10:37:30 2012	(r14136)
+++ trunk/abcl/src/org/armedbear/lisp/StandardObject.java	Sun Aug 26 12:23:15 2012	(r14137)
@@ -428,6 +428,10 @@
     public LispObject execute(LispObject first, LispObject second)
     {
       final StandardObject instance = checkStandardObject(first);
+      if (instance.layout.isInvalid()) {
+        // Update instance.
+        instance.updateLayout();
+      }
       final int index;
       if (second instanceof Fixnum) {
         index = ((Fixnum)second).value;
@@ -473,6 +477,10 @@
                               LispObject third)
     {
       final StandardObject instance = checkStandardObject(first);
+      if (instance.layout.isInvalid()) {
+        // Update instance.
+        instance.updateLayout();
+      }
       final int index;
       if (second instanceof Fixnum) {
         index = ((Fixnum)second).value;