1.1 --- a/src/share/vm/interpreter/rewriter.cpp Fri Dec 03 12:14:33 2010 -0800
1.2 +++ b/src/share/vm/interpreter/rewriter.cpp Fri Dec 03 15:53:57 2010 -0800
1.3 @@ -52,6 +52,7 @@
1.4 case JVM_CONSTANT_MethodHandle : // fall through
1.5 case JVM_CONSTANT_MethodType : // fall through
1.6 case JVM_CONSTANT_InvokeDynamic : // fall through
1.7 + case JVM_CONSTANT_InvokeDynamicTrans: // fall through
1.8 add_cp_cache_entry(i);
1.9 break;
1.10 }
1.11 @@ -61,6 +62,7 @@
1.12 "all cp cache indexes fit in a u2");
1.13
1.14 _have_invoke_dynamic = ((tag_mask & (1 << JVM_CONSTANT_InvokeDynamic)) != 0);
1.15 + _have_invoke_dynamic |= ((tag_mask & (1 << JVM_CONSTANT_InvokeDynamicTrans)) != 0);
1.16 }
1.17
1.18
1.19 @@ -74,7 +76,7 @@
1.20 oopFactory::new_constantPoolCache(length, methodOopDesc::IsUnsafeConc, CHECK);
1.21 cache->initialize(_cp_cache_map);
1.22
1.23 - // Don't bother to the next pass if there is no JVM_CONSTANT_InvokeDynamic.
1.24 + // Don't bother with the next pass if there is no JVM_CONSTANT_InvokeDynamic.
1.25 if (_have_invoke_dynamic) {
1.26 for (int i = 0; i < length; i++) {
1.27 int pool_index = cp_cache_entry_pool_index(i);
