Mercurial > hg > truffle
changeset 6559:d5f7e737827f
fixed compilation issues on Solaris. When using SunStudio compiler, Solaris build with DONT_USE_PRECOMPILED_HEADER
| author | Laurent Daynes <Laurent.Daynes@oracle.com> |
|---|---|
| date | Fri, 19 Oct 2012 11:30:06 +0200 |
| parents | 0a6d8857306d |
| children | 2b5eab0df111 |
| files | src/share/vm/graal/graalCodeInstaller.cpp src/share/vm/graal/graalCompiler.cpp src/share/vm/graal/graalCompilerToVM.cpp src/share/vm/graal/graalInterpreterToVM.cpp src/share/vm/graal/graalRuntime.cpp src/share/vm/graal/graalRuntime.hpp |
| diffstat | 6 files changed, 11 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp Fri Oct 19 10:18:40 2012 +0200 +++ b/src/share/vm/graal/graalCodeInstaller.cpp Fri Oct 19 11:30:06 2012 +0200 @@ -22,6 +22,7 @@ */ #include "precompiled.hpp" +#include "runtime/javaCalls.hpp" #include "graal/graalCompiler.hpp" #include "graal/graalCodeInstaller.hpp" #include "graal/graalJavaAccess.hpp"
--- a/src/share/vm/graal/graalCompiler.cpp Fri Oct 19 10:18:40 2012 +0200 +++ b/src/share/vm/graal/graalCompiler.cpp Fri Oct 19 11:30:06 2012 +0200 @@ -22,6 +22,8 @@ */ #include "precompiled.hpp" +#include "memory/oopFactory.hpp" +#include "runtime/javaCalls.hpp" #include "graal/graalCompiler.hpp" #include "graal/graalJavaAccess.hpp" #include "graal/graalVMToCompiler.hpp"
--- a/src/share/vm/graal/graalCompilerToVM.cpp Fri Oct 19 10:18:40 2012 +0200 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Fri Oct 19 11:30:06 2012 +0200 @@ -23,6 +23,9 @@ #include "precompiled.hpp" #include "runtime/fieldDescriptor.hpp" +#include "memory/oopFactory.hpp" +#include "oops/generateOopMap.hpp" +#include "runtime/javaCalls.hpp" #include "c1/c1_Runtime1.hpp" #include "ci/ciMethodData.hpp" #include "compiler/compileBroker.hpp" @@ -33,8 +36,7 @@ #include "graal/graalCodeInstaller.hpp" #include "graal/graalVMToCompiler.hpp" #include "graal/graalVmIds.hpp" -#include "memory/oopFactory.hpp" -#include "oops/generateOopMap.hpp" + methodOop getMethodFromHotSpotMethod(jobject hotspot_method) { return getMethodFromHotSpotMethod(JNIHandles::resolve(hotspot_method));
--- a/src/share/vm/graal/graalInterpreterToVM.cpp Fri Oct 19 10:18:40 2012 +0200 +++ b/src/share/vm/graal/graalInterpreterToVM.cpp Fri Oct 19 11:30:06 2012 +0200 @@ -23,6 +23,8 @@ #include "precompiled.hpp" #include "prims/jni.h" +#include "runtime/javaCalls.hpp" +#include "memory/oopFactory.hpp" #include "graal/graalInterpreterToVM.hpp" #include "graal/graalCompiler.hpp" #include "graal/graalCompilerToVM.hpp"
--- a/src/share/vm/graal/graalRuntime.cpp Fri Oct 19 10:18:40 2012 +0200 +++ b/src/share/vm/graal/graalRuntime.cpp Fri Oct 19 11:30:06 2012 +0200 @@ -22,7 +22,8 @@ */ #include "precompiled.hpp" - +#include "runtime/interfaceSupport.hpp" +#include "prims/jvm.h" #include "graal/graalVMToCompiler.hpp" // JVM_InitializeGraalRuntime
--- a/src/share/vm/graal/graalRuntime.hpp Fri Oct 19 10:18:40 2012 +0200 +++ b/src/share/vm/graal/graalRuntime.hpp Fri Oct 19 11:30:06 2012 +0200 @@ -24,14 +24,4 @@ #ifndef SHARE_VM_GRAAL_GRAAL_RUNTIME_HPP #define SHARE_VM_GRAAL_GRAAL_RUNTIME_HPP -class GraalRuntime : public AllStatic { - -private: - jobject _runtimeObject; - -public: - static jobject instance() { return _runtimeObject; } - -}; - #endif // SHARE_VM_GRAAL_GRAAL_RUNTIME_HPP