src/share/vm/classfile/classFileParser.hpp

rev 7856 : 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp

*** 24,39 ****
  
  #ifndef SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP
  #define SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP
  
  #include "classfile/classFileStream.hpp"
! #include "memory/resourceArea.hpp"
  #include "oops/typeArrayOop.hpp"
  #include "utilities/accessFlags.hpp"
- #include "classfile/symbolTable.hpp"
  
  class FieldAllocationCount;
  class FieldLayoutInfo;
  
  
  // Parser for for .class files
  //
--- 24,42 ----
  
  #ifndef SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP
  #define SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP
  
  #include "classfile/classFileStream.hpp"
! #include "classfile/symbolTable.hpp"
! #include "oops/annotations.hpp"
  #include "oops/typeArrayOop.hpp"
+ #include "oops/constantPool.hpp"
  #include "utilities/accessFlags.hpp"
  
+ class CompressedLineNumberWriteStream;
  class FieldAllocationCount;
+ class FieldInfo;
  class FieldLayoutInfo;
  
  
  // Parser for for .class files
  //
*** 313,342 ****
    void classfile_parse_error(const char* msg, int index, const char *name, TRAPS);
    inline void guarantee_property(bool b, const char* msg, TRAPS) {
      if (!b) { classfile_parse_error(msg, CHECK); }
    }
  
! PRAGMA_DIAG_PUSH
! PRAGMA_FORMAT_NONLITERAL_IGNORED
! inline void assert_property(bool b, const char* msg, TRAPS) {
  #ifdef ASSERT
      if (!b) {
!       ResourceMark rm(THREAD);
!       fatal(err_msg(msg, _class_name->as_C_string()));
      }
  #endif
    }
  
    inline void assert_property(bool b, const char* msg, int index, TRAPS) {
  #ifdef ASSERT
      if (!b) {
!       ResourceMark rm(THREAD);
!       fatal(err_msg(msg, index, _class_name->as_C_string()));
      }
  #endif
    }
- PRAGMA_DIAG_POP
  
    inline void check_property(bool property, const char* msg, int index, TRAPS) {
      if (_need_verify) {
        guarantee_property(property, msg, index, CHECK);
      } else {
--- 316,343 ----
    void classfile_parse_error(const char* msg, int index, const char *name, TRAPS);
    inline void guarantee_property(bool b, const char* msg, TRAPS) {
      if (!b) { classfile_parse_error(msg, CHECK); }
    }
  
!   void report_assert_property_failure(const char* msg, TRAPS);
!   void report_assert_property_failure(const char* msg, int index, TRAPS);
! 
!   inline void assert_property(bool b, const char* msg, TRAPS) {
  #ifdef ASSERT
      if (!b) {
!       report_assert_property_failure(msg, THREAD);
      }
  #endif
    }
  
    inline void assert_property(bool b, const char* msg, int index, TRAPS) {
  #ifdef ASSERT
      if (!b) {
!       report_assert_property_failure(msg, index, THREAD);
      }
  #endif
    }
  
    inline void check_property(bool property, const char* msg, int index, TRAPS) {
      if (_need_verify) {
        guarantee_property(property, msg, index, CHECK);
      } else {