[MCTargetAsmParser] Move the member varialbes that reference

[oota-llvm.git] / lib / Target / Hexagon / AsmParser / HexagonAsmParser.cpp

diff --git a/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp b/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
index 3b64ad7cbff2edd389ac22ebc58a8d2fadf8d086..9fccd9afe52365f9f99ac8444f119dde56e89ed8 100644 (file)
--- a/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
+++ b/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
@@ -76,7 +76,6 @@ class HexagonAsmParser : public MCTargetAsmParser {
     return static_cast<HexagonTargetStreamer &>(TS);
   }
 
-  MCSubtargetInfo &STI;
   MCAsmParser &Parser;
   MCAssembler *Assembler;
   MCInstrInfo const &MCII;
@@ -136,10 +135,9 @@ class HexagonAsmParser : public MCTargetAsmParser {
 public:
   HexagonAsmParser(MCSubtargetInfo &_STI, MCAsmParser &_Parser,
                    const MCInstrInfo &MII, const MCTargetOptions &Options)
-    : MCTargetAsmParser(Options), STI(_STI), Parser(_Parser),
+    : MCTargetAsmParser(Options, _STI), Parser(_Parser),
       MCII (MII), MCB(HexagonMCInstrInfo::createBundle()), InBrackets(false) {
-  setAvailableFeatures(
-    ComputeAvailableFeatures(_STI.getFeatureBits()));
+    setAvailableFeatures(ComputeAvailableFeatures(getSTI().getFeatureBits()));
 
   MCAsmParserExtension::Initialize(_Parser);
 
@@ -627,10 +625,11 @@ bool HexagonAsmParser::finishBundle(SMLoc IDLoc, MCStreamer &Out) {
 
   // Check the bundle for errors.
   const MCRegisterInfo *RI = getContext().getRegisterInfo();
-  HexagonMCChecker Check(MCII, STI, MCB, MCB, *RI);
+  HexagonMCChecker Check(MCII, getSTI(), MCB, MCB, *RI);
 
-  bool CheckOk = HexagonMCInstrInfo::canonicalizePacket(MCII, STI, getContext(),
-                                                        MCB, &Check);
+  bool CheckOk = HexagonMCInstrInfo::canonicalizePacket(MCII, getSTI(),
+                                                        getContext(), MCB,
+                                                        &Check);
 
   while (Check.getNextErrInfo() == true) {
     unsigned Reg = Check.getErrRegister();
@@ -715,7 +714,7 @@ bool HexagonAsmParser::finishBundle(SMLoc IDLoc, MCStreamer &Out) {
       // Empty packets are valid yet aren't emitted
       return false;
     }
-    Out.EmitInstruction(MCB, STI);
+    Out.EmitInstruction(MCB, getSTI());
   } else {
     // If compounding and duplexing didn't reduce the size below
     // 4 or less we have a packet that is too big.