From 255d6c9fe5a7577c6caf78004034f2555bd0cba0 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 4 Jul 2022 21:20:19 +0200 Subject: Merge llvm-project main llvmorg-15-init-15358-g53dc0f10787 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-15-init-15358-g53dc0f10787. PR: 265425 MFC after: 2 weeks (cherry picked from commit 81ad626541db97eb356e2c1d4a20eb2a26a766ab) --- .../RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp') diff --git a/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp b/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp index c990c733d24c..7078c059adc7 100644 --- a/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp +++ b/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp @@ -22,6 +22,7 @@ #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" +#include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "RenderScriptExpressionOpts.h" @@ -77,8 +78,7 @@ static bool registerRSDefaultTargetOpts(clang::TargetOptions &proto, bool RenderScriptRuntimeModulePass::runOnModule(llvm::Module &module) { bool changed_module = false; - Log *log( - GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE | LIBLLDB_LOG_EXPRESSIONS)); + Log *log = GetLog(LLDBLog::Language | LLDBLog::Expressions); std::string err; llvm::StringRef real_triple = -- cgit v1.2.3