Mercurial > hg > truffle
diff src/share/vm/interpreter/rewriter.cpp @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | 2d26b0046e0d dad31fc330cd |
children | d25d4ca69222 |
line wrap: on
line diff
--- a/src/share/vm/interpreter/rewriter.cpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/interpreter/rewriter.cpp Fri Jan 07 18:18:08 2011 +0100 @@ -22,8 +22,17 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_rewriter.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/bytecodes.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/rewriter.hpp" +#include "memory/gcLocker.hpp" +#include "memory/oopFactory.hpp" +#include "memory/resourceArea.hpp" +#include "oops/generateOopMap.hpp" +#include "oops/objArrayOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/methodComparator.hpp" // Computes a CPC map (new_index -> original_index) for constant pool entries // that are referred to by the interpreter at runtime via the constant pool cache. @@ -43,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; } @@ -52,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); } @@ -65,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);