changeset in /hg/icedtea6: 2009-05-05 Xerxes R?nby <xerxes at zafen...

[Xerxes R?nby]

changeset be7c5293ac85 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be7c5293ac85
description:
	2009-05-05 Xerxes R?nby <xerxes at zafena.se>

		* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
		(SharkCompiler::SharkCompiler): Use bool or enum to set
		JIT optimization dependent on the llvm version.

diffstat:

2 files changed, 18 insertions(+)
ChangeLog                                          |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |   12 ++++++++++++

diffs (36 lines):

diff -r 3ec346e55f66 -r be7c5293ac85 ChangeLog
--- a/ChangeLog	Tue May 05 02:11:58 2009 +0200
+++ b/ChangeLog	Tue May 05 13:30:07 2009 +0200
@@ -1,3 +1,9 @@ 2009-05-05 Xerxes RÃ¥nby <xerxes at zafena.
+2009-05-05 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Use bool or enum to set
+	JIT optimization dependent on the llvm version.
+ 
 2009-05-05 Xerxes RÃ¥nby <xerxes at zafena.se>
 
 	* configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from
diff -r 3ec346e55f66 -r be7c5293ac85 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Tue May 05 02:11:58 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Tue May 05 13:30:07 2009 +0200
@@ -41,7 +41,19 @@ SharkCompiler::SharkCompiler()
   ModuleProvider *module_provider = new ExistingModuleProvider(module());
   _memory_manager = new SharkMemoryManager();
   _execution_engine = ExecutionEngine::createJIT(
+#if SHARK_LLVM_VERSION >= 26
+   /*
+    * LLVM 26 introduced a more fine-grained control to set the optimization
+    * level when creating the LLVM JIT.
+    * The optimization level are now specified with a enum instead of a bool.
+    * CodeGenOpt::None = bool true; a fast JIT with reduced optimization.
+    * CodeGenOpt::Default = bool false; a non-fast JIT with optimization.
+    * CodeGenOpt::Aggressive = a new non-fast JIT with best optimization.
+    */
+    module_provider, NULL, memory_manager(), CodeGenOpt::Default);
+#else
     module_provider, NULL, memory_manager(), false);
+#endif
 
   // Initialize Shark components that need it
   SharkType::initialize();