/hg/icedtea6: Adjust SharkMemoryManager to support LLVM 2.7svn r...

[xranby at icedtea.classpath.org]

changeset 00375f1c8222 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=00375f1c8222
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Nov 09 12:55:30 2009 +0100

	Adjust SharkMemoryManager to support LLVM 2.7svn rev 84651.

	2009-11-09 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
	ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: New
	methods deallocateExceptionTable and deallocateFunctionBody
	dependent on the llvm version. Made deallocateMemForFunction
	method dependent on the llvm version.


diffstat:

3 files changed, 25 insertions(+)
ChangeLog                                               |    8 ++++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |   12 ++++++++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |    5 +++++

diffs (57 lines):

diff -r 4073d444623d -r 00375f1c8222 ChangeLog
--- a/ChangeLog	Mon Nov 09 02:20:58 2009 +0000
+++ b/ChangeLog	Mon Nov 09 12:55:30 2009 +0100
@@ -1,3 +1,11 @@ 2009-11-08  Andrew John Hughes  <ahughes
+2009-11-09  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+	ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp:
+	New methods deallocateExceptionTable and deallocateFunctionBody
+	dependent on the llvm version.
+	Made deallocateMemForFunction method dependent on the llvm version.
+
 2009-11-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-xshm.patch: Renamed to...
diff -r 4073d444623d -r 00375f1c8222 ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Mon Nov 09 02:20:58 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Mon Nov 09 12:55:30 2009 +0100
@@ -86,10 +86,22 @@ void SharkMemoryManager::setMemoryExecut
   mm()->setMemoryExecutable();
 }
 
+#if SHARK_LLVM_VERSION >= 27
+void SharkMemoryManager::deallocateExceptionTable(void *ptr)
+{
+  mm()->deallocateExceptionTable(ptr);
+}
+
+void SharkMemoryManager::deallocateFunctionBody(void *ptr)
+{
+  mm()->deallocateFunctionBody(ptr);
+}
+#else
 void SharkMemoryManager::deallocateMemForFunction(const Function* F)
 {
   return mm()->deallocateMemForFunction(F);
 }
+#endif
 
 #if SHARK_LLVM_VERSION >= 26
 uint8_t* SharkMemoryManager::allocateGlobal(uintptr_t Size, unsigned int Alignment)
diff -r 4073d444623d -r 00375f1c8222 ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Mon Nov 09 02:20:58 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Mon Nov 09 12:55:30 2009 +0100
@@ -79,7 +79,12 @@ class SharkMemoryManager : public llvm::
 #endif
   void setMemoryWritable();
   void setMemoryExecutable();
+#if SHARK_LLVM_VERSION >= 27
+  void deallocateExceptionTable(void *ptr);
+  void deallocateFunctionBody(void *ptr);
+#else
   void deallocateMemForFunction(const llvm::Function* F);
+#endif
 
 #if SHARK_LLVM_VERSION >= 25
   unsigned char *allocateSpace(intptr_t Size,