X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FMC%2FMCDwarf.h;h=a221d269e0d03765b493a1bb06858a0193d757b0;hb=d2c5947a4cb8e142294fabebb2a7154d41386c5e;hp=68cf5dd34bf69f83e3d12990552d8cf932e54706;hpb=1e1bf1bf76f3e851092fec95ba3f748b96174d8d;p=oota-llvm.git

diff --git a/include/llvm/MC/MCDwarf.h b/include/llvm/MC/MCDwarf.h
index 68cf5dd34bf..a221d269e0d 100644
--- a/include/llvm/MC/MCDwarf.h
+++ b/include/llvm/MC/MCDwarf.h
@@ -457,7 +457,7 @@ public:
     return Offset;
   }
 
-  const StringRef getValues() const {
+  StringRef getValues() const {
     assert(Operation == OpEscape);
     return StringRef(&Values[0], Values.size());
   }
@@ -466,15 +466,15 @@ public:
 struct MCDwarfFrameInfo {
   MCDwarfFrameInfo()
       : Begin(nullptr), End(nullptr), Personality(nullptr), Lsda(nullptr),
-        Function(nullptr), Instructions(), PersonalityEncoding(),
+        Instructions(), CurrentCfaRegister(0), PersonalityEncoding(),
         LsdaEncoding(0), CompactUnwindEncoding(0), IsSignalFrame(false),
         IsSimple(false) {}
   MCSymbol *Begin;
   MCSymbol *End;
   const MCSymbol *Personality;
   const MCSymbol *Lsda;
-  const MCSymbol *Function;
   std::vector<MCCFIInstruction> Instructions;
+  unsigned CurrentCfaRegister;
   unsigned PersonalityEncoding;
   unsigned LsdaEncoding;
   uint32_t CompactUnwindEncoding;