@@ -2400,17 +2400,17 @@ static void collectHwModesReferencedForEncodings(
24002400 NamespacesHwModesMap &NamespacesWithHwModes) {
24012401 SmallBitVector BV (HWM.getNumModeIds ());
24022402 for (const auto &MS : HWM.getHwModeSelects ()) {
2403- for (const HwModeSelect::PairType &P : MS.second .Items ) {
2404- if (P. second ->isSubClassOf (" InstructionEncoding" )) {
2403+ for (auto [HwModeID, EncodingDef] : MS.second .Items ) {
2404+ if (EncodingDef ->isSubClassOf (" InstructionEncoding" )) {
24052405 std::string DecoderNamespace =
2406- P. second ->getValueAsString (" DecoderNamespace" ).str ();
2407- if (P. first == DefaultMode) {
2406+ EncodingDef ->getValueAsString (" DecoderNamespace" ).str ();
2407+ if (HwModeID == DefaultMode) {
24082408 NamespacesWithHwModes[DecoderNamespace].insert (" " );
24092409 } else {
24102410 NamespacesWithHwModes[DecoderNamespace].insert (
2411- HWM.getMode (P. first ).Name );
2411+ HWM.getMode (HwModeID ).Name );
24122412 }
2413- BV.set (P. first );
2413+ BV.set (HwModeID );
24142414 }
24152415 }
24162416 }
@@ -2494,13 +2494,13 @@ namespace {
24942494 const Record *InstDef = NumberedInstruction->TheDef ;
24952495 if (const Record *RV = InstDef->getValueAsOptionalDef (" EncodingInfos" )) {
24962496 EncodingInfoByHwMode EBM (RV, HWM);
2497- for (auto &[ModeId, Encoding ] : EBM) {
2497+ for (auto [HwModeID, EncodingDef ] : EBM) {
24982498 // DecoderTables with DefaultMode should not have any suffix.
2499- if (ModeId == DefaultMode) {
2500- NumberedEncodings.emplace_back (Encoding , NumberedInstruction, " " );
2499+ if (HwModeID == DefaultMode) {
2500+ NumberedEncodings.emplace_back (EncodingDef , NumberedInstruction, " " );
25012501 } else {
2502- NumberedEncodings.emplace_back (Encoding , NumberedInstruction,
2503- HWM.getMode (ModeId ).Name );
2502+ NumberedEncodings.emplace_back (EncodingDef , NumberedInstruction,
2503+ HWM.getMode (HwModeID ).Name );
25042504 }
25052505 }
25062506 continue ;
0 commit comments