test suite: all expected STG output files are now annotated

PiperOrigin-RevId: 608943654
Change-Id: I57a7066f4e2c7c37e37d33db484417023f875e15

1 files changed, 67 insertions, 67 deletions

diff --git a/test_cases/abigail_reader/primitive/expected/all_c99_types_c.abi_stg b/test_cases/abigail_reader/primitive/expected/all_c99_types_c.abi_stg
index 0c0b853..da38621 100644
--- a/test_cases/abigail_reader/primitive/expected/all_c99_types_c.abi_stg
+++ b/test_cases/abigail_reader/primitive/expected/all_c99_types_c.abi_stg
@@ -1,5 +1,5 @@
 version: 0x00000002
-root_id: 0x84ea5130
+root_id: 0x84ea5130  # interface
 special {
   id: 0x48b5725f
   kind: VOID
@@ -82,180 +82,180 @@ primitive {
 member {
   id: 0x60cc941d
   name: "a_bool"
-  type_id: 0xb2307ca0
+  type_id: 0xb2307ca0  # _Bool
 }
 member {
   id: 0x9acc99ec
   name: "a_char"
-  type_id: 0x384f7d7c
+  type_id: 0x384f7d7c  # char
   offset: 8
 }
 member {
   id: 0x02bf49df
   name: "a_double"
-  type_id: 0x15053314
+  type_id: 0x15053314  # double
   offset: 1152
 }
 member {
   id: 0xc076ac8a
   name: "a_float"
-  type_id: 0x8b7c737e
+  type_id: 0x8b7c737e  # float
   offset: 1088
 }
 member {
   id: 0xe1a6abb4
   name: "a_long"
-  type_id: 0xfc0e1dbd
+  type_id: 0xfc0e1dbd  # long
   offset: 320
 }
 member {
   id: 0xe40473eb
   name: "a_long_double"
-  type_id: 0x50132e1f
+  type_id: 0x50132e1f  # long double
   offset: 1280
 }
 member {
   id: 0x0f1252ea
   name: "a_long_int"
-  type_id: 0xfc0e1dbd
+  type_id: 0xfc0e1dbd  # long
   offset: 384
 }
 member {
   id: 0xe82df582
   name: "a_long_long"
-  type_id: 0x39470e64
+  type_id: 0x39470e64  # long long
   offset: 704
 }
 member {
   id: 0xa1f3e7a8
   name: "a_long_long_int"
-  type_id: 0x39470e64
+  type_id: 0x39470e64  # long long
   offset: 768
 }
 member {
   id: 0x5bcaf805
   name: "a_short"
-  type_id: 0xb0312d5a
+  type_id: 0xb0312d5a  # short
   offset: 32
 }
 member {
   id: 0x6cd90015
   name: "a_short_int"
-  type_id: 0xb0312d5a
+  type_id: 0xb0312d5a  # short
   offset: 48
 }
 member {
   id: 0xbdd69312
   name: "a_signed"
-  type_id: 0x6720d32f
+  type_id: 0x6720d32f  # int
   offset: 160
 }
 member {
   id: 0x05b46933
   name: "a_signed_char"
-  type_id: 0x5ab350f8
+  type_id: 0x5ab350f8  # signed char
   offset: 16
 }
 member {
   id: 0x08b38ec5
   name: "a_signed_int"
-  type_id: 0x6720d32f
+  type_id: 0x6720d32f  # int
   offset: 192
 }
 member {
   id: 0x06440720
   name: "a_signed_long"
-  type_id: 0xfc0e1dbd
+  type_id: 0xfc0e1dbd  # long
   offset: 448
 }
 member {
   id: 0xd75db6c9
   name: "a_signed_long_int"
-  type_id: 0xfc0e1dbd
+  type_id: 0xfc0e1dbd  # long
   offset: 512
 }
 member {
   id: 0x604c42e6
   name: "a_signed_long_long"
-  type_id: 0x39470e64
+  type_id: 0x39470e64  # long long
   offset: 832
 }
 member {
   id: 0xaa264a19
   name: "a_signed_long_long_int"
-  type_id: 0x39470e64
+  type_id: 0x39470e64  # long long
   offset: 896
 }
 member {
   id: 0x085ab6f0
   name: "a_signed_short"
-  type_id: 0xb0312d5a
+  type_id: 0xb0312d5a  # short
   offset: 64
 }
 member {
   id: 0x2698d857
   name: "a_signed_short_int"
-  type_id: 0xb0312d5a
+  type_id: 0xb0312d5a  # short
   offset: 80
 }
 member {
   id: 0x53e0a26d
   name: "an_int"
-  type_id: 0x6720d32f
+  type_id: 0x6720d32f  # int
   offset: 128
 }
 member {
   id: 0x1ed72586
   name: "an_unsigned"
-  type_id: 0x4585663f
+  type_id: 0x4585663f  # unsigned int
   offset: 224
 }
 member {
   id: 0x47ceac59
   name: "an_unsigned_char"
-  type_id: 0x5d8155a5
+  type_id: 0x5d8155a5  # unsigned char
   offset: 24
 }
 member {
   id: 0xe511cff3
   name: "an_unsigned_int"
-  type_id: 0x4585663f
+  type_id: 0x4585663f  # unsigned int
   offset: 256
 }
 member {
   id: 0xcbf192fe
   name: "an_unsigned_long"
-  type_id: 0x33756485
+  type_id: 0x33756485  # unsigned long
   offset: 576
 }
 member {
   id: 0x87e41d6a
   name: "an_unsigned_long_int"
-  type_id: 0x33756485
+  type_id: 0x33756485  # unsigned long
   offset: 640
 }
 member {
   id: 0xcf92b09f
   name: "an_unsigned_long_long"
-  type_id: 0xd5df6730
+  type_id: 0xd5df6730  # unsigned long long
   offset: 960
 }
 member {
   id: 0xaafbc0ea
   name: "an_unsigned_long_long_int"
-  type_id: 0xd5df6730
+  type_id: 0xd5df6730  # unsigned long long
   offset: 1024
 }
 member {
   id: 0x5026e14b
   name: "an_unsigned_short"
-  type_id: 0xc93e017b
+  type_id: 0xc93e017b  # unsigned short
   offset: 96
 }
 member {
   id: 0xdd5c129b
   name: "an_unsigned_short_int"
-  type_id: 0xc93e017b
+  type_id: 0xc93e017b  # unsigned short
   offset: 112
 }
 struct_union {
@@ -264,49 +264,49 @@ struct_union {
   name: "Z"
   definition {
     bytesize: 176
-    member_id: 0x60cc941d
-    member_id: 0x9acc99ec
-    member_id: 0x05b46933
-    member_id: 0x47ceac59
-    member_id: 0x5bcaf805
-    member_id: 0x6cd90015
-    member_id: 0x085ab6f0
-    member_id: 0x2698d857
-    member_id: 0x5026e14b
-    member_id: 0xdd5c129b
-    member_id: 0x53e0a26d
-    member_id: 0xbdd69312
-    member_id: 0x08b38ec5
-    member_id: 0x1ed72586
-    member_id: 0xe511cff3
-    member_id: 0xe1a6abb4
-    member_id: 0x0f1252ea
-    member_id: 0x06440720
-    member_id: 0xd75db6c9
-    member_id: 0xcbf192fe
-    member_id: 0x87e41d6a
-    member_id: 0xe82df582
-    member_id: 0xa1f3e7a8
-    member_id: 0x604c42e6
-    member_id: 0xaa264a19
-    member_id: 0xcf92b09f
-    member_id: 0xaafbc0ea
-    member_id: 0xc076ac8a
-    member_id: 0x02bf49df
-    member_id: 0xe40473eb
+    member_id: 0x60cc941d  # _Bool a_bool
+    member_id: 0x9acc99ec  # char a_char
+    member_id: 0x05b46933  # signed char a_signed_char
+    member_id: 0x47ceac59  # unsigned char an_unsigned_char
+    member_id: 0x5bcaf805  # short a_short
+    member_id: 0x6cd90015  # short a_short_int
+    member_id: 0x085ab6f0  # short a_signed_short
+    member_id: 0x2698d857  # short a_signed_short_int
+    member_id: 0x5026e14b  # unsigned short an_unsigned_short
+    member_id: 0xdd5c129b  # unsigned short an_unsigned_short_int
+    member_id: 0x53e0a26d  # int an_int
+    member_id: 0xbdd69312  # int a_signed
+    member_id: 0x08b38ec5  # int a_signed_int
+    member_id: 0x1ed72586  # unsigned int an_unsigned
+    member_id: 0xe511cff3  # unsigned int an_unsigned_int
+    member_id: 0xe1a6abb4  # long a_long
+    member_id: 0x0f1252ea  # long a_long_int
+    member_id: 0x06440720  # long a_signed_long
+    member_id: 0xd75db6c9  # long a_signed_long_int
+    member_id: 0xcbf192fe  # unsigned long an_unsigned_long
+    member_id: 0x87e41d6a  # unsigned long an_unsigned_long_int
+    member_id: 0xe82df582  # long long a_long_long
+    member_id: 0xa1f3e7a8  # long long a_long_long_int
+    member_id: 0x604c42e6  # long long a_signed_long_long
+    member_id: 0xaa264a19  # long long a_signed_long_long_int
+    member_id: 0xcf92b09f  # unsigned long long an_unsigned_long_long
+    member_id: 0xaafbc0ea  # unsigned long long an_unsigned_long_long_int
+    member_id: 0xc076ac8a  # float a_float
+    member_id: 0x02bf49df  # double a_double
+    member_id: 0xe40473eb  # long double a_long_double
   }
 }
 function {
   id: 0x31a5d232
-  return_type_id: 0x48b5725f
-  parameter_id: 0x84f60e86
+  return_type_id: 0x48b5725f  # void
+  parameter_id: 0x84f60e86  # struct Z
 }
 elf_symbol {
   id: 0xc018d523
   name: "fun"
   is_defined: true
   symbol_type: FUNCTION
-  type_id: 0x31a5d232
+  type_id: 0x31a5d232  # void(struct Z)
   full_name: "fun"
 }
 elf_symbol {
@@ -314,11 +314,11 @@ elf_symbol {
   name: "var"
   is_defined: true
   symbol_type: OBJECT
-  type_id: 0x84f60e86
+  type_id: 0x84f60e86  # struct Z
   full_name: "var"
 }
 interface {
   id: 0x84ea5130
-  symbol_id: 0xc018d523
-  symbol_id: 0x3997c6eb
+  symbol_id: 0xc018d523  # void fun(struct Z)
+  symbol_id: 0x3997c6eb  # struct Z var
 }