[Lldb-commits] [lldb] r373194 - [lldb] Partly revert 370734: Test 'frame select -r' and fix that INT32_MIN breaks the option parser
Raphael Isemann via lldb-commits
lldb-commits at lists.llvm.org
Mon Sep 30 02:00:23 PDT 2019
Author: teemperor
Date: Mon Sep 30 02:00:23 2019
New Revision: 373194
URL: http://llvm.org/viewvc/llvm-project?rev=373194&view=rev
Log:
[lldb] Partly revert 370734: Test 'frame select -r' and fix that INT32_MIN breaks the option parser
This somehow caused that 'frame select X' ends up being interpreted as 'frame select -r 1' when 'up' or 'down'
were run before 'frame select X'. See rdar://55791276.
Partly reverting to unbreak master. The changes that aren't reverted are the generic 'frame select -r' tests
that are obviously NFC and test existing behavior.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/commands/frame/select/TestFrameSelect.py
lldb/trunk/source/Commands/CommandObjectFrame.cpp
Modified: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/select/TestFrameSelect.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/commands/frame/select/TestFrameSelect.py?rev=373194&r1=373193&r2=373194&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/select/TestFrameSelect.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/select/TestFrameSelect.py Mon Sep 30 02:00:23 2019
@@ -23,16 +23,12 @@ class TestFrameSelect(TestBase):
self.expect("frame select -r -1", error=True, substrs=["Already at the bottom of the stack."])
self.expect("frame select -r -2147483647", error=True, substrs=["Already at the bottom of the stack."])
- self.expect("frame select -r -2147483648", error=True, substrs=["error: invalid frame offset argument '-2147483648'"])
- self.expect("frame select -r -2147483649", error=True, substrs=["error: invalid frame offset argument '-2147483649'"])
self.expect("frame select -r 1", substrs=["nested2() at"])
self.expect("frame select -r -2", substrs=["nested3() at"])
self.expect("frame select -r 1", substrs=["nested2() at"])
self.expect("frame select -r -2147483647", substrs=["nested3() at"])
self.expect("frame select -r 1", substrs=["nested2() at"])
- self.expect("frame select -r -2147483648", error=True, substrs=["error: invalid frame offset argument '-2147483648'"])
- self.expect("frame select -r -2147483649", error=True, substrs=["error: invalid frame offset argument '-2147483649'"])
self.expect("frame select -r 100")
self.expect("frame select -r 1", error=True, substrs=["Already at the top of the stack."])
Modified: lldb/trunk/source/Commands/CommandObjectFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectFrame.cpp?rev=373194&r1=373193&r2=373194&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectFrame.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectFrame.cpp Mon Sep 30 02:00:23 2019
@@ -246,15 +246,13 @@ public:
Status error;
const int short_option = m_getopt_table[option_idx].val;
switch (short_option) {
- case 'r': {
- int32_t offset = 0;
- if (option_arg.getAsInteger(0, offset) || offset == INT32_MIN) {
+ case 'r':
+ if (option_arg.getAsInteger(0, relative_frame_offset)) {
+ relative_frame_offset = INT32_MIN;
error.SetErrorStringWithFormat("invalid frame offset argument '%s'",
option_arg.str().c_str());
- } else
- relative_frame_offset = offset;
+ }
break;
- }
default:
llvm_unreachable("Unimplemented option");
@@ -263,13 +261,15 @@ public:
return error;
}
- void OptionParsingStarting(ExecutionContext *execution_context) override {}
-
+ void OptionParsingStarting(ExecutionContext *execution_context) override {
+ relative_frame_offset = INT32_MIN;
+ }
+
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
return llvm::makeArrayRef(g_frame_select_options);
}
- llvm::Optional<int32_t> relative_frame_offset;
+ int32_t relative_frame_offset;
};
CommandObjectFrameSelect(CommandInterpreter &interpreter)
@@ -307,15 +307,15 @@ protected:
Thread *thread = m_exe_ctx.GetThreadPtr();
uint32_t frame_idx = UINT32_MAX;
- if (m_options.relative_frame_offset.hasValue()) {
+ if (m_options.relative_frame_offset != INT32_MIN) {
// The one and only argument is a signed relative frame index
frame_idx = thread->GetSelectedFrameIndex();
if (frame_idx == UINT32_MAX)
frame_idx = 0;
- if (*m_options.relative_frame_offset < 0) {
- if (static_cast<int32_t>(frame_idx) >= -*m_options.relative_frame_offset)
- frame_idx += *m_options.relative_frame_offset;
+ if (m_options.relative_frame_offset < 0) {
+ if (static_cast<int32_t>(frame_idx) >= -m_options.relative_frame_offset)
+ frame_idx += m_options.relative_frame_offset;
else {
if (frame_idx == 0) {
// If you are already at the bottom of the stack, then just warn
@@ -326,15 +326,15 @@ protected:
} else
frame_idx = 0;
}
- } else if (*m_options.relative_frame_offset > 0) {
+ } else if (m_options.relative_frame_offset > 0) {
// I don't want "up 20" where "20" takes you past the top of the stack
// to produce
// an error, but rather to just go to the top. So I have to count the
// stack here...
const uint32_t num_frames = thread->GetStackFrameCount();
if (static_cast<int32_t>(num_frames - frame_idx) >
- *m_options.relative_frame_offset)
- frame_idx += *m_options.relative_frame_offset;
+ m_options.relative_frame_offset)
+ frame_idx += m_options.relative_frame_offset;
else {
if (frame_idx == num_frames - 1) {
// If we are already at the top of the stack, just warn and don't
More information about the lldb-commits
mailing list