[Mesa-dev] [PATCH] st/clover: Fix build against LLVM SVN >= r215967

Francisco Jerez currojerez at riseup.net
Tue Aug 19 23:48:28 PDT 2014


Michel Dänzer <michel at daenzer.net> writes:

> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
> ---
>  src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index 5d2efc4..2643cc3 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -234,7 +234,11 @@ namespace {
>        memcpy(address_spaces, c.getTarget().getAddressSpaceMap(),
>                                                          sizeof(address_spaces));
>  
> +#if HAVE_LLVM >= 0x0306
> +      return act.takeModule().get();

You probably want to call .release() instead and deallocate it manually
later on, otherwise the module will be destroyed here before the end of
the function.

Thanks.

> +#else
>        return act.takeModule();
> +#endif
>     }
>  
>     void
> -- 
> 2.1.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 212 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20140820/19cfe222/attachment.sig>


More information about the mesa-dev mailing list