# HG changeset patch
# User ecaspole
# Date 1512054086 18000
# Node ID 995ed4b92655ce110dcbe3f80aa772ba114a6129
# Parent  ea5906610227d3f60933e198f313d2cc29920497# Parent  464c63eb6d1fd70934ad5da8132a833d213c10ff
Merge

diff -r 464c63eb6d1f -r 995ed4b92655 src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java
--- a/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java	Thu Nov 30 09:51:28 2017 -0500
+++ b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java	Thu Nov 30 10:01:26 2017 -0500
@@ -1025,13 +1025,20 @@
                     return;
                 }
                 try {
+                    UncommonTrap unc = new UncommonTrap(Integer.parseInt(search(atts, "bci")),
+                            search(atts, "reason"),
+                            search(atts, "action"),
+                            bytecodes[current_bytecode]);
                     if (scopes.size() == 0) {
-                        reportInternalError("scope underflow");
+                        // There may be a dangling site not yet in scopes after a late_inline
+                        if (site != null) {
+                            site.add(unc);
+                        } else {
+                            reportInternalError("scope underflow");
+                        }
+                    } else {
+                        scopes.peek().add(unc);
                     }
-                    scopes.peek().add(new UncommonTrap(Integer.parseInt(search(atts, "bci")),
-                                                       search(atts, "reason"),
-                                                       search(atts, "action"),
-                                                       bytecodes[current_bytecode]));
                 } catch (Error e) {
                     e.printStackTrace();
                 }