Changeset 14207 for trunk

Timestamp:

10/20/12 10:39:03 (9 years ago)

Author:

rschlatte

Message:

Call method-function instead of directly accessing a slot.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Profiler.java (modified) (1 diff)
• Symbol.java (modified) (1 diff)

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

@@ -77 +77 @@
                                     Symbol.GENERIC_FUNCTION_METHODS.execute(object);
                             }
-                            // TODO: extract methods from non-standard
-                            // generic functions here once they are
-                            // implemented
                             while (methods != null && methods != NIL) {
-                                LispObject maybeMethod = methods.car();
-                                if (maybeMethod instanceof StandardObject) {
-                                    StandardObject method = (StandardObject) maybeMethod;
-                                    LispObject function = method.getInstanceSlotValue(Symbol._FUNCTION);
-                                    function.setCallCount(0);
-                                    function.setHotCount(0);
-                                    methods = methods.cdr();
+                                LispObject method = methods.car();
+                                LispObject function =
+                                  Symbol.METHOD_FUNCTION.execute(method);
+                                if (function != NIL) {
+                                  function.setCallCount(0);
+                                  function.setHotCount(0);
+                                  methods = methods.cdr();
                                 }
                             }

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

@@ -2987 +2987 @@
   public static final Symbol METAOBJECT =
     PACKAGE_MOP.addExternalSymbol("METAOBJECT");
+  public static final Symbol METHOD_FUNCTION =
+    PACKAGE_MOP.addExternalSymbol("METHOD-FUNCTION");
   public static final Symbol SPECIALIZER =
     PACKAGE_MOP.addExternalSymbol("SPECIALIZER");