<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 13, 2015 at 3:10 PM, Adrian Prantl <span dir="ltr"><<a href="mailto:aprantl@apple.com" target="_blank">aprantl@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br>
Date: Tue Jan 13 17:10:43 2015<br>
New Revision: 225846<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=225846&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=225846&view=rev</a><br>
Log:<br>
Debug Info: Turn DIExpression::getFrameRegister() into an isFrameRegister()<br>
function.<br>
<br>
NFC.<br>
<br>
Modified:<br>
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp<br>
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp<br>
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h<br>
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp?rev=225846&r1=225845&r2=225846&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp?rev=225846&r1=225845&r2=225846&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp Tue Jan 13 17:10:43 2015<br>
@@ -46,8 +46,9 @@ void DebugLocDwarfExpression::EmitUnsign<br>
   BS.EmitULEB128(Value, Twine(Value));<br>
 }<br>
<br>
-unsigned DebugLocDwarfExpression::getFrameRegister() {<br>
- llvm_unreachable("not available");<br>
+bool DebugLocDwarfExpression::isFrameRegister(unsigned MachineReg) {<br>
+  // This information is not available while emitting .debug_loc entries.<br></blockquote><div><br>Should it be? (should we keep track of it when building the DebugLocEntries in some way?)<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+  return false;<br>
 }<br>
<br>
 //===----------------------------------------------------------------------===//<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp?rev=225846&r1=225845&r2=225846&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp?rev=225846&r1=225845&r2=225846&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp Tue Jan 13 17:10:43 2015<br>
@@ -79,7 +79,7 @@ bool DwarfExpression::AddMachineRegIndir<br>
   if (DwarfReg < 0)<br>
     return false;<br>
<br>
-  if (MachineReg == getFrameRegister()) {<br>
+  if (isFrameRegister(MachineReg)) {<br>
     // If variable offset is based in frame register then use fbreg.<br>
     EmitOp(dwarf::DW_OP_fbreg);<br>
     EmitSigned(Offset);<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h?rev=225846&r1=225845&r2=225846&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h?rev=225846&r1=225845&r2=225846&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h Tue Jan 13 17:10:43 2015<br>
@@ -40,7 +40,7 @@ public:<br>
   virtual void EmitSigned(int Value) = 0;<br>
   virtual void EmitUnsigned(unsigned Value) = 0;<br>
<br>
-  virtual unsigned getFrameRegister() = 0;<br>
+  virtual bool isFrameRegister(unsigned MachineReg) = 0;<br>
<br>
   /// Emit a dwarf register operation.<br>
   void AddReg(int DwarfReg, const char* Comment = nullptr);<br>
@@ -92,7 +92,7 @@ public:<br>
   void EmitOp(uint8_t Op, const char *Comment) override;<br>
   void EmitSigned(int Value) override;<br>
   void EmitUnsigned(unsigned Value) override;<br>
-  unsigned getFrameRegister() override;<br>
+  bool isFrameRegister(unsigned MachineReg) override;<br>
 };<br>
<br>
 }<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=225846&r1=225845&r2=225846&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=225846&r1=225845&r2=225846&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Tue Jan 13 17:10:43 2015<br>
@@ -55,7 +55,7 @@ public:<br>
   void EmitOp(uint8_t Op, const char* Comment = nullptr) override;<br>
   void EmitSigned(int Value) override;<br>
   void EmitUnsigned(unsigned Value) override;<br>
-  unsigned getFrameRegister() override;<br>
+  bool isFrameRegister(unsigned MachineReg) override;<br>
 };<br>
<br>
 void DIEDwarfExpression::EmitOp(uint8_t Op, const char* Comment) {<br>
@@ -67,8 +67,8 @@ void DIEDwarfExpression::EmitSigned(int<br>
 void DIEDwarfExpression::EmitUnsigned(unsigned Value) {<br>
   DU.addUInt(DIE, dwarf::DW_FORM_udata, Value);<br>
 }<br>
-unsigned DIEDwarfExpression::getFrameRegister() {<br>
-  return getTRI()->getFrameRegister(*AP.MF);<br>
+bool DIEDwarfExpression::isFrameRegister(unsigned MachineReg) {<br>
+  return MachineReg == getTRI()->getFrameRegister(*AP.MF);<br>
 }<br>
<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>