rnk created this revision. rnk added a reviewer: amccarth. Herald added a project: LLDB.
Three uses of try_lock intentionally ignore the result. Make that explicit with a void cast. Add what appears to be a missing return in the clang expression parser code. It's a functional change, but presumably the right one. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D70281 Files: lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp Index: lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp =================================================================== --- lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp +++ lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp @@ -166,7 +166,7 @@ Target &target = m_process->GetTarget(); std::unique_lock<std::recursive_mutex> api_lock(target.GetAPIMutex(), std::defer_lock); - api_lock.try_lock(); + (void)api_lock.try_lock(); // Ignore the result, do it anyway. auto interpreter_lock = m_interpreter->AcquireInterpreterLock(); LLDB_LOGF(log, @@ -308,7 +308,7 @@ Target &target = m_process->GetTarget(); std::unique_lock<std::recursive_mutex> api_lock(target.GetAPIMutex(), std::defer_lock); - api_lock.try_lock(); + (void)api_lock.try_lock(); // Ignore the result, do it anyway. auto interpreter_lock = m_interpreter->AcquireInterpreterLock(); Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_THREAD)); @@ -395,7 +395,7 @@ Target &target = m_process->GetTarget(); std::unique_lock<std::recursive_mutex> api_lock(target.GetAPIMutex(), std::defer_lock); - api_lock.try_lock(); + (void)api_lock.try_lock(); // Ignore the result, do it anyway. auto interpreter_lock = m_interpreter->AcquireInterpreterLock(); StructuredData::DictionarySP thread_info_dict = Index: lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h =================================================================== --- lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h +++ lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h @@ -312,7 +312,7 @@ if (m_exe_ctx.GetTargetPtr()) return m_exe_ctx.GetTargetPtr(); else if (m_sym_ctx.target_sp) - m_sym_ctx.target_sp.get(); + return m_sym_ctx.target_sp.get(); return nullptr; }
Index: lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp =================================================================== --- lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp +++ lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp @@ -166,7 +166,7 @@ Target &target = m_process->GetTarget(); std::unique_lock<std::recursive_mutex> api_lock(target.GetAPIMutex(), std::defer_lock); - api_lock.try_lock(); + (void)api_lock.try_lock(); // Ignore the result, do it anyway. auto interpreter_lock = m_interpreter->AcquireInterpreterLock(); LLDB_LOGF(log, @@ -308,7 +308,7 @@ Target &target = m_process->GetTarget(); std::unique_lock<std::recursive_mutex> api_lock(target.GetAPIMutex(), std::defer_lock); - api_lock.try_lock(); + (void)api_lock.try_lock(); // Ignore the result, do it anyway. auto interpreter_lock = m_interpreter->AcquireInterpreterLock(); Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_THREAD)); @@ -395,7 +395,7 @@ Target &target = m_process->GetTarget(); std::unique_lock<std::recursive_mutex> api_lock(target.GetAPIMutex(), std::defer_lock); - api_lock.try_lock(); + (void)api_lock.try_lock(); // Ignore the result, do it anyway. auto interpreter_lock = m_interpreter->AcquireInterpreterLock(); StructuredData::DictionarySP thread_info_dict = Index: lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h =================================================================== --- lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h +++ lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h @@ -312,7 +312,7 @@ if (m_exe_ctx.GetTargetPtr()) return m_exe_ctx.GetTargetPtr(); else if (m_sym_ctx.target_sp) - m_sym_ctx.target_sp.get(); + return m_sym_ctx.target_sp.get(); return nullptr; }
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits