Replaced two instances of std::function with auto.

Thanks to Zachary Turner for the suggestion.  It's distasteful that the actual
type of the lambda can't be spelled out, but it should be evident from the
definition of the lambda body.

llvm-svn: 281536

2 files changed, 6 insertions, 8 deletions

diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp
index 07bdca4ecc3..71abadd22d4 100644
--- a/lldb/source/Expression/DWARFExpression.cpp
+++ b/lldb/source/Expression/DWARFExpression.cpp
@@ -3335,10 +3335,9 @@ bool DWARFExpression::MatchesOperand(StackFrame &frame,
       return false;
     }
 
-    std::function<bool(const Instruction::Operand &)> recurse =
-        [&frame, fb_expr](const Instruction::Operand &child) {
-          return fb_expr->MatchesOperand(frame, child);
-        };
+    auto recurse = [&frame, fb_expr](const Instruction::Operand &child) {
+      return fb_expr->MatchesOperand(frame, child);
+    };
 
     if (!offset &&
         MatchUnaryOp(MatchOpType(Instruction::Operand::Type::Dereference),
diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp
index eb49724b9ec..570464b941c 100644
--- a/lldb/source/Target/StackFrame.cpp
+++ b/lldb/source/Target/StackFrame.cpp
@@ -1608,10 +1608,9 @@ lldb::ValueObjectSP DoGuessValueAt(StackFrame &frame, ConstString reg,
     }
 
     Instruction::Operand *origin_operand = nullptr;
-    std::function<bool(const Instruction::Operand &)> clobbered_reg_matcher =
-        [reg_info](const Instruction::Operand &op) {
-          return MatchRegOp(*reg_info)(op) && op.m_clobbered;
-        };
+    auto clobbered_reg_matcher = [reg_info](const Instruction::Operand &op) {
+      return MatchRegOp(*reg_info)(op) && op.m_clobbered;
+    };
 
     if (clobbered_reg_matcher(operands[0])) {
       origin_operand = &operands[1];