@@ -330,13 +330,13 @@ VariableAnnotator::AnnotateStructured(Instruction &inst, Target &target,
330330
331331 // If we lost module context, mark all live variables as undefined.
332332 if (!module_sp) {
333- for (const auto &KV : Live_ ) {
333+ for (const auto &KV : m_live_vars ) {
334334 auto annotation_entity = KV.second ;
335335 annotation_entity.is_live = false ;
336336 annotation_entity.location_description = kUndefLocation ;
337337 annotations.push_back (annotation_entity);
338338 }
339- Live_ .clear ();
339+ m_live_vars .clear ();
340340 return annotations;
341341 }
342342
@@ -347,13 +347,13 @@ VariableAnnotator::AnnotateStructured(Instruction &inst, Target &target,
347347 if (!module_sp->ResolveSymbolContextForAddress (iaddr, mask, sc) ||
348348 !sc.function ) {
349349 // No function context: everything dies here.
350- for (const auto &KV : Live_ ) {
350+ for (const auto &KV : m_live_vars ) {
351351 auto annotation_entity = KV.second ;
352352 annotation_entity.is_live = false ;
353353 annotation_entity.location_description = kUndefLocation ;
354354 annotations.push_back (annotation_entity);
355355 }
356- Live_ .clear ();
356+ m_live_vars .clear ();
357357 return annotations;
358358 }
359359
@@ -430,12 +430,12 @@ VariableAnnotator::AnnotateStructured(Instruction &inst, Target &target,
430430 decl_line, type_name});
431431 }
432432
433- // Diff Live_ → Current.
433+ // Diff m_live_vars → Current.
434434
435- // 1) Starts/changes: iterate Current and compare with Live_ .
435+ // 1) Starts/changes: iterate Current and compare with m_live_vars .
436436 for (const auto &KV : Current) {
437- auto it = Live_ .find (KV.first );
438- if (it == Live_ .end ()) {
437+ auto it = m_live_vars .find (KV.first );
438+ if (it == m_live_vars .end ()) {
439439 // Newly live.
440440 auto annotation_entity = KV.second ;
441441 annotation_entity.is_live = true ;
@@ -451,7 +451,7 @@ VariableAnnotator::AnnotateStructured(Instruction &inst, Target &target,
451451
452452 // 2) Ends: anything that was live but is not in Current becomes
453453 // <kUndefLocation>.
454- for (const auto &KV : Live_ )
454+ for (const auto &KV : m_live_vars )
455455 if (!Current.count (KV.first )) {
456456 auto annotation_entity = KV.second ;
457457 annotation_entity.is_live = false ;
@@ -460,7 +460,7 @@ VariableAnnotator::AnnotateStructured(Instruction &inst, Target &target,
460460 }
461461
462462 // Commit new state.
463- Live_ = std::move (Current);
463+ m_live_vars = std::move (Current);
464464 return annotations;
465465}
466466
0 commit comments