Rebased PNaCl localmods in LLVM to 223109

lib/Target/X86/X86AsmPrinter.h

 //===-- X86AsmPrinter.h - X86 implementation of AsmPrinter ------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_LIB_TARGET_X86_X86ASMPRINTER_H
@@ skipping 84 matching lines @@
   }
 
   const X86Subtarget &getSubtarget() const { return *Subtarget; }
 
   void EmitStartOfAsmFile(Module &M) override;
 
   void EmitEndOfAsmFile(Module &M) override;
 
   void EmitInstruction(const MachineInstr *MI) override;
 
+  bool UseReadOnlyJumpTables() const override; // @LOCALMOD
+
+  unsigned GetTargetBasicBlockAlign() const override; // @LOCLAMOD
+
+  unsigned
+  GetTargetLabelAlign(const MachineInstr *MI) const override; //@LOCALMOD
+
   void EmitBasicBlockEnd(const MachineBasicBlock &MBB) override {
     SMShadowTracker.emitShadowPadding(OutStreamer, getSubtargetInfo());
   }
 
   bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
                        unsigned AsmVariant, const char *ExtraCode,
                        raw_ostream &OS) override;
   bool PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
                              unsigned AsmVariant, const char *ExtraCode,
                              raw_ostream &OS) override;
 
   /// \brief Return the symbol for the specified constant pool entry.
   MCSymbol *GetCPISymbol(unsigned CPID) const override;
 
   bool doInitialization(Module &M) override {
-    SMShadowTracker.reset(0);
+    // @LOCALMOD-BEGIN -- disable ShadowMapShadowTracker for NaCl for now.
+    // This requires knowing the size of instructions, and with NaCl pseudos
+    // being expanded late by the streamer, it isn't going to be counting
+    // the expanded instruction. It might not be counting the bundle padding
+    // correctly either.
+    if (!Subtarget->isTargetNaCl())
+      SMShadowTracker.reset(0);
+    // @LOCALMOD-END
     SM.reset();
     return AsmPrinter::doInitialization(M);
   }
 
   bool runOnMachineFunction(MachineFunction &F) override;
 };
 
 } // end namespace llvm
 
 #endif