hg: jdk/hs: 2 new changesets

[eric.caspole at oracle.com]

Changeset: ea5906610227
Author:    ecaspole
Date:      2017-11-30 09:59 -0500
URL:       http://hg.openjdk.java.net/jdk/hs/rev/ea5906610227

8191779: LogCompilation throws java.lang.Error: scope underflow
Summary: Add the trap into the last call site as the site may not yet be added into scopes.
Reviewed-by: kvn, thartmann

! src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java

Changeset: 995ed4b92655
Author:    ecaspole
Date:      2017-11-30 10:01 -0500
URL:       http://hg.openjdk.java.net/jdk/hs/rev/995ed4b92655

Merge