Author: chunrong
Date: Wed Nov 12 23:50:37 2008
New Revision: 713673

URL: http://svn.apache.org/viewvc?rev=713673&view=rev
Log:
re-enable the null checking in vm helpers to catch the NPEs in HARMONY-6013

Modified:
    harmony/enhanced/drlvm/trunk/vm/include/jit_runtime_support.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/include/jit_runtime_support.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/jit_runtime_support.h?rev=713673&r1=713672&r2=713673&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/jit_runtime_support.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/jit_runtime_support.h Wed Nov 12 23:50:37 2008
@@ -27,6 +27,8 @@
 #include "open/rt_helpers.h"
 #include "jni_types.h"
 
+#define _DEBUG_CHECK_NULL_
+
 #ifdef __cplusplus
 extern "C" {
 #endif

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp?rev=713673&r1=713672&r2=713673&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp Wed Nov 12 23:50:37 2008
@@ -374,7 +374,7 @@
 #ifdef _DEBUG_CHECK_NULL_//_DEBUG    
     // check if object is null
     cs = lil_parse_onto_end(cs,
-        "jc i0 = %0i:ref, throw_null_pointer;"
+        "jc i0 = %0i:ref, throw_null_pointer;",
         (ManagedObject *) VM_Global_State::loader_env->managed_null
     );
     assert(cs);