[Lldb-commits] [lldb] Revert "[lldb] Fix incorrect logical operator in 'if' condition check (NFC)" (PR #100561)
via lldb-commits
lldb-commits at lists.llvm.org
Thu Jul 25 05:18:19 PDT 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-lldb
Author: David Spickett (DavidSpickett)
<details>
<summary>Changes</summary>
Reverts llvm/llvm-project#<!-- -->94779
Due to bot failures: https://lab.llvm.org/buildbot/#/builders/18/builds/1371
---
Full diff: https://github.com/llvm/llvm-project/pull/100561.diff
1 Files Affected:
- (modified) lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPythonInterface.h (+8-9)
``````````diff
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPythonInterface.h b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPythonInterface.h
index 2667f73516ba3..e1a3156d10afd 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPythonInterface.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPythonInterface.h
@@ -85,15 +85,14 @@ class ScriptedPythonInterface : virtual public ScriptedInterface {
bool has_class_name = !class_name.empty();
bool has_interpreter_dict =
!(llvm::StringRef(m_interpreter.GetDictionaryName()).empty());
-
- if (!has_class_name)
- return create_error("Missing script class name.");
-
- if (!has_interpreter_dict)
- return create_error("Invalid script interpreter dictionary.");
-
- if (!script_obj)
- return create_error("Missing scripting object.");
+ if (!has_class_name && !has_interpreter_dict && !script_obj) {
+ if (!has_class_name)
+ return create_error("Missing script class name.");
+ else if (!has_interpreter_dict)
+ return create_error("Invalid script interpreter dictionary.");
+ else
+ return create_error("Missing scripting object.");
+ }
Locker py_lock(&m_interpreter, Locker::AcquireLock | Locker::NoSTDIN,
Locker::FreeLock);
``````````
</details>
https://github.com/llvm/llvm-project/pull/100561
More information about the lldb-commits
mailing list