@@ -655,12 +655,12 @@ static void SlowReversedCopyContainerAnnotations(uptr src_beg, uptr src_end,
655655static void CopyContainerFirstGranuleAnnotation (uptr src_beg, uptr dst_beg) {
656656 constexpr uptr granularity = ASAN_SHADOW_GRANULARITY;
657657 // First granule
658- uptr dst_external_beg = RoundDownTo (dst_beg, granularity);
659- uptr src_external_beg = RoundDownTo (src_beg, granularity);
658+ uptr dst_beg_down = RoundDownTo (dst_beg, granularity);
659+ uptr src_beg_down = RoundDownTo (src_beg, granularity);
660660 if (!AddressIsPoisoned (src_beg)) {
661- *(u8 *)MemToShadow (dst_external_beg ) = *(u8 *)MemToShadow (src_external_beg );
661+ *(u8 *)MemToShadow (dst_beg_down ) = *(u8 *)MemToShadow (src_beg_down );
662662 } else if (!AddressIsPoisoned (dst_beg)) {
663- SetContainerGranule (dst_external_beg , dst_beg - dst_external_beg );
663+ SetContainerGranule (dst_beg_down , dst_beg - dst_beg_down );
664664 }
665665}
666666
@@ -671,11 +671,11 @@ static void CopyContainerLastGranuleAnnotation(uptr src_end,
671671 uptr dst_end_down) {
672672 constexpr uptr granularity = ASAN_SHADOW_GRANULARITY;
673673 // Last granule
674- uptr src_internal_end = RoundDownTo (src_end, granularity);
674+ uptr src_end_down = RoundDownTo (src_end, granularity);
675675 if (AddressIsPoisoned (src_end)) {
676- *(u8 *)MemToShadow (dst_end_down) = *(u8 *)MemToShadow (src_internal_end );
676+ *(u8 *)MemToShadow (dst_end_down) = *(u8 *)MemToShadow (src_end_down );
677677 } else {
678- SetContainerGranule (dst_end_down, src_end - src_internal_end );
678+ SetContainerGranule (dst_end_down, src_end - src_end_down );
679679 }
680680}
681681
0 commit comments