maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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.

llvm-svn: 373194
This commit is contained in:
Raphael Isemann 2019-09-30 09:00:23 +00:00
parent e7714fe7bf
commit 5a039d5571
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/packages/Python/lldbsuite/test/commands/frame/select/TestFrameSelect.py
View File

@ -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 -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 -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 1", substrs=["nested2() at"])
self.expect("frame select -r -2", substrs=["nested3() at"]) self.expect("frame select -r -2", substrs=["nested3() at"])
self.expect("frame select -r 1", substrs=["nested2() at"]) self.expect("frame select -r 1", substrs=["nested2() at"])
self.expect("frame select -r -2147483647", substrs=["nested3() at"]) self.expect("frame select -r -2147483647", substrs=["nested3() at"])
self.expect("frame select -r 1", substrs=["nested2() 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 100")
self.expect("frame select -r 1", error=True, substrs=["Already at the top of the stack."]) self.expect("frame select -r 1", error=True, substrs=["Already at the top of the stack."])

32
lldb/source/Commands/CommandObjectFrame.cpp
View File

@ -246,15 +246,13 @@ public:
Status error; Status error;
const int short_option = m_getopt_table[option_idx].val; const int short_option = m_getopt_table[option_idx].val;
switch (short_option) { switch (short_option) {
case 'r': { case 'r':
int32_t offset = 0; if (option_arg.getAsInteger(0, relative_frame_offset)) {
if (option_arg.getAsInteger(0, offset) || offset == INT32_MIN) { relative_frame_offset = INT32_MIN;
error.SetErrorStringWithFormat("invalid frame offset argument '%s'", error.SetErrorStringWithFormat("invalid frame offset argument '%s'",
option_arg.str().c_str()); option_arg.str().c_str());
} else }
relative_frame_offset = offset;
break; break;
}
default: default:
llvm_unreachable("Unimplemented option"); llvm_unreachable("Unimplemented option");
@ -263,13 +261,15 @@ public:
return error; return error;
} }
void OptionParsingStarting(ExecutionContext *execution_context) override {} void OptionParsingStarting(ExecutionContext *execution_context) override {
relative_frame_offset = INT32_MIN;
}
llvm::ArrayRef<OptionDefinition> GetDefinitions() override { llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
return llvm::makeArrayRef(g_frame_select_options); return llvm::makeArrayRef(g_frame_select_options);
} }
llvm::Optional<int32_t> relative_frame_offset; int32_t relative_frame_offset;
}; };
CommandObjectFrameSelect(CommandInterpreter &interpreter) CommandObjectFrameSelect(CommandInterpreter &interpreter)
@ -307,15 +307,15 @@ protected:
Thread *thread = m_exe_ctx.GetThreadPtr(); Thread *thread = m_exe_ctx.GetThreadPtr();
uint32_t frame_idx = UINT32_MAX; 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 // The one and only argument is a signed relative frame index
frame_idx = thread->GetSelectedFrameIndex(); frame_idx = thread->GetSelectedFrameIndex();
if (frame_idx == UINT32_MAX) if (frame_idx == UINT32_MAX)
frame_idx = 0; frame_idx = 0;
if (*m_options.relative_frame_offset < 0) { if (m_options.relative_frame_offset < 0) {
if (static_cast<int32_t>(frame_idx) >= -*m_options.relative_frame_offset) if (static_cast<int32_t>(frame_idx) >= -m_options.relative_frame_offset)
frame_idx += *m_options.relative_frame_offset; frame_idx += m_options.relative_frame_offset;
else { else {
if (frame_idx == 0) { if (frame_idx == 0) {
// If you are already at the bottom of the stack, then just warn // If you are already at the bottom of the stack, then just warn
@ -326,15 +326,15 @@ protected:
} else } else
frame_idx = 0; 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 // I don't want "up 20" where "20" takes you past the top of the stack
// to produce // to produce
// an error, but rather to just go to the top. So I have to count the // an error, but rather to just go to the top. So I have to count the
// stack here... // stack here...
const uint32_t num_frames = thread->GetStackFrameCount(); const uint32_t num_frames = thread->GetStackFrameCount();
if (static_cast<int32_t>(num_frames - frame_idx) > if (static_cast<int32_t>(num_frames - frame_idx) >
*m_options.relative_frame_offset) m_options.relative_frame_offset)
frame_idx += *m_options.relative_frame_offset; frame_idx += m_options.relative_frame_offset;
else { else {
if (frame_idx == num_frames - 1) { if (frame_idx == num_frames - 1) {
// If we are already at the top of the stack, just warn and don't // If we are already at the top of the stack, just warn and don't