--- a/src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp	Fri Jun 22 17:46:58 2018 -0400
+++ b/src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp	Fri Jun 22 15:58:32 2018 -0700
@@ -269,7 +269,7 @@
       ScopeDesc *sd  = &sc0;
       while( !sd->is_top() ) { sd = sd->sender(); }
       int bci = sd->bci();
-      if (bci != InvocationEntryBci) {
+      if (bci >= 0) {
         assert(map_length < pcds_in_method, "checking");
         map[map_length].start_address = (const void*)pcd->real_pc(nm);
         map[map_length].location = bci;