perf clang: Fix build with Clang 9
authorMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Sat, 28 Dec 2019 17:13:14 +0000 (18:13 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 14 Jan 2020 15:02:19 +0000 (12:02 -0300)
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@maciej.szmigiero.name>
Reviewed-by: Dennis Schridde <devurandom@gmx.net>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: clang-built-linux@googlegroups.com
Cc: Denis Pronin <dannftk@yandex.ru>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20191228171314.946469-2-mail@maciej.szmigiero.name
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/c++/clang.cpp

index fc361c3..c8885df 100644 (file)
@@ -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 =