Rebased PNaCl localmods in LLVM to 223109

lib/Target/X86/X86AsmPrinter.h

Index: lib/Target/X86/X86AsmPrinter.h
diff --git a/lib/Target/X86/X86AsmPrinter.h b/lib/Target/X86/X86AsmPrinter.h
index 748b948d212f85a9bb764d3efe9cb6e95ea63b36..74213cd952aba92e6e36d0dfaa22dec6950d791e 100644
--- a/lib/Target/X86/X86AsmPrinter.h
+++ b/lib/Target/X86/X86AsmPrinter.h
@@ -102,6 +102,13 @@ class LLVM_LIBRARY_VISIBILITY X86AsmPrinter : public AsmPrinter {
 
   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());
   }
@@ -117,7 +124,14 @@ class LLVM_LIBRARY_VISIBILITY X86AsmPrinter : public AsmPrinter {
   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);
   }