Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 7653 invoked from network); 13 Nov 2008 07:51:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Nov 2008 07:51:29 -0000 Received: (qmail 95256 invoked by uid 500); 13 Nov 2008 07:51:36 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 95236 invoked by uid 500); 13 Nov 2008 07:51:36 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 95227 invoked by uid 99); 13 Nov 2008 07:51:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Nov 2008 23:51:36 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Nov 2008 07:50:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 11D8A238893B; Wed, 12 Nov 2008 23:50:38 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r713673 - in /harmony/enhanced/drlvm/trunk/vm: include/jit_runtime_support.h vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp Date: Thu, 13 Nov 2008 07:50:37 -0000 To: commits@harmony.apache.org From: chunrong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081113075038.11D8A238893B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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);