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

[lldb][NFC] Delete the original UserExpression before trying to reparse it with FixIts. 

Currently when an expression fails to parse and we have a FixIt, we keep
the failed UserExpression around while trying to parse the expression with
applied fixits. This means that we have this rather confusing control flow:

1. Original expression created and parsing attempted.
2. Expression with applied FixIts is created and parsing attempted.
3. Original expression is destroyed and parser deconstructed.
4. Expression with applied FixIts is destroyed and parser deconstructed.

This patch just deletes the original expression so that step 2 and 3 are
swapped and the whole process looks more like just sequentially parsing two
expressions (which is what we actually do here).

Doesn't fix anything just makes the code less fragile.
This commit is contained in:
Raphael Isemann 2020-03-19 17:40:53 +01:00
parent 5ade17e0ca
commit 50f1985353
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/source/Expression/UserExpression.cpp
View File

@ -259,6 +259,10 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
// If there is a fixed expression, try to parse it: // If there is a fixed expression, try to parse it:
if (!parse_success) { if (!parse_success) {
// Delete the expression that failed to parse before attempting to parse
// the next expression.
user_expression_sp.reset();
execution_results = lldb::eExpressionParseError; execution_results = lldb::eExpressionParseError;
if (fixed_expression && !fixed_expression->empty() && if (fixed_expression && !fixed_expression->empty() &&
options.GetAutoApplyFixIts()) { options.GetAutoApplyFixIts()) {