Re: [PATCH] perf clang: Fix build with Clang 9

From: Arnaldo Carvalho de Melo
Date: Mon Jan 06 2020 - 17:15:29 EST


Em Sat, Dec 28, 2019 at 06:13:14PM +0100, Maciej S. Szmigiero escreveu:
> LLVM D59377 (included in Clang 9) refactored Clang VFS construction a bit,
> which broke perf clang build.
> Let's fix it.
>
> Signed-off-by: Maciej S. Szmigiero <mail@xxxxxxxxxxxxxxxxxxxxx>
> Reviewed-by: Dennis Schridde <devurandom@xxxxxxx>

Thanks, applied.

- Arnaldo

> ---
> tools/perf/util/c++/clang.cpp | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp
> index fc361c3f8570..c8885dfa3667 100644
> --- a/tools/perf/util/c++/clang.cpp
> +++ b/tools/perf/util/c++/clang.cpp
> @@ -71,7 +71,11 @@ getModuleFromSource(llvm::opt::ArgStringList CFlags,
> CompilerInstance Clang;
> Clang.createDiagnostics();
>
> +#if CLANG_VERSION_MAJOR < 9
> Clang.setVirtualFileSystem(&*VFS);
> +#else
> + Clang.createFileManager(&*VFS);
> +#endif
>
> #if CLANG_VERSION_MAJOR < 4
> IntrusiveRefCntPtr<CompilerInvocation> CI =

--

- Arnaldo