Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 62069 invoked from network); 6 Dec 2006 14:31:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Dec 2006 14:31:31 -0000 Received: (qmail 31380 invoked by uid 500); 6 Dec 2006 14:31:40 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 31357 invoked by uid 500); 6 Dec 2006 14:31:39 -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 31348 invoked by uid 99); 6 Dec 2006 14:31:39 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Dec 2006 06:31:39 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Dec 2006 06:31:31 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 8B8201A9846; Wed, 6 Dec 2006 06:30:49 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r483092 - /harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp Date: Wed, 06 Dec 2006 14:30:49 -0000 To: commits@harmony.apache.org From: varlax@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061206143049.8B8201A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: varlax Date: Wed Dec 6 06:30:48 2006 New Revision: 483092 URL: http://svn.apache.org/viewvc?view=rev&rev=483092 Log: Applied HARMONY-2485 [drlvm][jit][opt] NPE on EM64T with OPT. Tested on SUSE9@em64t. Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp?view=diff&rev=483092&r1=483091&r2=483092 ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp Wed Dec 6 06:30:48 2006 @@ -1500,9 +1500,8 @@ return irManager.newImmOpnd(dstType, Opnd::RuntimeInfo::Kind_VTableConstantAddr, base); #else Opnd * acc = irManager.newOpnd(dstType); - copyOpnd(acc, irManager.newImmOpnd(dstType,(POINTER_SIZE_INT)compilationInterface.getVTableBase())); - - return simpleOp_I8(Mnemonic_ADD, dstType, acc, irManager.newImmOpnd(dstType, Opnd::RuntimeInfo::Kind_VTableConstantAddr, base)); + copyOpnd(acc, irManager.newImmOpnd(dstType, Opnd::RuntimeInfo::Kind_VTableConstantAddr, base)); + return acc; #endif }