@@ -911,24 +911,23 @@ void InstrInfoEmitter::run(raw_ostream &OS) {
911911 }
912912 }
913913
914- OS << " #if defined(GET_INSTRINFO_MC_DESC) || "
915- " defined(GET_INSTRINFO_CTOR_DTOR)\n " ;
916-
917- OS << " namespace llvm {\n\n " ;
918-
919- OS << " struct " << TargetName << " InstrTable {\n " ;
920- OS << " MCInstrDesc Insts[" << NumberedInstructions.size () << " ];\n " ;
921- OS << " static_assert(alignof(MCInstrDesc) >= alignof(MCOperandInfo), "
922- " \" Unwanted padding between Insts and OperandInfo\" );\n " ;
923- OS << " MCOperandInfo OperandInfo[" << OperandInfoSize << " ];\n " ;
924- OS << " static_assert(alignof(MCOperandInfo) >= alignof(MCPhysReg), "
925- " \" Unwanted padding between OperandInfo and ImplicitOps\" );\n " ;
926- OS << " MCPhysReg ImplicitOps[" << std::max (ImplicitListSize, 1U ) << " ];\n " ;
927- OS << " };\n\n " ;
928-
929- OS << " } // end namespace llvm\n " ;
930- OS << " #endif // defined(GET_INSTRINFO_MC_DESC) || "
931- " defined(GET_INSTRINFO_CTOR_DTOR)\n\n " ;
914+ {
915+ IfGuardEmitter IfGuard (
916+ OS,
917+ " defined(GET_INSTRINFO_MC_DESC) || defined(GET_INSTRINFO_CTOR_DTOR)" );
918+ NamespaceEmitter NS (OS, " llvm" );
919+
920+ OS << " struct " << TargetName << " InstrTable {\n " ;
921+ OS << " MCInstrDesc Insts[" << NumberedInstructions.size () << " ];\n " ;
922+ OS << " static_assert(alignof(MCInstrDesc) >= alignof(MCOperandInfo), "
923+ " \" Unwanted padding between Insts and OperandInfo\" );\n " ;
924+ OS << " MCOperandInfo OperandInfo[" << OperandInfoSize << " ];\n " ;
925+ OS << " static_assert(alignof(MCOperandInfo) >= alignof(MCPhysReg), "
926+ " \" Unwanted padding between OperandInfo and ImplicitOps\" );\n " ;
927+ OS << " MCPhysReg ImplicitOps[" << std::max (ImplicitListSize, 1U )
928+ << " ];\n " ;
929+ OS << " };" ;
930+ }
932931
933932 const CodeGenRegBank &RegBank = Target.getRegBank ();
934933 const CodeGenHwModes &CGH = Target.getHwModes ();
0 commit comments