harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r573304 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp
Date Thu, 06 Sep 2007 15:56:11 GMT
Author: gshimansky
Date: Thu Sep  6 08:56:10 2007
New Revision: 573304

URL: http://svn.apache.org/viewvc?rev=573304&view=rev
Log:
Applied patch from HARMONY-4308
[drlvm][classloader] Test vm/jvms/classFile/structure/accessFlags/accessFlags08/accessFlags08
fails due to incorrect processing of accesss flags in 1.4 class files


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp?rev=573304&r1=573303&r2=573304&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp Thu Sep
 6 08:56:10 2007
@@ -2816,6 +2816,12 @@
         m_access_flags |= ACC_ABSTRACT;
     }
 
+    //for class file version lower than 49 these three flags should be set to zero
+    //See specification 4.5 Fields, for 1.4 Java.
+    if(m_version < JAVA5_CLASS_FILE_VERSION) {
+        m_access_flags &= ~(ACC_SYNTHETIC | ACC_ENUM | ACC_ANNOTATION);
+    }
+
     /*
      *   can't be both final and interface, or both final and abstract
      *   See specification 4.2 about access_flags.
@@ -2854,12 +2860,7 @@
         REPORT_FAILED_CLASS_FORMAT(this, "not interface can't be annotation");
         return false;
     }
-    //for class file version lower than 49 these three flags should be set to zero
-    //See specification 4.5 Fields, for 1.4 Java.    
-    if(m_version < JAVA5_CLASS_FILE_VERSION) {
-        m_access_flags &= ~(ACC_SYNTHETIC | ACC_ENUM | ACC_ANNOTATION);    
-    }
-    
+
     /*
      * parse this_class & super_class & verify their constant pool entries
      */



Mime
View raw message