[Lldb-commits] [lldb] 68d964d - Revert "[lldb] Fix failure in TestStackCoreScriptedProcess on x86_64"

[Med Ismail Bennani via lldb-commits]

Author: Med Ismail Bennani
Date: 2023-06-13T13:45:59-07:00
New Revision: 68d964d02418576c7b9ecbe5e8426d9681a1d3a8

URL: https://github.com/llvm/llvm-project/commit/68d964d02418576c7b9ecbe5e8426d9681a1d3a8
DIFF: https://github.com/llvm/llvm-project/commit/68d964d02418576c7b9ecbe5e8426d9681a1d3a8.diff

LOG: Revert "[lldb] Fix failure in TestStackCoreScriptedProcess on x86_64"

This reverts commit 4177b490358432a457935ba5d6d076ae60de588f, since I
landed it by mistake.

Added: 
    

Modified: 
    lldb/include/lldb/Utility/StructuredData.h
    lldb/source/Plugins/Process/scripted/ScriptedThread.cpp
    lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py

Removed: 
    


################################################################################
diff  --git a/lldb/include/lldb/Utility/StructuredData.h b/lldb/include/lldb/Utility/StructuredData.h
index a9df052605478..d6b51f7c58c12 100644
--- a/lldb/include/lldb/Utility/StructuredData.h
+++ b/lldb/include/lldb/Utility/StructuredData.h
@@ -484,7 +484,6 @@ class StructuredData {
       }
       return success;
     }
-      
     template <class IntType>
     bool GetValueForKeyAsInteger(llvm::StringRef key, IntType &result) const {
       ObjectSP value_sp = GetValueForKey(key);

diff  --git a/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp b/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp
index 920c66f153ba4..ac707ffb21711 100644
--- a/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp
+++ b/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp
@@ -250,12 +250,10 @@ bool ScriptedThread::CalculateStopInfo() {
         StopInfo::CreateStopReasonWithBreakpointSiteID(*this, break_id);
   } break;
   case lldb::eStopReasonSignal: {
-    unsigned int signal;
+    int signal;
     llvm::StringRef description;
-    if (!data_dict->GetValueForKeyAsInteger("signal", signal)) {
-        signal = LLDB_INVALID_SIGNAL_NUMBER;
-        return false;
-    }
+    data_dict->GetValueForKeyAsInteger("signal", signal,
+                                       LLDB_INVALID_SIGNAL_NUMBER);
     data_dict->GetValueForKeyAsString("desc", description);
     stop_info_sp =
         StopInfo::CreateStopReasonWithSignal(*this, signal, description.data());

diff  --git a/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py b/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py
index 28f8630ba8611..bf9681ad678b6 100644
--- a/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py
+++ b/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py
@@ -35,6 +35,7 @@ def get_module_with_name(self, target, name):
     @skipIfOutOfTreeDebugserver
     @skipIfRemote
     @skipIfAsan  # On ASAN builds, this test times-out (rdar://98678134)
+    @skipIfDarwin
     def test_launch_scripted_process_stack_frames(self):
         """Test that we can launch an lldb scripted process from the command
         line, check its process ID and read string from memory."""