svn commit: r474530 - in /incubator/harmony/enhanced/drlvm/trunk: build/make/targets/kernel.test.xml vm/vmcore/src/gc/root_set_enum_common.cpp

[gs...@apache.org]

Author: gshimansky
Date: Mon Nov 13 13:28:36 2006
New Revision: 474530

URL: http://svn.apache.org/viewvc?view=rev&rev=474530
Log:
Applied HARMONY-2176 [DRLVM][EM64T] Fix for enumeration code

Tests passed on winxp and ubuntu. On x86_64 smoke tests now work. Kernel
tests fail on jitrino.opt, but I think this is a known problem on em64t.

I've increased timeout for kernel tests. When some other process runs on
the server, interpreter tests may fail due to timeout.


Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml?view=diff&rev=474530&r1=474529&r2=474530
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml Mon Nov 13 13:28:36 2006
@@ -42,7 +42,7 @@
     </patternset>
 
     <property name="vm.use_verifier" value="1" />
-    <property name="kernel.test.timeout" value="180000" />
+    <property name="kernel.test.timeout" value="360000" />
     
     <target name="kernel.test" depends="-pre-kernel-test">
         <property name="test.mode" value="jet+opt+int" />

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp?view=diff&rev=474530&r1=474529&r2=474530
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp Mon Nov 13 13:28:36 2006
@@ -137,7 +137,6 @@
             if ((void *)obj != VM_Global_State::loader_env->heap_base) {
                 assert(((POINTER_SIZE_INT)VM_Global_State::loader_env->heap_base <= (POINTER_SIZE_INT)obj)
                     && ((POINTER_SIZE_INT)obj <= (POINTER_SIZE_INT)VM_Global_State::loader_env->heap_end));
-                (obj->vt())->clss->get_name()->bytes;
             } 
         }
 #endif // _DEBUG
@@ -159,14 +158,7 @@
         bool is_null    = (compressed_ref == 0);
         bool is_in_heap = (((POINTER_SIZE_INT)VM_Global_State::loader_env->heap_base <= (POINTER_SIZE_INT)obj)
             && ((POINTER_SIZE_INT)obj <= (POINTER_SIZE_INT)VM_Global_State::loader_env->heap_end));
-        if (is_null || is_in_heap) {
-            // Make sure the reference is valid.
-            if (!is_null) {
-                (obj->vt())->clss->get_name()->bytes;
-            }                                                               
-        } else {
-            ASSERT(0, "Bad slot pointer");
-        }
+        assert (is_null || is_in_heap);
 #endif // _DEBUG
 
     gc_add_compressed_root_set_entry(ref, is_pinned);