Mercurial > hg > truffle
comparison src/share/vm/runtime/sharedRuntime.cpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 14 Dec 2012 14:35:13 +0100 |
parents | 5d0bb7d52783 cd3d6a6b95d9 |
children | 989155e2d07a |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
29 #include "code/scopeDesc.hpp" | 29 #include "code/scopeDesc.hpp" |
30 #include "code/vtableStubs.hpp" | 30 #include "code/vtableStubs.hpp" |
31 #include "compiler/abstractCompiler.hpp" | 31 #include "compiler/abstractCompiler.hpp" |
32 #include "compiler/compileBroker.hpp" | 32 #include "compiler/compileBroker.hpp" |
33 #include "compiler/compilerOracle.hpp" | 33 #include "compiler/compilerOracle.hpp" |
34 #include "compiler/disassembler.hpp" | |
34 #include "interpreter/interpreter.hpp" | 35 #include "interpreter/interpreter.hpp" |
35 #include "interpreter/interpreterRuntime.hpp" | 36 #include "interpreter/interpreterRuntime.hpp" |
36 #include "memory/gcLocker.inline.hpp" | 37 #include "memory/gcLocker.inline.hpp" |
37 #include "memory/universe.inline.hpp" | 38 #include "memory/universe.inline.hpp" |
38 #include "oops/oop.inline.hpp" | 39 #include "oops/oop.inline.hpp" |