From e4a778052e98c6d67f601342a7ca3b3c52ce7fbd Mon Sep 17 00:00:00 2001 From: Med Ismail Bennani Date: Tue, 31 Mar 2020 17:44:17 +0200 Subject: [PATCH] Revert "[lldb/DWARF] Fix evaluator crash when accessing empty stack." This reverts commit e26eece1e2e7d7e6fbadb1207afef9b6353b5330. --- lldb/source/Expression/DWARFExpression.cpp | 6 ------ lldb/unittests/Expression/DWARFExpressionTest.cpp | 4 ---- 2 files changed, 10 deletions(-) diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp index 04fbfcc..7f12d06 100644 --- a/lldb/source/Expression/DWARFExpression.cpp +++ b/lldb/source/Expression/DWARFExpression.cpp @@ -2318,12 +2318,6 @@ bool DWARFExpression::Evaluate( // rather is a constant value. The value from the top of the stack is the // value to be used. This is the actual object value and not the location. case DW_OP_stack_value: - if (stack.empty()) { - if (error_ptr) - error_ptr->SetErrorString( - "Expression stack needs at least 1 item for DW_OP_stack_value."); - return false; - } stack.back().SetValueType(Value::eValueTypeScalar); break; diff --git a/lldb/unittests/Expression/DWARFExpressionTest.cpp b/lldb/unittests/Expression/DWARFExpressionTest.cpp index 4c42819..64755a9 100644 --- a/lldb/unittests/Expression/DWARFExpressionTest.cpp +++ b/lldb/unittests/Expression/DWARFExpressionTest.cpp @@ -234,10 +234,6 @@ TEST(DWARFExpression, DW_OP_convert) { llvm::Failed()); } -TEST(DWARFExpression, DW_OP_stack_value) { - EXPECT_THAT_EXPECTED(Evaluate({DW_OP_stack_value}), llvm::Failed()); -} - TEST(DWARFExpression, DW_OP_piece) { EXPECT_THAT_EXPECTED(Evaluate({DW_OP_const2u, 0x11, 0x22, DW_OP_piece, 2, DW_OP_const2u, 0x33, 0x44, DW_OP_piece, 2}), -- 2.7.4