/hg/icedtea6: Update Shark for LLVM r94686 API change.

[xranby at icedtea.classpath.org]

changeset 22be2c99a89b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=22be2c99a89b
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Feb 01 12:28:24 2010 +0100

	Update Shark for LLVM r94686 API change.

	2010-02-01 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::SharkCompiler): Use sharkContext::module
	instead of sharkContext::module_provider when using LLVM 2.7
	to handle LLVM r94686 API change.
		* ports/hotspot/src/share/vm/shark/sharkContext.hpp
	(sharkContext::module): Made public when using LLVM 2.7.
	(sharkContext::module_provider): Undefine when using LLVM 2.7.
		* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
	(llvm/ModuleProvider.h): Undefine when using LLVM 2.7.


diffstat:

4 files changed, 29 insertions(+), 1 deletion(-)
ChangeLog                                          |   12 ++++++++++++
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp   |    2 ++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |    8 ++++++++
ports/hotspot/src/share/vm/shark/sharkContext.hpp  |    8 +++++++-

diffs (84 lines):

diff -r ec2ae0d51146 -r 22be2c99a89b ChangeLog
--- a/ChangeLog	Sat Jan 30 01:38:48 2010 +0000
+++ b/ChangeLog	Mon Feb 01 12:28:24 2010 +0100
@@ -1,3 +1,15 @@ 2010-01-29 Andrew John Hughes  <ahughes@
+2010-02-01  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Use sharkContext::module
+	instead of sharkContext::module_provider when using LLVM 2.7
+	to handle LLVM r94686 API change.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp
+	(sharkContext::module): Made public when using LLVM 2.7.
+	(sharkContext::module_provider): Undefine when using LLVM 2.7.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
+	(llvm/ModuleProvider.h): Undefine when using LLVM 2.7.
+
 2010-01-29 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add INITIAL_BOOTSTRAP_LINK_STAMP
diff -r ec2ae0d51146 -r 22be2c99a89b ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Sat Jan 30 01:38:48 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Mon Feb 01 12:28:24 2010 +0100
@@ -34,7 +34,9 @@
 #include <llvm/Instructions.h>
 #include <llvm/LLVMContext.h>
 #include <llvm/Module.h>
+#if SHARK_LLVM_VERSION < 27
 #include <llvm/ModuleProvider.h>
+#endif
 #include <llvm/Support/IRBuilder.h>
 #include <llvm/System/Threading.h>
 #include <llvm/Target/TargetSelect.h>
diff -r ec2ae0d51146 -r 22be2c99a89b ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Sat Jan 30 01:38:48 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Feb 01 12:28:24 2010 +0100
@@ -52,11 +52,19 @@ SharkCompiler::SharkCompiler()
   _memory_manager = new SharkMemoryManager();
 
   // Create the JIT
+#if SHARK_LLVM_VERSION >= 27
+  _execution_engine = ExecutionEngine::createJIT(
+    _normal_context->module(),
+    NULL, memory_manager(), CodeGenOpt::Default);
+  execution_engine()->addModule(
+    _native_context->module());
+#else
   _execution_engine = ExecutionEngine::createJIT(
     _normal_context->module_provider(),
     NULL, memory_manager(), CodeGenOpt::Default);
   execution_engine()->addModuleProvider(
     _native_context->module_provider());
+#endif
 
   // All done
   mark_initialized();
diff -r ec2ae0d51146 -r 22be2c99a89b ports/hotspot/src/share/vm/shark/sharkContext.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Sat Jan 30 01:38:48 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Mon Feb 01 12:28:24 2010 +0100
@@ -36,7 +36,11 @@ class SharkContext : public llvm::LLVMCo
  private:
   llvm::Module* _module;
 
- private:
+#if SHARK_LLVM_VERSION >= 27
+ public:
+#else
+ private:
+#endif
   llvm::Module* module() const
   {
     return _module;
@@ -51,10 +55,12 @@ class SharkContext : public llvm::LLVMCo
 
   // Module accessors
  public:
+#if SHARK_LLVM_VERSION < 27
   llvm::ModuleProvider* module_provider() const
   {
     return new llvm::ExistingModuleProvider(module());
   }
+#endif
   void add_function(llvm::Function* function) const
   {
     module()->getFunctionList().push_back(function);