harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlyd...@apache.org
Subject svn commit: r406481 - /incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c
Date Mon, 15 May 2006 00:49:29 GMT
Author: dlydick
Date: Sun May 14 17:49:28 2006
New Revision: 406481

URL: http://svn.apache.org/viewcvs?rev=406481&view=rev
Log:
Explicitly test for array objects and require
their superclass to be java.lang.Object, but
comment out and allow superclass linkages for
now.  If needed, can uncomment the added code.

Modified:
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c?rev=406481&r1=406480&r2=406481&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c Sun
May 14 17:49:28 2006
@@ -252,11 +252,25 @@
                                 break;
                             }
 
-                            /* Otherwise search superclass */
+                            /*
+                             * Otherwise search superclass
+                             * (which is java.lang.Object for arrays)
+                             */
+                            /*!
+                             * @todo HARMONY-6-jvm-linkage.c-6 The array
+                             *       test branch needs unit testing with
+                             *       real data.
+                             */
                             clsidxFIND =
-                                CLASS_OBJECT_LINKAGE(clsidxFIND)
-                                  ->pcfs
-                                    ->super_class;
+#if 0 /* Explicitly allow resolution of lower-dimension array types */
+                                (CLASS(clsidxFIND).status &
+                                 CLASS_STATUS_ARRAY)
+                                ? class_java_lang_Object
+                                :
+#endif
+                                  CLASS_OBJECT_LINKAGE(clsidxFIND)
+                                    ->pcfs
+                                      ->super_class;
 
                             pcpma_Fieldref
                               ->LOCAL_Fieldref_binding.clsidxJVM =
@@ -441,11 +455,25 @@
                                 break;
                             }
 
-                            /* Otherwise search superclass */
+                            /*
+                             * Otherwise search superclass
+                             * (which is java.lang.Object for arrays)
+                             */
+                            /*!
+                             * @todo HARMONY-6-jvm-linkage.c-7 The array
+                             *       test branch needs unit testing with
+                             *       real data.
+                             */
                             clsidxFIND =
-                                CLASS_OBJECT_LINKAGE(clsidxFIND)
-                                  ->pcfs
-                                    ->super_class;
+#if 0 /* Explicitly allow resolution of lower-dimension array types */
+                                (CLASS(clsidxFIND).status &
+                                 CLASS_STATUS_ARRAY)
+                                ? class_java_lang_Object
+                                :
+#endif
+                                  CLASS_OBJECT_LINKAGE(clsidxFIND)
+                                    ->pcfs
+                                      ->super_class;
 
                             pcpma_Methodref
                               ->LOCAL_Methodref_binding.clsidxJVM =
@@ -606,11 +634,25 @@
                                 break;
                             }
 
-                            /* Otherwise search superclass */
+                            /*
+                             * Otherwise search superclass
+                             * (which is java.lang.Object for arrays)
+                             */
+                            /*!
+                             * @todo HARMONY-6-jvm-linkage.c-8 The array
+                             *       test branch needs unit testing with
+                             *       real data.
+                             */
                             clsidxFIND =
-                                CLASS_OBJECT_LINKAGE(clsidxFIND)
-                                  ->pcfs
-                                    ->super_class;
+#if 0 /* Explicitly allow resolution of lower-dimension array types */
+                                (CLASS(clsidxFIND).status &
+                                 CLASS_STATUS_ARRAY)
+                                ? class_java_lang_Object
+                                :
+#endif
+                                  CLASS_OBJECT_LINKAGE(clsidxFIND)
+                                    ->pcfs
+                                      ->super_class;
 
                             pcpma_InterfaceMethodref
                               ->LOCAL_InterfaceMethodref_binding



Mime
View raw message