Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 24800 invoked from network); 4 Jun 2006 20:41:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Jun 2006 20:41:10 -0000 Received: (qmail 3065 invoked by uid 500); 4 Jun 2006 20:41:10 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 3028 invoked by uid 500); 4 Jun 2006 20:41:09 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 3011 invoked by uid 99); 4 Jun 2006 20:41:09 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Jun 2006 13:41:09 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Jun 2006 13:41:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3BEEA1A983A; Sun, 4 Jun 2006 13:40:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r411595 - /incubator/harmony/enhanced/jchevm/libjc/cf_parse.c Date: Sun, 04 Jun 2006 20:40:48 -0000 To: harmony-commits@incubator.apache.org From: archie@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060604204049.3BEEA1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: archie Date: Sun Jun 4 13:40:48 2006 New Revision: 411595 URL: http://svn.apache.org/viewvc?rev=411595&view=rev Log: Allow interfaces that fail to have the ACC_ABSTRACT flag set, as required in the JVM classfile specification. Some compilers apparently omit it. Bug#: HARMONY-483 Modified: incubator/harmony/enhanced/jchevm/libjc/cf_parse.c Modified: incubator/harmony/enhanced/jchevm/libjc/cf_parse.c URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/jchevm/libjc/cf_parse.c?rev=411595&r1=411594&r2=411595&view=diff ============================================================================== --- incubator/harmony/enhanced/jchevm/libjc/cf_parse.c (original) +++ incubator/harmony/enhanced/jchevm/libjc/cf_parse.c Sun Jun 4 13:40:48 2006 @@ -138,9 +138,11 @@ /* * Note: _JC_ACC_SUPER should not be allowed for interfaces * (JVMS 4.1) but we allow it here because jikes 1.15 sets it. + * In addition, some compilers fail to add _JC_ACC_ABSTRACT. */ - if ((cfile->access_flags & ~(_JC_ACC_PUBLIC|_JC_ACC_SUPER)) - != (_JC_ACC_INTERFACE|_JC_ACC_ABSTRACT)) { + if ((cfile->access_flags + & ~(_JC_ACC_ABSTRACT|_JC_ACC_PUBLIC|_JC_ACC_SUPER)) + != _JC_ACC_INTERFACE) { _JC_EX_STORE(env, ClassFormatError, "invalid interface access flags 0x%04x", cfile->access_flags);