src/share/vm/runtime/os.cpp

rev 13203 : [mq]: 8183925

*** 571,595 ****
  
  void* os::malloc(size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
    NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1));
    NOT_PRODUCT(inc_stat_counter(&alloc_bytes, size));
  
- #ifdef ASSERT
    // checking for the WatcherThread and crash_protection first
    // since os::malloc can be called when the libjvm.{dll,so} is
    // first loaded and we don't have a thread yet.
    // try to find the thread after we see that the watcher thread
    // exists and has crash protection.
!   WatcherThread *wt = WatcherThread::watcher_thread();
!   if (wt != NULL && wt->has_crash_protection()) {
!     Thread* thread = Thread::current_or_null();
!     if (thread == wt) {
!       assert(!wt->has_crash_protection(),
            "Can't malloc with crash protection from WatcherThread");
-     }
-   }
- #endif
  
    if (size == 0) {
      // return a valid pointer if size is zero
      // if NULL is returned the calling functions assume out of memory.
      size = 1;
--- 571,587 ----
  
  void* os::malloc(size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
    NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1));
    NOT_PRODUCT(inc_stat_counter(&alloc_bytes, size));
  
    // checking for the WatcherThread and crash_protection first
    // since os::malloc can be called when the libjvm.{dll,so} is
    // first loaded and we don't have a thread yet.
    // try to find the thread after we see that the watcher thread
    // exists and has crash protection.
!   assert(!os::ThreadCrashProtection::is_crash_protected(Thread::current_or_null()),
           "Can't malloc with crash protection from WatcherThread");
  
    if (size == 0) {
      // return a valid pointer if size is zero
      // if NULL is returned the calling functions assume out of memory.
      size = 1;