[DWARF] Evaluate DW_OP_entry_value

[vsk]

Summary

Add support for evaluating DW_OP_entry_value. This involves parsing
DW_TAG_call_site_parameter and wiring the information through to the expression
evaluator.

rdar://54496008

[vsk]

• Clean up the test.

[aprantl]

This is very exciting!

lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values/Makefile

5

The -g should be redundant, and if we leave out -glldb (which should be the default for clang anyway) then this test in theory could also work with other compilers such as GCC (which I think implements the same option under the same -f option). I have no idea whether anyone runs such a bot, but it's still nice.

lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values/main.cpp

8

I would just drop the header for testcases.

36

Cool.

lldb/source/Expression/DWARFExpression.cpp

497

We should probably just let llvm's libDebugInfo do the printing here, but this works fine for now.

1117

The Evaluate function allows setting an Error with a message. Should we do the same thing here so we can return the error to the caller?

2856

See above, we can set error_ptr here.

lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp

62

Don't spend too much time on that, we should just use the llvm DWARFExpression iterator instead.

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

3712

DW_TAG_call_site

3752

default?

llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

795

This should also be tested inside of LLVM itself and probably should be a separate commit.

[vsk]

• Partially address review feedback.

[vsk]

TODO:

• Split out llvm change.
• Add a test to validate that lldb skips inline frames when evaluating DW_OP_entry_value.

lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values/Makefile

5

llvm entry value support requires one of -glldb or -ggdb at the moment, but -g can be dropped.

lldb/source/Expression/DWARFExpression.cpp

1117

I worry that these log messages are too specific to be meaningful to the caller. The immediate caller should be able to issue an error, however.

lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp

62

Updated the fixme.

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

3752

I don't believe any action is needed in the default case: we do not want to log or report an error.

[aprantl]

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

3752

Doesn't this trigger the switch-doesn't-cover-all-cases warning otherwise?

[vsk]

• Addressed review feedback, split out unrelated changes, and improved test coverage.

[vsk]

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

3752

No warning because dw_attr_t is a uint16_t, but it's probably simpler to avoid the switch here.

[grandinj]

lldb/include/lldb/Symbol/Function.h

258

the way this is being used seems to indicate it can be

std::vector<CallSiteParameter>

no need for unique_ptr

[vsk]

While tightening up the test case I think I found an issue with the way inlined frames are handled. I need to take a closer look.

lldb/include/lldb/Symbol/Function.h

258

That's a totally fair point. The reason I've used unique_ptr here is to save space in CallEdge in the common case, where no call site information is loaded for the function. Call site info is lazily parsed, so we'd like to take a minimal memory hit for functions that aren't in a backtrace.

Also, note that using a pointer allows for a further PointerIntPair memory optimization mentioned below.

[aprantl]

lldb/include/lldb/Symbol/Function.h

249

Out of curiosity: What's the effect of this line? It appears to have totally redundant information in it that Doxygen should already know about.

258

Can you document this decision up there?

lldb/source/Expression/DWARFExpression.cpp

1136

What does it mean if there is a null parent_frame and shouldn't we return false in that case?

2672

because...?

[vsk]

• Fix return address lookup when the immediate parent frame is inlined.
• Tighten the test so that it actually verifies that tail calls, inlining, etc. occur, instead of assuming :).
• Add/move various TODOs as pointed out by reviewers.

I'm happy with the test coverage now, and think that I've addressed all the feedback. PTAL, thanks!

lldb/include/lldb/Symbol/Function.h

249

No clue. I saw it elsewhere in this file and wanted to stick to the established format. It could be worth simplifying later, though.

258

Done. And, thanks @grandinj for pointing this out, I dug a bit more and found that we're *not* doing this in Function for the CallEdge vector, but probably should be. Added a TODO there.

lldb/source/Expression/DWARFExpression.cpp

1136

Yes, we should detect this and fail early.

2672

Actually, rejecting DW_OP_push_object_address requires no special handling. Instead we need a TODO about actually supporting it: that belongs in the Evaluate_DW_OP_entry_value.

[vsk]

lldb/include/lldb/Symbol/Function.h

258

Actually, there's no need to do this in both CallEdge and Function: edges are parsed lazily, but parameters aren't. Let's just leave a note about this in Function.

[labath]

lldb/source/Expression/DWARFExpression.cpp

497

FYI: I have a patch which does just that. I just need to make libDebugInfo not crash so easily.

[aprantl]

Looking great! I have one more question inline, but that is mostly about documenting the algorithm.

lldb/include/lldb/Symbol/Function.h

249

Let's do that in a separate NFC patch!

258

Is a SmallVector<0> (16 bytes on x86_64) smaller than a libcxx std::vector<>?

lldb/source/Expression/DWARFExpression.cpp

1199

std::find_if or something?

1236

Here the comments are not enough for me to follow why we are doing this? Could you explain it to me and then add that to the comment as well?

What would an example DW_OP_entry_value and matching call site parameter look like?

[aprantl]

lldb/source/Expression/DWARFExpression.cpp

497

Oh thanks for mentioning that! I'll stop working on mine then :-)

[vsk]

• Add a working example and some additional comments in Evaluate_DW_OP_entry_value.

lldb/include/lldb/Symbol/Function.h

258

Oh, yes.

lldb/source/Expression/DWARFExpression.cpp

1199

I tried this, but the resulting code did not look clearer to me.

1236

I added a worked-through example at the start of the function -- is that ok?

[aprantl]

Thanks, that's exactly what I was looking for!

lldb/include/lldb/Symbol/Function.h

private:
   // Member variables.
   Mangled m_mangled; ///< Mangled inlined function name (can be empty if there
                      ///is no mangled information).
   Declaration m_call_decl;
 };
 
 class Function;
 
+/// \class CallSiteParameter Function.h "lldb/Symbol/Function.h"
+///
+/// Represent the locations of a parameter at a call site, both in the caller
+/// and in the callee.
+struct CallSiteParameter {
+  DWARFExpression LocationInCallee;
+  DWARFExpression LocationInCaller;
+};
+
+using CallSiteParameterArray = std::unique_ptr<std::vector<CallSiteParameter>>;
+
 /// \class CallEdge Function.h "lldb/Symbol/Function.h"
 ///
 /// Represent a call made within a Function. This can be used to find a path
-/// in the call graph between two functions.
+/// in the call graph between two functions, or to evaluate DW_OP_entry_value.
 class CallEdge {
 public:
   /// Construct a call edge using a symbol name to identify the calling
   /// function, and a return PC within the calling function to identify a
   /// specific call site.
   ///
   /// TODO: A symbol name may not be globally unique. To disambiguate ODR
   /// conflicts, it's necessary to determine the \c Target a call edge is
   /// associated with before resolving it.
-  CallEdge(const char *symbol_name, lldb::addr_t return_pc);
+  CallEdge(const char *symbol_name, lldb::addr_t return_pc,
+           CallSiteParameterArray parameters);
 
   CallEdge(CallEdge &&) = default;
   CallEdge &operator=(CallEdge &&) = default;
 
   /// Get the callee's definition.
   ///
   /// Note that this might lazily invoke the DWARF parser.
   Function *GetCallee(ModuleList &images);
 
   /// Get the load PC address of the instruction which executes after the call
   /// returns. Returns LLDB_INVALID_ADDRESS iff this is a tail call. \p caller
   /// is the Function containing this call, and \p target is the Target which
   /// made the call.
   lldb::addr_t GetReturnPCAddress(Function &caller, Target &target) const;
 
   /// Like \ref GetReturnPCAddress, but returns an unslid function-local PC
   /// offset.
   lldb::addr_t GetUnresolvedReturnPCAddress() const { return return_pc; }
 
+  /// Get the call site parameters available at this call edge.
+  llvm::ArrayRef<CallSiteParameter> GetCallSiteParameters() const;
+
 private:
   void ParseSymbolFileAndResolve(ModuleList &images);
 
   /// Either the callee's mangled name or its definition, discriminated by
   /// \ref resolved.
   union {
     const char *symbol_name;
     Function *def;
   } lazy_callee;
 
   /// An invalid address if this is a tail call. Otherwise, the function-local
   /// PC offset. Adding this PC offset to the function's base load address
   /// gives the return PC for the call.
   lldb::addr_t return_pc;
 
+  // TODO: Use PointerIntPair to store the parameter array and the resolved
+  // flag in a single word.
+  CallSiteParameterArray parameters;
+
   /// Whether or not an attempt was made to find the callee's definition.
   bool resolved;
 
   DISALLOW_COPY_AND_ASSIGN(CallEdge);
 };
 
 /// \class Function Function.h "lldb/Symbol/Function.h"
 /// A class that describes a function.

lldb/include/lldb/Utility/Status.h

 
 namespace llvm {
 template <> struct format_provider<lldb_private::Status> {
   static void format(const lldb_private::Status &error, llvm::raw_ostream &OS,
                      llvm::StringRef Options);
 };
 }
 
+#define LLDB_ERRORF(status, fmt, ...)                                          \
+  do {                                                                         \
+    if (status) {                                                              \
+      (status)->SetErrorStringWithFormat((fmt), __VA_ARGS__);                  \
+    }                                                                          \
+  } while (0);
+
 #endif // #ifndef LLDB_UTILITY_STATUS_H

lldb/packages/Python/lldbsuite/test/decorators.py

 
 def skipUnlessPlatform(oslist):
     """Decorate the item to skip tests unless running on one of the listed platforms."""
     # This decorator cannot be ported to `skipIf` yet because it is used on entire
     # classes, which `skipIf` explicitly forbids.
     return unittest2.skipUnless(lldbplatformutil.getPlatform() in oslist,
                                 "requires one of %s" % (", ".join(oslist)))
 
+def skipUnlessArch(arch):
+    """Decorate the item to skip tests unless running on the specified architecture."""
+
+    def arch_doesnt_match(self):
+        target_arch = self.getArchitecture()
+        if arch != target_arch:
+            return "Test only runs on " + arch + ", but target arch is " + target_arch
+        return None
+
+    return skipTestIfFn(arch_doesnt_match)
 
 def skipIfTargetAndroid(bugnumber=None, api_levels=None, archs=None):
     """Decorator to skip tests when the target is Android.
 
     Arguments:
         api_levels - The API levels for which the test should be skipped. If
             it is None, then the test will be skipped for all API levels.
         arch - A sequence of architecture names specifying the architectures
def skipUnlessHasCallSiteInfo(func):
     def is_compiler_clang_with_call_site_info(self):
         compiler_path = self.getCompiler()
         compiler = os.path.basename(compiler_path)
         if not compiler.startswith("clang"):
             return "Test requires clang as compiler"
 
         f = tempfile.NamedTemporaryFile()
         cmd = "echo 'int main() {}' | " \
-              "%s -g -glldb -O1 -S -emit-llvm -x c -o %s -" % (compiler_path, f.name)
+              "%s -g -glldb -O1 -Xclang -femit-debug-entry-values -S -emit-llvm -x c -o %s -" % (compiler_path, f.name)
         if os.popen(cmd).close() is not None:
             return "Compiler can't compile with call site info enabled"
 
         with open(f.name, 'r') as ir_output_file:
             buf = ir_output_file.read()
 
         if 'DIFlagAllCallsDescribed' not in buf:
             return "Compiler did not introduce DIFlagAllCallsDescribed IR flag"

lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values/Makefile

+LEVEL = ../../../make
+CXX_SOURCES := main.cpp
+include $(LEVEL)/Makefile.rules
+CXXFLAGS += -O1 -glldb -Xclang -femit-debug-entry-values

lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values/TestEntryValsDumpLocationDescriptions1.py

+from lldbsuite.test import lldbinline
+from lldbsuite.test import decorators
+
+lldbinline.MakeInlineTest(__file__, globals(),
+        [decorators.skipUnlessDarwin,
+         decorators.skipUnlessArch('x86_64'),
+         decorators.skipUnlessHasCallSiteInfo,
+         decorators.skipIf(dwarf_version=['<', '4'])])

lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values/main.cpp

+// Note: This test requires the SysV AMD64 ABI to be in use, and requires
+// compiler support for DWARF entry values.
+
+// Inhibit dead-arg-elim by using 'x'.
+template<typename T> __attribute__((noinline)) void use(T x) {
+  asm volatile (""
+      /* Outputs */  :
+      /* Inputs */   : "g"(x)
+      /* Clobbers */ :
+  );
+}
+
+struct S1 {
+  int field1 = 123;
+  int *field2 = &field1;
+};
+
+__attribute__((noinline))
+void func1(int &sink, int x) {
+  use(x);
+
+  // Destroy 'x' in the current frame.
+  asm volatile ("xorq %%rsi, %%rsi"
+      /* Outputs */  :
+      /* Inputs */   :
+      /* Clobbers */ : "rsi"
+  );
+
+  //% self.filecheck("image lookup -va $pc", "main.cpp", "-check-prefix=FUNC1-DESC")
+  // FUNC1-DESC: name = "x", type = "int", location = DW_OP_entry_value( rsi)
+
+  ++sink;
+}
+
+__attribute__((noinline))
+void func2(int &sink, int x) {
+  use(x);
+
+  // Destroy 'x' in the current frame.
+  asm volatile ("xorq %%rsi, %%rsi"
+      /* Outputs */  :
+      /* Inputs */   :
+      /* Clobbers */ : "rsi"
+  );
+
+  //% self.filecheck("expr x", "main.cpp", "-check-prefix=FUNC2-EXPR")
+  // FUNC2-EXPR: (int) ${{.*}} = 123
+
+  ++sink;
+}
+
+__attribute__((noinline))
+void func3(int &sink, int *p) {
+  use(p);
+
+  // Destroy 'p' in the current frame.
+  asm volatile ("xorq %%rsi, %%rsi"
+      /* Outputs */  :
+      /* Inputs */   :
+      /* Clobbers */ : "rsi"
+  );
+
+  //% self.filecheck("expr *p", "main.cpp", "-check-prefix=FUNC3-EXPR")
+  // FUNC3-EXPR: (int) ${{.*}} = 123
+
+  ++sink;
+}
+
+__attribute__((noinline)) 
+void func4_amb(int &sink, int x) {
+  use(x);
+
+  // Destroy 'x' in the current frame.
+  asm volatile ("xorq %%rsi, %%rsi"
+      /* Outputs */  :
+      /* Inputs */   :
+      /* Clobbers */ : "rsi"
+  );
+
+  //% self.filecheck("expr x", "main.cpp", "-check-prefix=FUNC4-EXPR", expect_cmd_failure=True)
+  // FUNC4-EXPR: couldn't get the value of variable x: Could not evaluate DW_OP_entry_value.
+
+  ++sink;
+
+}
+
+__attribute__((noinline)) 
+void func5_amb() {}
+
+__attribute__((noinline)) 
+void func6(int &sink, int x) {
+  if (sink > 0)
+    func4_amb(sink, x); /* tail (taken) */
+  else
+    func5_amb(); /* tail */
+}
+
+__attribute__((disable_tail_calls))
+int main() {
+  int sink = 0;
+  S1 s1;
+
+  // Test location dumping for DW_OP_entry_value.
+  func1(sink, 123);
+
+  // Test evaluation of "DW_OP_constu" in the parent frame.
+  func2(sink, 123);
+
+  // Test evaluation of "DW_OP_fbreg -24, DW_OP_deref" in the parent frame.
+  func3(sink, s1.field2);
+
+  // The sequences `main -> func4 -> func{5,6}_amb -> sink` are both plausible.
+  // Test that lldb doesn't attempt to guess which one occurred: entry value
+  // evaluation should fail.
+  func6(sink, 123);
+
+  return 0;
+}

lldb/packages/Python/lldbsuite/test/lldbtest.py

def completions_match(self, command, completions):
         # match_strings is a 1-indexed list, so we have to slice...
         self.assertItemsEqual(completions, list(match_strings)[1:],
                               "List of returned completion is wrong")
 
     def filecheck(
             self,
             command,
             check_file,
-            filecheck_options = ''):
+            filecheck_options = '',
+            expect_cmd_failure = False):
         # Run the command.
         self.runCmd(
                 command,
+                check=(not expect_cmd_failure),
                 msg="FileCheck'ing result of `{0}`".format(command))
 
+        self.assertTrue((not expect_cmd_failure) == self.res.Succeeded())
+
         # Get the error text if there was an error, and the regular text if not.
         output = self.res.GetOutput() if self.res.Succeeded() \
                 else self.res.GetError()
 
         # Assemble the absolute path to the check file. As a convenience for
         # LLDB inline tests, assume that the check file is a relative path to
         # a file within the inline test directory.
         if check_file.endswith('.pyc'):

lldb/source/Expression/DWARFExpression.cpp

 #include "lldb/Symbol/Function.h"
 
 #include "lldb/Target/ABI.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/StackFrame.h"
 #include "lldb/Target/StackID.h"
+#include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
 
 #include "Plugins/SymbolFile/DWARF/DWARFUnit.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
 static lldb::addr_t

 void DWARFExpression::DumpLocation(Stream *s, lldb::offset_t offset,
                                    lldb::offset_t length,
                                    lldb::DescriptionLevel level,
                                    ABI *abi) const {
   if (!m_data.ValidOffsetForDataOfSize(offset, length))
     return;
   const lldb::offset_t start_offset = offset;
   const lldb::offset_t end_offset = offset + length;
+
+  // An operation within a DWARF expression may contain a sub-expression. The
+  // motivating example for this is DW_OP_entry_value. Keep track of where each
+  // each sub-expression ends.
+  std::vector<lldb::offset_t> ends_of_subexprs;
+
+  // "Finish" (i.e. print the closing right-parens) for sub-expressions up to
+  // the specified \p op_offset.
+  auto finish_subexpressions_to = [&](const lldb::offset_t op_offset) {
+    while (!ends_of_subexprs.empty() && op_offset >= ends_of_subexprs.back()) {
+      ends_of_subexprs.pop_back();
+      s->Printf(")");
+      if (!ends_of_subexprs.empty())
+        s->Printf(" ");
+    }
+  };
+
   while (m_data.ValidOffset(offset) && offset < end_offset) {
     const lldb::offset_t op_offset = offset;
     const uint8_t op = m_data.GetU8(&offset);
+    finish_subexpressions_to(op_offset);
 
     switch (level) {
     default:
       break;
 
     case lldb::eDescriptionLevelBrief:
       if (op_offset > start_offset)
         s->PutChar(' ');
case DW_OP_GNU_const_index: // 0xfc
                 m_data.GetULEB128(&offset));
       break;
     case DW_OP_GNU_push_tls_address:
       s->PutCString("DW_OP_GNU_push_tls_address"); // 0xe0
       break;
     case DW_OP_APPLE_uninit:
       s->PutCString("DW_OP_APPLE_uninit"); // 0xF0
       break;
+    case DW_OP_entry_value: {
+      uint32_t subexpr_len = m_data.GetULEB128(&offset);
+      s->PutCString("DW_OP_entry_value(");
+      ends_of_subexprs.push_back(offset + subexpr_len);
+      break;
     }
     }
   }
 
+  finish_subexpressions_to(end_offset);
+}
+
 void DWARFExpression::SetLocationListSlide(addr_t slide) {
   m_loclist_slide = slide;
 }
 
 int DWARFExpression::GetRegisterKind() { return m_reg_kind; }
 
 void DWARFExpression::SetRegisterKind(RegisterKind reg_kind) {
   m_reg_kind = reg_kind;
if (native_reg == LLDB_INVALID_REGNUM) {
           error_ptr->SetErrorStringWithFormat("register %s is not available",
                                               reg_info->name);
       }
     }
   }
   return false;
 }
 
+/// Return the length in bytes of the set of operands for \p op. No guarantees
+/// are made on the state of \p data after this call.
 static offset_t GetOpcodeDataSize(const DataExtractor &data,
                                   const lldb::offset_t data_offset,
                                   const uint8_t op) {
   lldb::offset_t offset = data_offset;
   switch (op) {
   case DW_OP_addr:
   case DW_OP_call_ref: // 0x9a 1 address sized offset of DIE (DWARF3)
     return data.GetAddressByteSize();
static offset_t GetOpcodeDataSize(const DataExtractor &data,
   case DW_OP_implicit_value: // 0x9e ULEB128 size followed by block of that size
                              // (DWARF4)
   {
     uint64_t block_len = data.Skip_LEB128(&offset);
     offset += block_len;
     return offset - data_offset;
   }
 
+  case DW_OP_entry_value: // 0xa3 ULEB128 size + variable-length block
+  {
+    uint64_t subexpr_len = data.GetULEB128(&offset);
+    return (offset - data_offset) + subexpr_len;
+  }
+
   default:
     break;
   }
   return LLDB_INVALID_OFFSET;
 }
 
 lldb::addr_t DWARFExpression::GetLocation_DW_OP_addr(uint32_t op_addr_idx,
                                                      bool &error) const {
if (GetLocation(base_addr, address, offset, length)) {
     if (length > 0) {
       DumpLocation(s, offset, length, level, abi);
       return true;
     }
   }
   return false;
 }
 
+static bool Evaluate_DW_OP_entry_value(std::vector<Value> &stack,
+                                       ExecutionContext *exe_ctx,
+                                       RegisterContext *reg_ctx,
+                                       const DataExtractor &opcodes,
+                                       lldb::offset_t &opcode_offset,
+                                       Status *error_ptr, Log *log) {
+  // 1. Find the function which pushed the current frame onto the stack.
+  if ((!exe_ctx || !exe_ctx->HasTargetScope()) || !reg_ctx) {
+    LLDB_LOG(log, "Evaluate_DW_OP_entry_value: no exe/reg context");
+    return false;
+  }
+
+  StackFrame *current_frame = exe_ctx->GetFramePtr();
+  Thread *thread = exe_ctx->GetThreadPtr();
+  if (!current_frame || !thread) {
+    LLDB_LOG(log, "Evaluate_DW_OP_entry_value: no current frame/thread");
+    return false;
+  }
+
+  StackFrameSP parent_frame = nullptr;
+  uint32_t current_frame_idx = current_frame->GetFrameIndex();
+  uint32_t num_frames = thread->GetStackFrameCount();
+  for (uint32_t parent_frame_idx = current_frame_idx + 1;
+       parent_frame_idx < num_frames; ++parent_frame_idx) {
+    parent_frame = thread->GetStackFrameAtIndex(parent_frame_idx);
+    // Ignore inlined frames: these have no call site parameters.
+    if (parent_frame && !parent_frame->IsInlined())
+      break;
+  }
+  if (!parent_frame || !parent_frame->GetRegisterContext()) {
+    LLDB_LOG(log, "Evaluate_DW_OP_entry_value: no parent frame with reg ctx");
+    return false;
+  }
+
+  Function *parent_func =
+      parent_frame->GetSymbolContext(eSymbolContextFunction).function;
+  if (!parent_func) {
+    LLDB_LOG(log, "Evaluate_DW_OP_entry_value: no parent function");
+    return false;
+  }
+
+  // 2. Find the call edge in the parent function responsible for creating the
+  //    current activation.
+  Target &target = exe_ctx->GetTargetRef();
+  ModuleList &modlist = target.GetImages();
+
+  Function *current_func =
+      current_frame->GetSymbolContext(eSymbolContextFunction).function;
+  if (!current_func) {
+    LLDB_LOG(log, "Evaluate_DW_OP_entry_value: no current function");
+    return false;
+  }
+
+  CallEdge *call_edge = nullptr;
+  if (!parent_frame->IsArtificial()) {
+    // If the parent frame is not artificial, the current activation may be
+    // produced by an ambiguous tail call. In this case, refuse to proceed.
+    addr_t return_pc =
+        parent_frame->GetFrameCodeAddress().GetLoadAddress(&target);
+    call_edge = parent_func->GetCallEdgeForReturnAddress(return_pc, target);
+    if (!call_edge) {
+      LLDB_LOG(log,
+               "Evaluate_DW_OP_entry_value: no call edge for retn-pc = {0:x}",
+               return_pc);
+      return false;
+    }
+    Function *callee_func = call_edge->GetCallee(modlist);
+    if (callee_func != current_func) {
+      LLDB_LOG(log, "Evaluate_DW_OP_entry_value: ambiguous call sequence, "
+                    "can't find real parent frame");
+      return false;
+    }
+  } else {
+    for (CallEdge &edge : parent_func->GetTailCallingEdges()) {
+      if (edge.GetCallee(modlist) == current_func) {
+        call_edge = &edge;
+        break;
+      }
+    }
+  }
+  if (!call_edge) {
+    LLDB_LOG(log, "Evaluate_DW_OP_entry_value: no unambiguous edge from parent "
+                  "to current function");
+    return false;
+  }
+
+  // 3. Attempt to locate the DW_OP_entry_value expression in the set of
+  //    available call site parameters. If found, evaluate the corresponding
+  //    parameter in the context of the parent frame.
+  const uint32_t subexpr_len = opcodes.GetULEB128(&opcode_offset);
+  const void *subexpr_data = opcodes.GetData(&opcode_offset, subexpr_len);
+  if (!subexpr_data) {
+    LLDB_LOG(log, "Evaluate_DW_OP_entry_value: subexpr could not be read");
+    return false;
+  }
+
+  const CallSiteParameter *matched_param = nullptr;
+  for (const CallSiteParameter &param : call_edge->GetCallSiteParameters()) {
+    DataExtractor param_subexpr_extractor;
+    if (!param.LocationInCallee.GetExpressionData(param_subexpr_extractor))
+      continue;
+    lldb::offset_t param_subexpr_offset = 0;
+    const void *param_subexpr_data =
+        param_subexpr_extractor.GetData(&param_subexpr_offset, subexpr_len);
+    if (!param_subexpr_data ||
+        param_subexpr_extractor.BytesLeft(param_subexpr_offset) != 0)
+      continue;
+
+    // At this point, the expression described by the DW_OP_entry_value and the
+    // expression in the call site parameter are known to have the same length.
+    // Check whether they are equal.
+    if (memcmp(subexpr_data, param_subexpr_data, subexpr_len) == 0) {
+      matched_param = &param;
+      break;
+    }
+  }
+  if (!matched_param) {
+    LLDB_LOG(log,
+             "Evaluate_DW_OP_entry_value: no matching call site param found");
+    return false;
+  }
+
+  Value result;
+  ExecutionContext parent_exe_ctx = *exe_ctx;
+  parent_exe_ctx.SetFrameSP(parent_frame);
+  const DWARFExpression &param_expr = matched_param->LocationInCaller;
+  if (!param_expr.Evaluate(&parent_exe_ctx,
+                           parent_frame->GetRegisterContext().get(),
+                           /*loclist_base_addr=*/LLDB_INVALID_ADDRESS,
+                           /*initial_value_ptr=*/nullptr,
+                           /*object_address_ptr=*/nullptr, result, error_ptr)) {
+    LLDB_LOG(log,
+             "Evaluate_DW_OP_entry_value: call site param evaluation failed");
+    return false;
+  }
+
+  stack.push_back(result);
+  return true;
+}
+
 bool DWARFExpression::Evaluate(ExecutionContextScope *exe_scope,
                                lldb::addr_t loclist_base_load_addr,
                                const Value *initial_value_ptr,
                                const Value *object_address_ptr, Value &result,
                                Status *error_ptr) const {
   ExecutionContext exe_ctx(exe_scope);
   return Evaluate(&exe_ctx, nullptr, loclist_base_load_addr, initial_value_ptr,
                   object_address_ptr, result, error_ptr);

     // OPERANDS: none
     // DESCRIPTION: Pushes the address of the object currently being
     // evaluated as part of evaluation of a user presented expression. This
     // object may correspond to an independent variable described by its own
     // DIE or it may be a component of an array, structure, or class whose
     // address has been dynamically determined by an earlier step during user
     // expression evaluation.
     case DW_OP_push_object_address:
+      // TODO: Reject DW_OP_push_object_address within entry value exprs.
       if (object_address_ptr)
         stack.push_back(*object_address_ptr);
       else {
         if (error_ptr)
           error_ptr->SetErrorString("DW_OP_push_object_address used without "
                                     "specifying an object address");
         return false;
       }
case DW_OP_GNU_const_index: {
                                     "compile unit being specified");
         return false;
       }
       uint64_t index = opcodes.GetULEB128(&offset);
       lldb::addr_t value = ReadAddressFromDebugAddrSection(dwarf_cu, index);
       stack.push_back(Scalar(value));
     } break;
 
+    case DW_OP_entry_value: {
+      if (!Evaluate_DW_OP_entry_value(stack, exe_ctx, reg_ctx, opcodes, offset,
+                                      error_ptr, log)) {
+        LLDB_ERRORF(error_ptr, "Could not evaluate %s.",
+                    DW_OP_value_to_name(op));
+        return false;
+      }
+      break;
+    }
+
     default:
       LLDB_LOGF(log, "Unhandled opcode %s in DWARFExpression.",
                 DW_OP_value_to_name(op));
       break;
     }
   }
 
   if (stack.empty()) {
if (opcode_class == DRC_ZEROOPERANDS)
     return true;
 
   if (opcode_class == DRC_TWOOPERANDS && opcode == DW_OP_bregx) {
     uint = data.GetULEB128(offset_ptr);
     sint = data.GetSLEB128(offset_ptr);
     s.Printf("%" PRIu64 " %" PRIi64, uint, sint);
     return true;
   }
+  if (opcode_class == DRC_TWOOPERANDS && opcode == DW_OP_entry_value) {
+    uint = data.GetULEB128(offset_ptr);
+    s.Printf("%" PRIu64 " ", uint);
+    return true;
+  }
   if (opcode_class != DRC_ONEOPERAND) {
     s.Printf("UNKNOWN OP %u", opcode);
     return false;
   }
 
   switch (opcode) {
   case DW_OP_addr:
     size = address_size;
case DW_OP_call_ref:
     size = dwarf_ref_size;
     break;
   case DW_OP_addrx:
   case DW_OP_piece:
   case DW_OP_plus_uconst:
   case DW_OP_regx:
   case DW_OP_GNU_addr_index:
   case DW_OP_GNU_const_index:
+  case DW_OP_entry_value:
     size = 128;
     break;
   default:
     s.Printf("UNKNOWN ONE-OPERAND OPCODE, #%u", opcode);
     return false;
   }
 
   switch (size) {

lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp

const char *DW_OP_value_to_name(uint32_t val) {
   if (llvmstr.empty()) {
     snprintf(invalid, sizeof(invalid), "Unknown DW_OP constant: 0x%x", val);
     return invalid;
   }
   return llvmstr.data();
 }
 
 DRC_class DW_OP_value_to_class(uint32_t val) {
+  // FIXME: If we just used llvm's DWARFExpression printer, we could delete
+  // all this code (and more in lldb's DWARFExpression.cpp).
   switch (val) {
   case 0x03:
     return DRC_ONEOPERAND;
   case 0x06:
     return DRC_ZEROOPERANDS;
   case 0x08:
     return DRC_ONEOPERAND;
   case 0x09:
DRC_class DW_OP_value_to_class(uint32_t val) {
   case 0x97:
     return DRC_DWARFv3 | DRC_ZEROOPERANDS;
   case 0x98:
     return DRC_DWARFv3 | DRC_ONEOPERAND;
   case 0x99:
     return DRC_DWARFv3 | DRC_ONEOPERAND;
   case 0x9a:
     return DRC_DWARFv3 | DRC_ONEOPERAND;
+  case 0xa3: /* DW_OP_entry_value */
+    return DRC_TWOOPERANDS;
   case 0xf0:
     return DRC_ZEROOPERANDS; /* DW_OP_APPLE_uninit */
   case 0xe0:
     return 0;
   case 0xff:
     return 0;
   default:
     return 0;

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

 //===-- SymbolFileDWARF.cpp ------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "SymbolFileDWARF.h"
 
+#include "llvm/ADT/Optional.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/Threading.h"
 
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleList.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Core/Section.h"
while (die) {
     if (parse_siblings)
       die = die.GetSibling();
     else
       die.Clear();
   }
   return vars_added;
 }
 
+/// Collect call site parameters in a DW_TAG_call_site DIE.
+static CallSiteParameterArray
+CollectCallSiteParameters(ModuleSP module, DWARFDIE call_site_die) {
+  CallSiteParameterArray parameters = nullptr;
+  for (DWARFDIE child = call_site_die.GetFirstChild(); child.IsValid();
+       child = child.GetSibling()) {
+    if (child.Tag() != DW_TAG_call_site_parameter)
+      continue;
+
+    llvm::Optional<DWARFExpression> LocationInCallee = {};
+    llvm::Optional<DWARFExpression> LocationInCaller = {};
+
+    DWARFAttributes attributes;
+    const size_t num_attributes = child.GetAttributes(attributes);
+
+    // Parse the location at index \p attr_index within this call site parameter
+    // DIE, or return None on failure.
+    auto parse_simple_location =
+        [&](int attr_index) -> llvm::Optional<DWARFExpression> {
+      DWARFFormValue form_value;
+      if (!attributes.ExtractFormValueAtIndex(attr_index, form_value))
+        return {};
+      if (!DWARFFormValue::IsBlockForm(form_value.Form()))
+        return {};
+      auto data = child.GetData();
+      uint32_t block_offset = form_value.BlockData() - data.GetDataStart();
+      uint32_t block_length = form_value.Unsigned();
+      return DWARFExpression(module,
+                             DataExtractor(data, block_offset, block_length),
+                             child.GetCU());
+    };
+
+    for (size_t i = 0; i < num_attributes; ++i) {
+      dw_attr_t attr = attributes.AttributeAtIndex(i);
+      switch (attr) {
+      case DW_AT_location:
+        LocationInCallee = parse_simple_location(i);
+        break;
+      case DW_AT_call_value:
+        LocationInCaller = parse_simple_location(i);
+        break;
+      }
+    }
+
+    if (LocationInCallee && LocationInCaller) {
+      if (!parameters)
+        parameters.reset(new std::vector<CallSiteParameter>);
+      CallSiteParameter param = {*LocationInCallee, *LocationInCaller};
+      parameters->push_back(param);
+    }
+  }
+  return parameters;
+}
+
 /// Collect call graph edges present in a function DIE.
 static std::vector<lldb_private::CallEdge>
-CollectCallEdges(DWARFDIE function_die) {
+CollectCallEdges(ModuleSP module, DWARFDIE function_die) {
   // Check if the function has a supported call site-related attribute.
   // TODO: In the future it may be worthwhile to support call_all_source_calls.
   uint64_t has_call_edges =
       function_die.GetAttributeValueAsUnsigned(DW_AT_call_all_calls, 0);
   if (!has_call_edges)
     return {};
 
   Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_STEP));
for (DWARFDIE child = function_die.GetFirstChild(); child.IsValid();
     }
 
     // Extract DW_AT_call_return_pc (the PC the call returns to) if it's
     // available. It should only ever be unavailable for tail call edges, in
     // which case use LLDB_INVALID_ADDRESS.
     addr_t return_pc = child.GetAttributeValueAsAddress(DW_AT_call_return_pc,
                                                         LLDB_INVALID_ADDRESS);
 
+    // Extract call site parameters.
+    CallSiteParameterArray parameters =
+        CollectCallSiteParameters(module, child);
+
     LLDB_LOG(log, "CollectCallEdges: Found call origin: {0} (retn-PC: {1:x})",
              call_origin.GetPubname(), return_pc);
-    call_edges.emplace_back(call_origin.GetMangledName(), return_pc);
+    if (log && parameters) {
+      for (const CallSiteParameter &param : *parameters) {
+        StreamString callee_loc_desc, caller_loc_desc;
+        param.LocationInCallee.GetDescription(&callee_loc_desc,
+                                              eDescriptionLevelBrief,
+                                              LLDB_INVALID_ADDRESS, nullptr);
+        param.LocationInCaller.GetDescription(&caller_loc_desc,
+                                              eDescriptionLevelBrief,
+                                              LLDB_INVALID_ADDRESS, nullptr);
+        LLDB_LOG(log, "CollectCallEdges: \tparam: {0} => {1}",
+                 callee_loc_desc.GetString(), caller_loc_desc.GetString());
+      }
+    }
+
+    call_edges.emplace_back(call_origin.GetMangledName(), return_pc,
+                            std::move(parameters));
   }
   return call_edges;
 }
 
 std::vector<lldb_private::CallEdge>
 SymbolFileDWARF::ParseCallEdgesInFunction(UserID func_id) {
   DWARFDIE func_die = GetDIE(func_id.GetID());
   if (func_die.IsValid())
-    return CollectCallEdges(func_die);
+    return CollectCallEdges(GetObjectFile()->GetModule(), func_die);
   return {};
 }
 
 // PluginInterface protocol
 ConstString SymbolFileDWARF::GetPluginName() { return GetPluginNameStatic(); }
 
 uint32_t SymbolFileDWARF::GetPluginVersion() { return 1; }
 

lldb/source/Symbol/Function.cpp

 
 const Mangled &InlineFunctionInfo::GetMangled() const { return m_mangled; }
 
 size_t InlineFunctionInfo::MemorySize() const {
   return FunctionInfo::MemorySize() + m_mangled.MemorySize();
 }
 
 //
-CallEdge::CallEdge(const char *symbol_name, lldb::addr_t return_pc)
-    : return_pc(return_pc), resolved(false) {
+CallEdge::CallEdge(const char *symbol_name, lldb::addr_t return_pc,
+                   CallSiteParameterArray parameters)
+    : return_pc(return_pc), parameters(std::move(parameters)), resolved(false) {
   lazy_callee.symbol_name = symbol_name;
 }
 
+llvm::ArrayRef<CallSiteParameter> CallEdge::GetCallSiteParameters() const {
+  if (parameters)
+    return *parameters.get();
+  return {};
+}
+
 void CallEdge::ParseSymbolFileAndResolve(ModuleList &images) {
   if (resolved)
     return;
 
   Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_STEP));
   LLDB_LOG(log, "CallEdge: Lazily parsing the call graph for {0}",
            lazy_callee.symbol_name);
 

llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

for (const MachineInstr &MI : MBB.instrs()) {
                                                        .getRegisterInfo()
                                                        ->getName(CallReg)))
                         << (IsTail ? " [IsTail]" : "") << "\n");
 
       DIE &CallSiteDIE =
             CU.constructCallSiteEntryDIE(ScopeDIE, CalleeSP, IsTail, PCAddr,
                                          PCOffset, CallReg);
 
-      // For now only GDB supports call site parameter debug info.
+      // For now only GDB and LLDB support call site parameter debug info.
       if (Asm->TM.Options.EnableDebugEntryValues &&
-          tuneForGDB()) {
+          (tuneForGDB() || tuneForLLDB())) {
         ParamSet Params;
         // Try to interpret values of call site parameters.
         collectCallSiteParameters(&MI, Params);
         CU.constructCallSiteParmEntryDIEs(CallSiteDIE, Params);
       }
     }
   }
 }