@@ -2400,17 +2400,17 @@ static void collectHwModesReferencedForEncodings(
2400
2400
NamespacesHwModesMap &NamespacesWithHwModes) {
2401
2401
SmallBitVector BV (HWM.getNumModeIds ());
2402
2402
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" )) {
2405
2405
std::string DecoderNamespace =
2406
- P. second ->getValueAsString (" DecoderNamespace" ).str ();
2407
- if (P. first == DefaultMode) {
2406
+ EncodingDef ->getValueAsString (" DecoderNamespace" ).str ();
2407
+ if (HwModeID == DefaultMode) {
2408
2408
NamespacesWithHwModes[DecoderNamespace].insert (" " );
2409
2409
} else {
2410
2410
NamespacesWithHwModes[DecoderNamespace].insert (
2411
- HWM.getMode (P. first ).Name );
2411
+ HWM.getMode (HwModeID ).Name );
2412
2412
}
2413
- BV.set (P. first );
2413
+ BV.set (HwModeID );
2414
2414
}
2415
2415
}
2416
2416
}
@@ -2494,13 +2494,13 @@ namespace {
2494
2494
const Record *InstDef = NumberedInstruction->TheDef ;
2495
2495
if (const Record *RV = InstDef->getValueAsOptionalDef (" EncodingInfos" )) {
2496
2496
EncodingInfoByHwMode EBM (RV, HWM);
2497
- for (auto &[ModeId, Encoding ] : EBM) {
2497
+ for (auto [HwModeID, EncodingDef ] : EBM) {
2498
2498
// 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, " " );
2501
2501
} else {
2502
- NumberedEncodings.emplace_back (Encoding , NumberedInstruction,
2503
- HWM.getMode (ModeId ).Name );
2502
+ NumberedEncodings.emplace_back (EncodingDef , NumberedInstruction,
2503
+ HWM.getMode (HwModeID ).Name );
2504
2504
}
2505
2505
}
2506
2506
continue ;
0 commit comments