1.1 --- a/src/share/vm/utilities/vmError.hpp Tue Apr 30 09:17:06 2013 -0400
1.2 +++ b/src/share/vm/utilities/vmError.hpp Tue Apr 30 11:56:52 2013 -0700
1.3 @@ -34,10 +34,6 @@
1.4 friend class VM_ReportJavaOutOfMemory;
1.5 friend class Decoder;
1.6
1.7 - enum ErrorType {
1.8 - internal_error = 0xe0000000,
1.9 - oom_error = 0xe0000001
1.10 - };
1.11 int _id; // Solaris/Linux signals: 0 - SIGRTMAX
1.12 // Windows exceptions: 0xCxxxxxxx system errors
1.13 // 0x8xxxxxxx system warnings
1.14 @@ -96,9 +92,12 @@
1.15 // accessor
1.16 const char* message() const { return _message; }
1.17 const char* detail_msg() const { return _detail_msg; }
1.18 - bool should_report_bug(unsigned int id) { return id != oom_error; }
1.19 + bool should_report_bug(unsigned int id) {
1.20 + return (id != OOM_MALLOC_ERROR) && (id != OOM_MMAP_ERROR);
1.21 + }
1.22
1.23 public:
1.24 +
1.25 // Constructor for crashes
1.26 VMError(Thread* thread, unsigned int sig, address pc, void* siginfo,
1.27 void* context);
1.28 @@ -108,7 +107,7 @@
1.29
1.30 // Constructor for VM OOM errors
1.31 VMError(Thread* thread, const char* filename, int lineno, size_t size,
1.32 - const char* message);
1.33 + VMErrorType vm_err_type, const char* message);
1.34 // Constructor for non-fatal errors
1.35 VMError(const char* message);
1.36
