/hg/icedtea6: Update Shark for LLVM 2.8 API change r100304

[xranby at icedtea.classpath.org]

changeset 902bacad8d1b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=902bacad8d1b
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Apr 19 16:50:36 2010 +0200

	Update Shark for LLVM 2.8 API change r100304

	2010-04-19 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
	(SharkBuilder::memset): Update Shark for LLVM 2.8 API change.
	LLVM 2.8 added a fifth isVolatile field for memset
	introduced with LLVM r100304. (SharkBuilder::CreateMemset):
	Likewise


diffstat:

2 files changed, 19 insertions(+)
ChangeLog                                         |    8 ++++++++
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp |   11 +++++++++++

diffs (45 lines):

diff -r 8048dccbf481 -r 902bacad8d1b ChangeLog
--- a/ChangeLog	Sun Apr 18 21:04:29 2010 +0100
+++ b/ChangeLog	Mon Apr 19 16:50:36 2010 +0200
@@ -1,3 +1,11 @@ 2010-04-18  Andrew John Hughes  <ahughes
+2010-04-19  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::memset): Update Shark for LLVM 2.8 API change.
+	LLVM 2.8 added a fifth isVolatile field for memset
+	introduced with LLVM r100304.
+	(SharkBuilder::CreateMemset): Likewise
+
 2010-04-18  Andrew John Hughes  <ahughes at redhat.com>
 
 	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java:
diff -r 8048dccbf481 -r 902bacad8d1b ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Sun Apr 18 21:04:29 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Mon Apr 19 16:50:36 2010 +0200
@@ -399,7 +399,13 @@ Value* SharkBuilder::memory_barrier() {
 }
 
 Value* SharkBuilder::memset() {
+#if SHARK_LLVM_VERSION >= 28
+  // LLVM 2.8 added a fifth isVolatile field for memset
+  // introduced with LLVM r100304
+  return make_function("llvm.memset.i32", "Cciii", "v");
+#else
   return make_function("llvm.memset.i32", "Ccii", "v");
+#endif
 }
 
 Value* SharkBuilder::unimplemented() {
@@ -447,7 +453,12 @@ CallInst* SharkBuilder::CreateMemset(Val
                                      Value* value,
                                      Value* len,
                                      Value* align) {
+#if SHARK_LLVM_VERSION >= 28
+  return CreateCall5(memset(), dst, value, len, align,
+                     LLVMValue::jint_constant(0));
+#else
   return CreateCall4(memset(), dst, value, len, align);
+#endif
 }
 
 CallInst* SharkBuilder::CreateUnimplemented(const char* file, int line) {