1.1 --- a/src/share/vm/classfile/verifier.hpp Tue Sep 01 23:34:08 2009 -0700 1.2 +++ b/src/share/vm/classfile/verifier.hpp Fri Sep 04 12:53:02 2009 -0400 1.3 @@ -34,16 +34,18 @@ 1.4 * Otherwise, no exception is thrown and the return indicates the 1.5 * error. 1.6 */ 1.7 - static bool verify(instanceKlassHandle klass, Mode mode, TRAPS); 1.8 + static bool verify(instanceKlassHandle klass, Mode mode, bool should_verify_class, TRAPS); 1.9 1.10 - // Return false if the class is loaded by the bootstrap loader. 1.11 - static bool should_verify_for(oop class_loader); 1.12 + // Return false if the class is loaded by the bootstrap loader, 1.13 + // or if defineClass was called requesting skipping verification 1.14 + // -Xverify:all/none override this value 1.15 + static bool should_verify_for(oop class_loader, bool should_verify_class); 1.16 1.17 // Relax certain verifier checks to enable some broken 1.1 apps to run on 1.2. 1.18 static bool relax_verify_for(oop class_loader); 1.19 1.20 private: 1.21 - static bool is_eligible_for_verification(instanceKlassHandle klass); 1.22 + static bool is_eligible_for_verification(instanceKlassHandle klass, bool should_verify_class); 1.23 static symbolHandle inference_verify( 1.24 instanceKlassHandle klass, char* msg, size_t msg_len, TRAPS); 1.25 };