Merge branch 'plugin-inline-during-parsing' of https://github.com/mar…

…janasolajic/graal into plugin-inline-during-parsing
oracle · Dec 4, 2020 · 81b79a2 · 81b79a2
2 parents 47baf31 + e57c1e4
commit 81b79a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/THIRD_PARTY_LICENSE.txt b/THIRD_PARTY_LICENSE.txt
@@ -11,7 +11,7 @@ The following software may be included in this product:
 
 ===============================================================================
 
-JSON 20180813 
+JSON 20201115 
 
 Copyright (c) 2002 JSON.org
 
@@ -1152,7 +1152,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ===============================================================================
-JLine 3.16.0
+JLine 3.13.2
 
 Copyright (c) 2002-2018, the original author or authors.
 All rights reserved.

diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java
@@ -626,7 +626,7 @@ public InlineInfo shouldInlineInvoke(GraphBuilderContext builder, ResolvedJavaMe
 
             /*
              * We can't inline methods that use intrnsifications. By inlining them we are opening a
-             * door for inconsistencies between parsing in analysis and parsing for deopt targets.
+             * door for inconsistencies between parsing in analysis and parsing for runtime methods.
              */
             if (ImageSingletons.lookup(IntrinsifyMethodHandlesInvocationPlugin.IntrinsificationRegistry.class).hasIntrinsifications((AnalysisMethod) original)) {
                 return InlineInfo.DO_NOT_INLINE_WITH_EXCEPTION;