RFC: [patch] Update shark for LLVM r94686 API change.

[Gary Benson]

Xerxes Rånby wrote:
> The attached updates Shark for LLVM r94686 API change.
> The use of llvm context module_providers have been removed to fix some
> subtile performance related LLVM JIT bugs
> (http://llvm.org/bugs/show_bug.cgi?id=5737 and
> http://llvm.org/bugs/show_bug.cgi?id=5735).
> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20100125/095204.html
> 
> Ok to commit?

In sharkContext.hpp, don't bother having separate identical module()
functions, just make it public if that's what's necessary.

Otherwise, yes :)

Cheers,
Gary

> Index: icedtea6-shark/ports/hotspot/src/share/vm/shark/sharkContext.hpp
> ===================================================================
> --- icedtea6-shark.orig/ports/hotspot/src/share/vm/shark/sharkContext.hpp	2010-01-31 10:15:27.000000000 +0100
> +++ icedtea6-shark/ports/hotspot/src/share/vm/shark/sharkContext.hpp	2010-01-31 10:35:39.000000000 +0100
> @@ -36,11 +36,13 @@
>   private:
>    llvm::Module* _module;
>  
> +#if SHARK_LLVM_VERSION < 27
>   private:
>    llvm::Module* module() const
>    {
>      return _module;
>    }
> +#endif
>  
>    // Get this thread's SharkContext
>   public:
> @@ -51,10 +53,17 @@
>  
>    // Module accessors
>   public:
> +#if SHARK_LLVM_VERSION >= 27
> +  llvm::Module* module() const
> +  {
> +    return _module;
> +  }
> +#else
>    llvm::ModuleProvider* module_provider() const
>    {
>      return new llvm::ExistingModuleProvider(module());
>    }
> +#endif
>    void add_function(llvm::Function* function) const
>    {
>      module()->getFunctionList().push_back(function);


-- 
http://gbenson.net/