Mercurial > hg > truffle
diff src/share/vm/runtime/vframeArray.cpp @ 2044:06f017f7daa7
Merge.
| author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
|---|---|
| date | Fri, 07 Jan 2011 18:18:08 +0100 |
| parents | 8d88c9ac9247 f95d63e2154a |
| children | d25d4ca69222 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vframeArray.cpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/runtime/vframeArray.cpp Fri Jan 07 18:18:08 2011 +0100 @@ -22,8 +22,25 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vframeArray.cpp.incl" +#include "precompiled.hpp" +#include "classfile/vmSymbols.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/monitorChunk.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/vframe.hpp" +#include "runtime/vframeArray.hpp" +#include "runtime/vframe_hp.hpp" +#include "utilities/events.hpp" +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif int vframeArrayElement:: bci(void) const { return (_bci == SynchronizationEntryBCI ? 0 : _bci); }