src/share/vm/c1/c1_GraphBuilder.cpp

rev 8910 : full patch for jfr

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -3459,14 +3459,15 @@
     case vmIntrinsics::_arraycopy:
       if (!InlineArrayCopy) return false;
       break;
 
 #ifdef TRACE_HAVE_INTRINSICS
-    case vmIntrinsics::_classID:
-    case vmIntrinsics::_threadID:
-      preserves_state = true;
-      cantrap = true;
+    case vmIntrinsics::_getClassId:
+      cantrap = false;
+      break;
+
+    case vmIntrinsics::_getEventWriter:
       break;
 
     case vmIntrinsics::_counterTime:
       preserves_state = true;
       cantrap = false;

@@ -4409,10 +4410,22 @@
         log->inline_fail(msg);
       else
         log->inline_fail("reason unknown");
     }
   }
+#if INCLUDE_TRACE
+  EventCompilerInlining event;
+  if (event.should_commit()) {
+    event.set_compileId(compilation()->env()->task()->compile_id());
+    event.set_message(msg);
+    event.set_succeeded(success);
+    event.set_bci(bci());
+    event.set_caller(method()->get_Method());
+    event.set_callee(callee->to_trace_struct());
+    event.commit();
+  }
+#endif // INCLUDE_TRACE
 
   if (!PrintInlining && !compilation()->method()->has_option("PrintInlining")) {
     return;
   }
   CompileTask::print_inlining(callee, scope()->level(), bci(), msg);