RFC: IRBuilder shark + llvm2.6svn LLVMContext api change + shark mm

[Gary Benson]

Commit away!

Xerxes Rånby wrote:
> This patch fixes the following build errors:
> 
> /home/xerxes/icedtea6/openjdk-ecj/hotspot/src/share/vm/shark/sharkBuilder.cpp:
> In constructor 'SharkBuilder::SharkBuilder(SharkCompiler*)':
> /home/xerxes/icedtea6/openjdk-ecj/hotspot/src/share/vm/shark/sharkBuilder.cpp:65:
> error: no matching function for call to 'llvm::IRBuilder<true,
> llvm::ConstantFolder>::IRBuilder()'
> /usr/local/include/llvm/Support/IRBuilder.h:56: note: candidates are:
> llvm::IRBuilder<preserveNames, T>::IRBuilder(llvm::BasicBlock*,
> llvm::ilist_iterator<llvm::Instruction>, const T&) [with bool
> preserveNames = true, T = llvm::ConstantFolder]
> /usr/local/include/llvm/Support/IRBuilder.h:51: note:                
> llvm::IRBuilder<preserveNames, T>::IRBuilder(llvm::BasicBlock*, const
> T&) [with bool preserveNames = true, T = llvm::ConstantFolder]
> /usr/local/include/llvm/Support/IRBuilder.h:48: note:                
> llvm::IRBuilder<preserveNames, T>::IRBuilder(llvm::LLVMContext&, const
> T&) [with bool preserveNames = true, T = llvm::ConstantFolder]
> /usr/local/include/llvm/Support/IRBuilder.h:42: note:                
> llvm::IRBuilder<true, llvm::ConstantFolder>::IRBuilder(const
> llvm::IRBuilder<true, llvm::ConstantFolder>&)
> make[7]: *** [sharkBuilder.o] Error 1
> 
> and
> 
> /home/xerxes/icedtea6/openjdk-ecj/hotspot/src/share/vm/shark/sharkCompiler.cpp:
> In constructor 'SharkCompiler::SharkCompiler()':
> /home/xerxes/icedtea6/openjdk-ecj/hotspot/src/share/vm/shark/sharkCompiler.cpp:67:
> error: cannot allocate an object of abstract type 'SharkMemoryManager'
> /home/xerxes/icedtea6/openjdk-ecj/hotspot/src/share/vm/shark/sharkMemoryManager.hpp:30:
> note:   because the following virtual functions are pure within
> 'SharkMemoryManager':
> /usr/local/include/llvm/ExecutionEngine/JITMemoryManager.h:50: note:   
> virtual void llvm::JITMemoryManager::setPoisonMemory(bool)
> /usr/local/include/llvm/ExecutionEngine/JITMemoryManager.h:125: note:  
> virtual uint8_t* llvm::JITMemoryManager::allocateGlobal(uintptr_t,
> unsigned int)
> 
> with this patch it builds fine but...
> 
> I have had a bit trouble running shark using the latest llvm svn tip. r75126
> got segfaults compiling string::indexOf on ia32
> 
> Cheers
> Xerxes

> Index: icedtea6/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
> ===================================================================
> --- icedtea6.orig/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	2009-07-09 11:02:37.000000000 +0200
> +++ icedtea6/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	2009-07-09 11:13:29.000000000 +0200
> @@ -61,7 +61,14 @@
>  #endif
>  
>  SharkBuilder::SharkBuilder(SharkCompiler* compiler)
> +#if SHARK_LLVM_VERSION >= 26
> +  // LLVM 2.6 requires a LLVMContext during IRBuilder construction.
> +  // getGlobalConext() returns one that can be used as long as the shark
> +  // compiler are single-threaded.
> +  : IRBuilder<>(getGlobalContext()),
> +#else
>    : IRBuilder<>(),
> +#endif
>      _compiler(compiler)
>  {
>    init_external_functions();
> Index: icedtea6/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
> ===================================================================
> --- icedtea6.orig/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	2009-07-09 11:24:52.000000000 +0200
> +++ icedtea6/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	2009-07-09 11:32:14.000000000 +0200
> @@ -92,6 +92,11 @@
>  }
>  
>  #if SHARK_LLVM_VERSION >= 26
> +uint8_t* SharkMemoryManager::allocateGlobal(uintptr_t Size, unsigned int Alignment)
> +{
> +  return mm()->allocateGlobal(Size, Alignment);
> +}
> +
>  void* SharkMemoryManager::getDlsymTable() const
>  {
>    return mm()->getDlsymTable();
> @@ -102,6 +107,11 @@
>    mm()->SetDlsymTable(ptr);
>  }
>  
> +void SharkMemoryManager::setPoisonMemory(bool poison)
> +{
> +  mm()->setPoisonMemory(poison);
> +}
> +
>  #endif
>  
>  #if SHARK_LLVM_VERSION >= 25
> Index: icedtea6/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
> ===================================================================
> --- icedtea6.orig/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	2009-07-09 11:14:47.000000000 +0200
> +++ icedtea6/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	2009-07-09 11:16:31.000000000 +0200
> @@ -74,6 +74,8 @@
>  #if SHARK_LLVM_VERSION >= 26
>    void* getDlsymTable() const;
>    void SetDlsymTable(void *ptr);
> +  void setPoisonMemory(bool);
> +  uint8_t* allocateGlobal(uintptr_t, unsigned int);
>  #endif
>    void setMemoryWritable();
>    void setMemoryExecutable();


-- 
http://gbenson.net/