From 7e2874dc93acbde89b89e353bc7e9e07fe69af20 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 18 May 2022 17:49:07 +0200 Subject: [PATCH] ac: reset LLVM command line parser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In some scenario ac_init_llvm_target may be called twice, but the LLVM library won't have been unloaded between the 2 calls, leading to a LLVM warning being printed. Example pseudo-code to trigger this for radeonsi: gbm_create_device(); eglInitialize(); eglTerminate(); gbm_device_destroy(); gbm_create_device(); eglInitialize(); eglTerminate(); gbm_device_destroy(); To avoid the warning message from LLVM, clear the command line parser state before calling LLVMParseCommandLineOptions. This might fix https://gitlab.freedesktop.org/mesa/mesa/-/issues/5960 This is done only on LLVM 12+ because it seems to break some apps on LLVM 11 (there has been some work post LLVM 11 release to refactor CommandLine.cpp, see 42f588f39c5c and the following commits). Reviewed-by: Marek Olšák Part-of: --- src/amd/llvm/ac_llvm_util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/amd/llvm/ac_llvm_util.c b/src/amd/llvm/ac_llvm_util.c index 720f2135a22..e4688933cc9 100644 --- a/src/amd/llvm/ac_llvm_util.c +++ b/src/amd/llvm/ac_llvm_util.c @@ -61,6 +61,10 @@ static void ac_init_llvm_target(void) "-structurizecfg-skip-uniform-regions", #endif }; + +#if LLVM_VERSION_MAJOR > 11 + ac_reset_llvm_command_line_parser(); +#endif LLVMParseCommandLineOptions(ARRAY_SIZE(argv), argv, NULL); }