Skip to content

Commit abf345c

Browse files
committed
Mark all Swift-specific changes in Breakpoint with comments. NFC
This is to facilitate identifying divergences and thus encourage upstreaming them and/or make merge conflict resolutions more obvious.
1 parent 54f6afb commit abf345c

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

lldb/source/Breakpoint/BreakpointLocation.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@ bool BreakpointLocation::ConditionSaysStop(ExecutionContext &exe_ctx,
254254
language = comp_unit->GetLanguage();
255255

256256
m_user_expression_sp.reset(GetTarget().GetUserExpressionForLanguage(
257+
// BEGIN SWIFT
257258
exe_ctx,
259+
// END SWIFT
258260
condition_text, llvm::StringRef(), language, Expression::eResultTypeAny,
259261
EvaluateExpressionOptions(), nullptr, error));
260262
if (error.Fail()) {

lldb/source/Breakpoint/BreakpointResolverFileLine.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "lldb/Core/Module.h"
1313
#include "lldb/Symbol/CompileUnit.h"
1414
#include "lldb/Symbol/Function.h"
15-
#include "lldb/Symbol/SymbolFile.h"
1615
#include "lldb/Utility/Log.h"
1716
#include "lldb/Utility/StreamString.h"
1817

lldb/source/Breakpoint/Watchpoint.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,13 @@ void Watchpoint::SetCondition(const char *condition) {
286286
} else {
287287
// Pass nullptr for expr_prefix (no translation-unit level definitions).
288288
Status error;
289+
// BEGIN SWIFT
289290
ExecutionContext exe_scope(m_target);
291+
// END SWIFT
290292
m_condition_up.reset(m_target.GetUserExpressionForLanguage(
293+
// BEGIN SWIFT
291294
exe_scope,
295+
// END SWIFT
292296
condition, llvm::StringRef(), lldb::eLanguageTypeUnknown,
293297
UserExpression::eResultTypeAny, EvaluateExpressionOptions(), nullptr,
294298
error));

0 commit comments

Comments
 (0)