diff --git a/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp b/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp
index 2c222b39b137..bbcecabf761e 100644
--- a/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp
+++ b/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp
@@ -1224,7 +1224,8 @@ bool FixedLenDecoderEmitter::populateInstruction(const CodeGenInstruction &CGI,
   if (Bits.allInComplete()) return false;
 
   // Ignore "asm parser only" instructions.
-  if (Def.getValueAsBit("isAsmParserOnly"))
+  if (Def.getValueAsBit("isAsmParserOnly") ||
+      Def.getValueAsBit("isCodeGenOnly"))
     return false;
 
   std::vector<OperandInfo> InsnOperands;