Re-commit r152202 hopefully fixing the MSVC linker error.

Original commit message:
Use uint16_t to store InstrNameIndices in MCInstrInfo. Add asserts to protect all 16-bit string table offsets. Also make sure the string to offset table string is not larger than 65536 characters since larger string literals aren't portable.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152296 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 2 insertions, 2 deletions

diff --git a/include/llvm/MC/MCInstrInfo.h b/include/llvm/MC/MCInstrInfo.h
index 1d3a36c..686d438 100644
--- a/include/llvm/MC/MCInstrInfo.h
+++ b/include/llvm/MC/MCInstrInfo.h
@@ -25,14 +25,14 @@ namespace llvm {
 ///
 class MCInstrInfo {
   const MCInstrDesc *Desc;          // Raw array to allow static init'n
-  const unsigned *InstrNameIndices; // Array for name indices in InstrNameData
+  const uint16_t *InstrNameIndices; // Array for name indices in InstrNameData
   const char *InstrNameData;        // Instruction name string pool
   unsigned NumOpcodes;              // Number of entries in the desc array
 
 public:
   /// InitMCInstrInfo - Initialize MCInstrInfo, called by TableGen
   /// auto-generated routines. *DO NOT USE*.
-  void InitMCInstrInfo(const MCInstrDesc *D, const unsigned *NI, const char *ND,
+  void InitMCInstrInfo(const MCInstrDesc *D, const uint16_t *NI, const char *ND,
                        unsigned NO) {
     Desc = D;
     InstrNameIndices = NI;