Fix build

Author: BruceForstall

src/coreclr/jit/emit.h

@@ -247,6 +247,11 @@ struct insGroup
  double igPerfScore; // The PerfScore for this insGroup
 #endif
 
+#ifdef DEBUG
+ BasicBlock* lastGeneratedBlock; // The last block that generated code into this insGroup.
+ jitstd::list<BasicBlock*> igBlocks; // All the blocks that generated code into this insGroup.
+#endif
+
  UNATIVE_OFFSET igNum; // for ordering (and display) purposes
  UNATIVE_OFFSET igOffs; // offset of this group within method
  unsigned int igFuncIdx; // Which function/funclet does this belong to? (Index into Compiler::compFuncInfos array.)
@@ -349,11 +354,6 @@ struct insGroup
  return (igFlags & IGF_LOOP_ALIGN) != 0;
  }
 
-#ifdef DEBUG
- BasicBlock* lastGeneratedBlock; // The last block that generated code into this insGroup.
- jitstd::list<BasicBlock*> igBlocks; // All the blocks that generated code into this insGroup.
-#endif
-
 }; // end of struct insGroup
 
 // For AMD64 the maximum prolog/epilog size supported on the OS is 256 bytes

src/coreclr/jit/instr.cpp

@@ -92,12 +92,12 @@ const char* CodeGen::genInsDisplayName(emitter::instrDesc* id)
  instruction ins = id->idIns();
  const char* insName = genInsName(ins);
 
+#ifdef TARGET_XARCH
  const int TEMP_BUFFER_LEN = 40;
  static unsigned curBuf = 0;
  static char buf[4][TEMP_BUFFER_LEN];
  const char* retbuf;
 
-#ifdef TARGET_XARCH
  if (GetEmitter()->IsAVXInstruction(ins) && !GetEmitter()->IsBMIInstruction(ins))
  {
  sprintf_s(buf[curBuf], TEMP_BUFFER_LEN, "v%s", insName);