FREEZE.unindexed

tools/binary_size/libsupersize/describe.py

Index: tools/binary_size/libsupersize/describe.py
diff --git a/tools/binary_size/libsupersize/describe.py b/tools/binary_size/libsupersize/describe.py
index bf689d574c66e8ad3ae14cfcc544ec15bb7f89a7..696c5b6b26f9861951fc15da8e5de4de638b5fb6 100644
--- a/tools/binary_size/libsupersize/describe.py
+++ b/tools/binary_size/libsupersize/describe.py
@@ -75,8 +75,8 @@ class Describer(object):
       address = hex(sym.address)
     if self.verbose:
       count_part = '  count=%d' % len(sym) if sym.IsGroup() else ''
-      yield '{}@{:<9s}  size={}  padding={}  size_without_padding={}{}'.format(
-          sym.section, address, sym.size, sym.padding, sym.size_without_padding,
+      yield '{}@{:<9s}  pss={}  padding={}  size_without_padding={}{}'.format(
+          sym.section, address, sym.pss, sym.padding, sym.size_without_padding,
           count_part)
       yield '    source_path={} \tobject_path={}'.format(
           sym.source_path, sym.object_path)
@@ -90,7 +90,7 @@ class Describer(object):
             int(sym.is_anonymous), sym.full_name)
     else:
       yield '{}@{:<9s}  {:<7} {}'.format(
-          sym.section, address, sym.size,
+          sym.section, address, sym.pss,
           sym.source_path or sym.object_path or '{no path}')
       if sym.name:
         count_part = ' (count=%d)' % len(sym) if sym.IsGroup() else ''
@@ -105,7 +105,7 @@ class Describer(object):
     diff_prefix = ''
     for s in sorted_syms:
       if group.IsBss() or not s.IsBss():
-        running_total += s.size
+        running_total += s.pss
       for l in self._DescribeSymbol(s):
         if l[:4].isspace():
           indent_size = 8 + len(indent_prefix) + len(diff_prefix)
@@ -121,13 +121,13 @@ class Describer(object):
           yield l
 
   def _DescribeSymbolGroup(self, group):
-    total_size = group.size
+    total_size = group.pss
     code_syms = group.WhereInSection('t')
-    code_size = code_syms.size
-    ro_size = code_syms.Inverted().WhereInSection('r').size
+    code_size = code_syms.pss
+    ro_size = code_syms.Inverted().WhereInSection('r').pss
     unique_paths = set(s.object_path for s in group)
     header_desc = [
-        'Showing {:,} symbols with total size: {} bytes'.format(
+        'Showing {:,} symbols with total pss: {} bytes'.format(
             len(group), total_size),
         '.text={:<10} .rodata={:<10} other={:<10} total={}'.format(
             _PrettySize(code_size), _PrettySize(ro_size),
@@ -135,7 +135,7 @@ class Describer(object):
             _PrettySize(total_size)),
         'Number of object files: {}'.format(len(unique_paths)),
         '',
-        'First columns are: running total, type, size',
+        'First columns are: running total, type, pss',
     ]
     children_desc = self._DescribeSymbolGroupChildren(group)
     return itertools.chain(header_desc, children_desc)
@@ -248,7 +248,7 @@ def DescribeSizeInfoCoverage(size_info):
     attributed_syms = star_syms.Inverted().WhereHasAnyAttribution()
     anonymous_syms = attributed_syms.Inverted()
     if star_syms or anonymous_syms:
-      missing_size = star_syms.size + anonymous_syms.size
+      missing_size = star_syms.pss + anonymous_syms.pss
       yield ('+ Without %d merge sections and %d anonymous entries ('
                   'accounting for %d bytes):') % (
           len(star_syms),  len(anonymous_syms), missing_size)