changeset in /hg/icedtea: 2009-07-15 Xerxes R?nby <xerxes at zafe...

[Xerxes R?nby]

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

		* ports/hotspot/src/share/vm/shark/llvmValue.hpp
		(jbyte_constant): Handle LLVM 2.6 svn r75703 API change.
		llvm::ConstantInt::get have been moved to
		llvm::LLVMContext::getConstantInt.
		(jint_constant): Likewise.
		(jlong_constant): Likewise.
		(intptr_constant): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
		(SharkBuilder::CreateMemoryBarrier): Likewise.
		(SharkBuilder::CreateDump): llvm::ConstantArray::get have been
		moved to llvm::LLVMContext::getConstantArray.

diffstat:

3 files changed, 44 insertions(+)
ChangeLog                                         |   14 ++++++++++++++
ports/hotspot/src/share/vm/shark/llvmValue.hpp    |   16 ++++++++++++++++
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp |   14 ++++++++++++++

diffs (101 lines):

diff -r 022c97ae92d2 -r 10b3039fa024 ChangeLog
--- a/ChangeLog	Tue Jul 14 12:55:48 2009 +0200
+++ b/ChangeLog	Wed Jul 15 12:56:10 2009 +0200
@@ -1,3 +1,17 @@ 2009-07-14  Xerxes RÃ¥nby  <xerxes at zafen
+2009-07-15  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/llvmValue.hpp
+	(jbyte_constant): Handle LLVM 2.6 svn r75703 API change.
+	llvm::ConstantInt::get have been moved to
+	llvm::LLVMContext::getConstantInt.
+	(jint_constant): Likewise.
+	(jlong_constant): Likewise.
+	(intptr_constant): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::CreateMemoryBarrier): Likewise.
+	(SharkBuilder::CreateDump): llvm::ConstantArray::get have been
+	moved to llvm::LLVMContext::getConstantArray.
+ 
 2009-07-14  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/llvmValue.hpp
diff -r 022c97ae92d2 -r 10b3039fa024 ports/hotspot/src/share/vm/shark/llvmValue.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Tue Jul 14 12:55:48 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Wed Jul 15 12:56:10 2009 +0200
@@ -27,15 +27,27 @@ class LLVMValue : public AllStatic {
  public:
   static llvm::ConstantInt* jbyte_constant(jbyte value)
   {
+#if SHARK_LLVM_VERSION >= 26
+    return llvm::getGlobalContext().getConstantInt(SharkType::jbyte_type(), value, true);
+#else
     return llvm::ConstantInt::get(SharkType::jbyte_type(), value, true);
+#endif
   }
   static llvm::ConstantInt* jint_constant(jint value)
   {
+#if SHARK_LLVM_VERSION >= 26
+    return llvm::getGlobalContext().getConstantInt(SharkType::jint_type(), value, true);
+#else
     return llvm::ConstantInt::get(SharkType::jint_type(), value, true);
+#endif
   }
   static llvm::ConstantInt* jlong_constant(jlong value)
   {
+#if SHARK_LLVM_VERSION >= 26
+    return llvm::getGlobalContext().getConstantInt(SharkType::jlong_type(), value, true);
+#else
     return llvm::ConstantInt::get(SharkType::jlong_type(), value, true);
+#endif
   }
 #if SHARK_LLVM_VERSION >= 26
   static llvm::Constant* jfloat_constant(jfloat value)
@@ -67,6 +79,10 @@ class LLVMValue : public AllStatic {
  public:
   static llvm::ConstantInt* intptr_constant(intptr_t value)
   {
+#if SHARK_LLVM_VERSION >= 26
+    return llvm::getGlobalContext().getConstantInt(SharkType::intptr_type(), value, false);
+#else
     return llvm::ConstantInt::get(SharkType::intptr_type(), value, false);
+#endif
   }
 };
diff -r 022c97ae92d2 -r 10b3039fa024 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Tue Jul 14 12:55:48 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Wed Jul 15 12:56:10 2009 +0200
@@ -187,9 +187,15 @@ CallInst* SharkBuilder::CreateDump(llvm:
 {
   Constant *const_name;
   if (value->hasName())
+#if SHARK_LLVM_VERSION >= 26
+    const_name = getGlobalContext().getConstantArray(value->getName());
+  else
+    const_name = getGlobalContext().getConstantArray("unnamed_value");
+#else
     const_name = ConstantArray::get(value->getName());
   else
     const_name = ConstantArray::get("unnamed_value");
+#endif
 
   Value *name = CreatePtrToInt(
     CreateStructGEP(
@@ -260,10 +266,18 @@ CallInst *SharkBuilder::CreateMemoryBarr
 CallInst *SharkBuilder::CreateMemoryBarrier(BarrierFlags flags)
 {
   Value *args[] = {
+#if SHARK_LLVM_VERSION >= 26
+    getGlobalContext().getConstantInt(Type::Int1Ty, (flags & BARRIER_LOADLOAD) ? 1 : 0),
+    getGlobalContext().getConstantInt(Type::Int1Ty, (flags & BARRIER_LOADSTORE) ? 1 : 0),
+    getGlobalContext().getConstantInt(Type::Int1Ty, (flags & BARRIER_STORELOAD) ? 1 : 0),
+    getGlobalContext().getConstantInt(Type::Int1Ty, (flags & BARRIER_STORESTORE) ? 1 : 0),
+    getGlobalContext().getConstantInt(Type::Int1Ty, 0)};
+#else
     ConstantInt::get(Type::Int1Ty, (flags & BARRIER_LOADLOAD) ? 1 : 0),
     ConstantInt::get(Type::Int1Ty, (flags & BARRIER_LOADSTORE) ? 1 : 0),
     ConstantInt::get(Type::Int1Ty, (flags & BARRIER_STORELOAD) ? 1 : 0),
     ConstantInt::get(Type::Int1Ty, (flags & BARRIER_STORESTORE) ? 1 : 0),
     ConstantInt::get(Type::Int1Ty, 0)};
+#endif
   return CreateCall(llvm_memory_barrier_fn(), args, args + 5);
 }