Fix a bug related to constant islands for Mips16 and mips16/32 dual mode.

The determination of when we are doing constant pools was being made too
early in the asm printer.

llvm-svn: 195781

1 files changed, 2 insertions, 3 deletions

diff --git a/llvm/lib/Target/Mips/MipsAsmPrinter.h b/llvm/lib/Target/Mips/MipsAsmPrinter.h
index 11c6acd208d..b3060ad9306 100644
--- a/llvm/lib/Target/Mips/MipsAsmPrinter.h
+++ b/llvm/lib/Target/Mips/MipsAsmPrinter.h
@@ -50,7 +50,6 @@ private:
   /// pool entries so we can properly mark them as data regions.
   bool InConstantPool;
 
-  bool UsingConstantPools;
 
 public:
 
@@ -62,8 +61,6 @@ public:
     : AsmPrinter(TM, Streamer), MCP(0), InConstantPool(false),
       MCInstLowering(*this) {
     Subtarget = &TM.getSubtarget<MipsSubtarget>();
-    UsingConstantPools =
-      (Subtarget->inMips16Mode() && Subtarget->useConstantIslands());
   }
 
   virtual const char *getPassName() const {
@@ -73,6 +70,8 @@ public:
   virtual bool runOnMachineFunction(MachineFunction &MF);
 
   virtual void EmitConstantPool() LLVM_OVERRIDE {
+    bool UsingConstantPools =
+      (Subtarget->inMips16Mode() && Subtarget->useConstantIslands());
     if (!UsingConstantPools)
       AsmPrinter::EmitConstantPool();
     // we emit constant pools customly!