diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp
index 219619ec31d0..813d983538b4 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.cpp
+++ b/llvm/lib/Target/X86/X86InstrInfo.cpp
@@ -18,11 +18,19 @@
 // descriptors
 //
 static const MachineInstrDescriptor X86Insts[] = {
-#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS, IMPDEFS, IMPUSES)   \
+#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS, IMPUSES, IMPDEFS)   \
              { NAME,                    \
                -1, /* Always vararg */  \
                ((TSFLAGS) & X86II::Void) ? -1 : 0,  /* Result is in 0 */ \
-               0, false, 0, 0, TSFLAGS, FLAGS, TSFLAGS, IMPDEFS, IMPUSES },
+               0,                                   /* maxImmedConst field */\
+               false,                               /* immedIsSignExtended */\
+               0,                                   /* numDelaySlots */\
+               0,                                   /* latency */\
+               0,                                   /* schedClass */\
+               FLAGS,                               /* Flags */\
+               TSFLAGS,                             /* TSFlags */\
+               IMPUSES,                             /* ImplicitUses */\
+               IMPDEFS },                           /* ImplicitDefs */
 #include "X86InstrInfo.def"
 };