changeset 47912:cbb71d828923 condy-folding

Automatic merge with condy
author mcimadamore
date Tue, 14 Nov 2017 23:41:14 +0100
parents 3bcdb8596e3d e40b67b69cd9
children adb1cca1483f
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/oops/constantPool.cpp	Tue Nov 14 14:31:58 2017 -0800
+++ b/src/hotspot/share/oops/constantPool.cpp	Tue Nov 14 23:41:14 2017 +0100
@@ -1220,7 +1220,7 @@
                                                     bool must_resolve, Handle if_not_available,
                                                     TRAPS) {
   int argc;
-  int limit = java_add(pos, end_arg - start_arg);
+  int limit = pos + end_arg - start_arg;
   // checks: index in range [0..this_cp->length),
   // tag at index, start..end in range [0..argc],
   // info array non-null, pos..limit in [0..info.length]