RFC: shark + llvm2.6svn api change ConstantInt::get and ConstantArray::get implementation have been moved to LLVMContext

[Gary Benson]

Hi Xerxes,

Please commit this.  Feel free to commit similar API fixes in future,
you're pretty good at them :)

Cheers,
Gary

Xerxes Rånby wrote:
> Patch to fix build errors with LLVM API changes in svn r75703
> ConstantInt::get and ConstantArray::get implementation have been
> moved to LLVMContext
> 
> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20090713/081100.html
> 
> Cheers
> Xerxes

> Index: icedtea6/ports/hotspot/src/share/vm/shark/llvmValue.hpp
> ===================================================================
> --- icedtea6.orig/ports/hotspot/src/share/vm/shark/llvmValue.hpp	2009-07-15 11:34:29.000000000 +0200
> +++ icedtea6/ports/hotspot/src/share/vm/shark/llvmValue.hpp	2009-07-15 11:39:21.000000000 +0200
> @@ -27,15 +27,27 @@
>   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 @@
>   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
>    }
>  };
> Index: icedtea6/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
> ===================================================================
> --- icedtea6.orig/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	2009-07-15 11:40:21.000000000 +0200
> +++ icedtea6/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	2009-07-15 11:44:42.000000000 +0200
> @@ -187,9 +187,15 @@
>  {
>    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::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);
>  }


-- 
http://gbenson.net/