[Mesa-dev] [PATCH] swr: [rasterizer jitter] fix llvm >= 5.0 build break

[Vedran Miletić]

On 03/21/2017 05:50 PM, Tim Rowley wrote:
> Function::getArgumentList() doesn't exist anymore, switch to using
> arg_begin() (existed back to at least llvm-3.6.0).
> 
> CC: <mesa-stable at lists.freedesktop.org>
> ---
>  src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp     | 2 +-
>  src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp     | 2 +-
>  src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp
> index 1c2c8df..5daeea9 100644
> --- a/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp
> +++ b/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp
> @@ -542,7 +542,7 @@ struct BlendJit : public Builder
>          IRB()->SetInsertPoint(entry);
>  
>          // arguments
> -        auto argitr = blendFunc->getArgumentList().begin();
> +        auto argitr = blendFunc->arg_begin();
>          Value* pBlendState = &*argitr++;
>          pBlendState->setName("pBlendState");
>          Value* pSrc = &*argitr++;
> diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
> index d8eb530..8fc31ae 100644
> --- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
> +++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
> @@ -99,7 +99,7 @@ Function* FetchJit::Create(const FETCH_COMPILE_STATE& fetchState)
>  
>      IRB()->SetInsertPoint(entry);
>  
> -    auto    argitr = fetch->getArgumentList().begin();
> +    auto    argitr = fetch->arg_begin();
>  
>      // Fetch shader arguments
>      mpFetchInfo = &*argitr; ++argitr;
> diff --git a/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp
> index 494d8cf..2c19321 100644
> --- a/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp
> +++ b/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp
> @@ -285,7 +285,7 @@ struct StreamOutJit : public Builder
>          IRB()->SetInsertPoint(entry);
>  
>          // arguments
> -        auto argitr = soFunc->getArgumentList().begin();
> +        auto argitr = soFunc->arg_begin();
>          Value* pSoCtx = &*argitr++;
>          pSoCtx->setName("pSoCtx");
>  
> 

Yup, that's the way to go.

Reviewed-by: Vedran Miletić <vedran at miletic.net>

-- 
Vedran Miletić
vedran.miletic.net