Mercurial > hg > truffle
diff src/share/vm/interpreter/rewriter.cpp @ 2011:dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
Reviewed-by: twisti
| author | jrose |
|---|---|
| date | Fri, 03 Dec 2010 15:53:57 -0800 |
| parents | f95d63e2154a |
| children | 06f017f7daa7 8012aa3ccede |
line wrap: on
line diff
--- a/src/share/vm/interpreter/rewriter.cpp Fri Dec 03 12:14:33 2010 -0800 +++ b/src/share/vm/interpreter/rewriter.cpp Fri Dec 03 15:53:57 2010 -0800 @@ -52,6 +52,7 @@ case JVM_CONSTANT_MethodHandle : // fall through case JVM_CONSTANT_MethodType : // fall through case JVM_CONSTANT_InvokeDynamic : // fall through + case JVM_CONSTANT_InvokeDynamicTrans: // fall through add_cp_cache_entry(i); break; } @@ -61,6 +62,7 @@ "all cp cache indexes fit in a u2"); _have_invoke_dynamic = ((tag_mask & (1 << JVM_CONSTANT_InvokeDynamic)) != 0); + _have_invoke_dynamic |= ((tag_mask & (1 << JVM_CONSTANT_InvokeDynamicTrans)) != 0); } @@ -74,7 +76,7 @@ oopFactory::new_constantPoolCache(length, methodOopDesc::IsUnsafeConc, CHECK); cache->initialize(_cp_cache_map); - // Don't bother to the next pass if there is no JVM_CONSTANT_InvokeDynamic. + // Don't bother with the next pass if there is no JVM_CONSTANT_InvokeDynamic. if (_have_invoke_dynamic) { for (int i = 0; i < length; i++) { int pool_index = cp_cache_entry_pool_index(i);