Revert r130178. It turned out to be not the optimal path to emit complex location expressions.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@130326 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index f42e628..d830e97 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -750,8 +750,7 @@
 }
 
 /// EmitDwarfRegOp - Emit dwarf register operation.
-void AsmPrinter::EmitDwarfRegOp(const MachineLocation &MLoc,
-                                unsigned ExtraExprSize) const {
+void AsmPrinter::EmitDwarfRegOp(const MachineLocation &MLoc) const {
   const TargetRegisterInfo *RI = TM.getRegisterInfo();
   unsigned Reg = RI->getDwarfRegNum(MLoc.getReg(), false);
   if (int Offset =  MLoc.getOffset()) {
@@ -759,7 +758,7 @@
     // use DW_OP_fbreg.
     unsigned OffsetSize = Offset ? MCAsmInfo::getSLEB128Size(Offset) : 1;
     OutStreamer.AddComment("Loc expr size");
-    EmitInt16(1 + OffsetSize + ExtraExprSize);
+    EmitInt16(1 + OffsetSize);
     OutStreamer.AddComment(
       dwarf::OperationEncodingString(dwarf::DW_OP_fbreg));
     EmitInt8(dwarf::DW_OP_fbreg);
@@ -774,7 +773,7 @@
       EmitInt8(dwarf::DW_OP_reg0 + Reg);
     } else {
       OutStreamer.AddComment("Loc expr size");
-      EmitInt16(1 + MCAsmInfo::getULEB128Size(Reg) + ExtraExprSize);
+      EmitInt16(1 + MCAsmInfo::getULEB128Size(Reg));
       OutStreamer.AddComment(
         dwarf::OperationEncodingString(dwarf::DW_OP_regx));
       EmitInt8(dwarf::DW_OP_regx);