--- old/src/share/vm/code/codeCache.cpp	2019-01-28 17:43:29.000000000 +0800
+++ new/src/share/vm/code/codeCache.cpp	2019-01-28 17:43:29.000000000 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -188,6 +188,14 @@
     if (cb != NULL) break;
     if (!_heap->expand_by(CodeCacheExpansionSize)) {
       // Expansion failed
+      if (EnableJFR) {
+        if (CodeCache_lock->owned_by_self()) {
+          MutexUnlockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+          report_codemem_full();
+        } else {
+          report_codemem_full();
+        }
+      }
       return NULL;
     }
     if (PrintCodeCacheExtension) {
@@ -757,6 +765,7 @@
   _codemem_full_count++;
   EventCodeCacheFull event;
   if (event.should_commit()) {
+    event.set_codeBlobType((u1)CodeBlobType::All);
     event.set_startAddress((u8)low_bound());
     event.set_commitedTopAddress((u8)high());
     event.set_reservedTopAddress((u8)high_bound());