diff options
| author | Sid Nayyar <sidnayyar@google.com> | 2024-02-21 12:23:07 +0000 |
|---|---|---|
| committer | Giuliano Procida <gprocida@google.com> | 2024-03-08 14:23:47 +0000 |
| commit | 55fcf7f7634bcb24512658063b79fcf016afc277 (patch) | |
| tree | 38974711880f869c5ac9739012af7f85dd2dcdd9 | |
| parent | f8bd737776e6d2d98e46a5025a03ae810c405578 (diff) | |
| download | stg-55fcf7f7634bcb24512658063b79fcf016afc277.tar.gz | |
test suite: all expected STG output files are now annotated
PiperOrigin-RevId: 608943654
Change-Id: I57a7066f4e2c7c37e37d33db484417023f875e15
228 files changed, 3361 insertions, 3361 deletions
diff --git a/test_cases/abigail_reader/array/expected/multidimensional_c.abi_stg b/test_cases/abigail_reader/array/expected/multidimensional_c.abi_stg index 3e4fdbc..cec90ca 100644 --- a/test_cases/abigail_reader/array/expected/multidimensional_c.abi_stg +++ b/test_cases/abigail_reader/array/expected/multidimensional_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,27 +8,27 @@ primitive { array { id: 0x0b0dc1ff number_of_elements: 3 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } array { id: 0x8e8e6365 number_of_elements: 4 - element_type_id: 0x0b0dc1ff + element_type_id: 0x0b0dc1ff # int[3] } array { id: 0x966a7e53 number_of_elements: 1 - element_type_id: 0x8e8e6365 + element_type_id: 0x8e8e6365 # int[4][3] } elf_symbol { id: 0x7709bd40 name: "x" is_defined: true symbol_type: OBJECT - type_id: 0x966a7e53 + type_id: 0x966a7e53 # int[1][4][3] full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # int x[1][4][3] } diff --git a/test_cases/abigail_reader/array/expected/multidimensional_cc.abi_stg b/test_cases/abigail_reader/array/expected/multidimensional_cc.abi_stg index 3e4fdbc..cec90ca 100644 --- a/test_cases/abigail_reader/array/expected/multidimensional_cc.abi_stg +++ b/test_cases/abigail_reader/array/expected/multidimensional_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,27 +8,27 @@ primitive { array { id: 0x0b0dc1ff number_of_elements: 3 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } array { id: 0x8e8e6365 number_of_elements: 4 - element_type_id: 0x0b0dc1ff + element_type_id: 0x0b0dc1ff # int[3] } array { id: 0x966a7e53 number_of_elements: 1 - element_type_id: 0x8e8e6365 + element_type_id: 0x8e8e6365 # int[4][3] } elf_symbol { id: 0x7709bd40 name: "x" is_defined: true symbol_type: OBJECT - type_id: 0x966a7e53 + type_id: 0x966a7e53 # int[1][4][3] full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # int x[1][4][3] } diff --git a/test_cases/abigail_reader/array/expected/simple_array_c.abi_stg b/test_cases/abigail_reader/array/expected/simple_array_c.abi_stg index 8d4b370..dcd6503 100644 --- a/test_cases/abigail_reader/array/expected/simple_array_c.abi_stg +++ b/test_cases/abigail_reader/array/expected/simple_array_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x4585663f name: "unsigned int" @@ -8,17 +8,17 @@ primitive { array { id: 0x7dc8196c number_of_elements: 2 - element_type_id: 0x4585663f + element_type_id: 0x4585663f # unsigned int } elf_symbol { id: 0x30693519 name: "numbers" is_defined: true symbol_type: OBJECT - type_id: 0x7dc8196c + type_id: 0x7dc8196c # unsigned int[2] full_name: "numbers" } interface { id: 0x84ea5130 - symbol_id: 0x30693519 + symbol_id: 0x30693519 # unsigned int numbers[2] } diff --git a/test_cases/abigail_reader/array/expected/simple_array_cc.abi_stg b/test_cases/abigail_reader/array/expected/simple_array_cc.abi_stg index 8d4b370..dcd6503 100644 --- a/test_cases/abigail_reader/array/expected/simple_array_cc.abi_stg +++ b/test_cases/abigail_reader/array/expected/simple_array_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x4585663f name: "unsigned int" @@ -8,17 +8,17 @@ primitive { array { id: 0x7dc8196c number_of_elements: 2 - element_type_id: 0x4585663f + element_type_id: 0x4585663f # unsigned int } elf_symbol { id: 0x30693519 name: "numbers" is_defined: true symbol_type: OBJECT - type_id: 0x7dc8196c + type_id: 0x7dc8196c # unsigned int[2] full_name: "numbers" } interface { id: 0x84ea5130 - symbol_id: 0x30693519 + symbol_id: 0x30693519 # unsigned int numbers[2] } diff --git a/test_cases/abigail_reader/array/expected/unknown_size_c.abi_stg b/test_cases/abigail_reader/array/expected/unknown_size_c.abi_stg index dfed0da..3f38594 100644 --- a/test_cases/abigail_reader/array/expected/unknown_size_c.abi_stg +++ b/test_cases/abigail_reader/array/expected/unknown_size_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x15053314 name: "double" @@ -12,17 +12,17 @@ primitive { } array { id: 0xc178c235 - element_type_id: 0x15053314 + element_type_id: 0x15053314 # double } member { id: 0x9cebeb53 name: "bar" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x964b7931 name: "baz" - type_id: 0xc178c235 + type_id: 0xc178c235 # double[0] offset: 64 } struct_union { @@ -31,8 +31,8 @@ struct_union { name: "foo" definition { bytesize: 8 - member_id: 0x9cebeb53 - member_id: 0x964b7931 + member_id: 0x9cebeb53 # int bar + member_id: 0x964b7931 # double baz[0] } } elf_symbol { @@ -40,10 +40,10 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0xb88f5ef1 + type_id: 0xb88f5ef1 # struct foo full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # struct foo x } diff --git a/test_cases/abigail_reader/array/expected/unknown_size_extern_c.abi_stg b/test_cases/abigail_reader/array/expected/unknown_size_extern_c.abi_stg index 74d739d..99c7e70 100644 --- a/test_cases/abigail_reader/array/expected/unknown_size_extern_c.abi_stg +++ b/test_cases/abigail_reader/array/expected/unknown_size_extern_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,17 +8,17 @@ primitive { array { id: 0xac01d241 number_of_elements: 1 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0xac01d241 + type_id: 0xac01d241 # int[1] full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # int foo[1] } diff --git a/test_cases/abigail_reader/array/expected/variable_length_c.abi_stg b/test_cases/abigail_reader/array/expected/variable_length_c.abi_stg index f785b14..0fecb3b 100644 --- a/test_cases/abigail_reader/array/expected/variable_length_c.abi_stg +++ b/test_cases/abigail_reader/array/expected/variable_length_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -7,17 +7,17 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0xa58ca0b6 name: "bar" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 + symbol_id: 0xa58ca0b6 # int bar() } diff --git a/test_cases/abigail_reader/composite/expected/abstract_base_class_cc.abi_stg b/test_cases/abigail_reader/composite/expected/abstract_base_class_cc.abi_stg index e4fca59..634b9f5 100644 --- a/test_cases/abigail_reader/composite/expected/abstract_base_class_cc.abi_stg +++ b/test_cases/abigail_reader/composite/expected/abstract_base_class_cc.abi_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x0b5e55a4 kind: POINTER - pointee_type_id: 0x0739b00c + pointee_type_id: 0x0739b00c # struct X } pointer_reference { id: 0x134ef871 kind: POINTER - pointee_type_id: 0x677b0759 + pointee_type_id: 0x677b0759 # struct Y } pointer_reference { id: 0xc65e4373 kind: LVALUE_REFERENCE - pointee_type_id: 0x0739b00c + pointee_type_id: 0x0739b00c # struct X } primitive { id: 0x6720d32f @@ -22,34 +22,34 @@ primitive { } base_class { id: 0x166ca3db - type_id: 0x0739b00c + type_id: 0x0739b00c # struct X inheritance: NON_VIRTUAL } method { id: 0x4dd47407 mangled_name: "_ZN1X1fEv" name: "f" - type_id: 0x9f577646 + type_id: 0x9f577646 # int(struct X*) } method { id: 0xb8b6ef68 mangled_name: "_ZN1X1gEv" name: "g" vtable_offset: 1 - type_id: 0x9f577646 + type_id: 0x9f577646 # int(struct X*) } method { id: 0x63c715c4 mangled_name: "_ZN1Y1fEv" name: "f" - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) } method { id: 0xe8e61433 mangled_name: "_ZN1Y1gEv" name: "g" vtable_offset: 1 - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) } struct_union { id: 0x0739b00c @@ -57,8 +57,8 @@ struct_union { name: "X" definition { bytesize: 8 - method_id: 0x4dd47407 - method_id: 0xb8b6ef68 + method_id: 0x4dd47407 # int f(struct X*) + method_id: 0xb8b6ef68 # int g(struct X*) } } struct_union { @@ -67,36 +67,36 @@ struct_union { name: "Y" definition { bytesize: 8 - base_class_id: 0x166ca3db - method_id: 0x63c715c4 - method_id: 0xe8e61433 + base_class_id: 0x166ca3db # struct X + method_id: 0x63c715c4 # int f(struct Y*) + method_id: 0xe8e61433 # int g(struct Y*) } } function { id: 0x99535d33 - return_type_id: 0x6720d32f - parameter_id: 0x134ef871 + return_type_id: 0x6720d32f # int + parameter_id: 0x134ef871 # struct Y* } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } function { id: 0x9f577646 - return_type_id: 0x6720d32f - parameter_id: 0x0b5e55a4 + return_type_id: 0x6720d32f # int + parameter_id: 0x0b5e55a4 # struct X* } function { id: 0xac1773f3 - return_type_id: 0x6720d32f - parameter_id: 0xc65e4373 + return_type_id: 0x6720d32f # int + parameter_id: 0xc65e4373 # struct X& } elf_symbol { id: 0x10da60a3 name: "_Z3foov" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "foo" } elf_symbol { @@ -104,7 +104,7 @@ elf_symbol { name: "_Z3funR1X" is_defined: true symbol_type: FUNCTION - type_id: 0xac1773f3 + type_id: 0xac1773f3 # int(struct X&) full_name: "fun" } elf_symbol { @@ -119,7 +119,7 @@ elf_symbol { name: "_ZN1Y1fEv" is_defined: true symbol_type: FUNCTION - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) full_name: "Y::f" } elf_symbol { @@ -127,7 +127,7 @@ elf_symbol { name: "_ZN1Y1gEv" is_defined: true symbol_type: FUNCTION - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) full_name: "Y::g" } elf_symbol { @@ -178,16 +178,16 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0x10da60a3 - symbol_id: 0xbc33871c - symbol_id: 0x0bbcf1df - symbol_id: 0x71a2fb93 - symbol_id: 0x938b5d81 - symbol_id: 0x8f2ed63c - symbol_id: 0x231a46da - symbol_id: 0x62dbf9a8 - symbol_id: 0xa9b67458 - symbol_id: 0x68f7d82f - symbol_id: 0x8c3333ff - symbol_id: 0x4df3aa88 + symbol_id: 0x10da60a3 # int foo() + symbol_id: 0xbc33871c # int fun(struct X&) + symbol_id: 0x0bbcf1df # _ZN1XC2Ev + symbol_id: 0x71a2fb93 # int Y::f(struct Y*) + symbol_id: 0x938b5d81 # int Y::g(struct Y*) + symbol_id: 0x8f2ed63c # _ZN1YC2Ev + symbol_id: 0x231a46da # _ZTI1X + symbol_id: 0x62dbf9a8 # _ZTI1Y + symbol_id: 0xa9b67458 # _ZTS1X + symbol_id: 0x68f7d82f # _ZTS1Y + symbol_id: 0x8c3333ff # _ZTV1X + symbol_id: 0x4df3aa88 # _ZTV1Y } diff --git a/test_cases/abigail_reader/composite/expected/anonymous_cc.abi_stg b/test_cases/abigail_reader/composite/expected/anonymous_cc.abi_stg index 3e7de66..522f5c0 100644 --- a/test_cases/abigail_reader/composite/expected/anonymous_cc.abi_stg +++ b/test_cases/abigail_reader/composite/expected/anonymous_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x398ea63b name: "unnamed-enum-underlying-type-32" @@ -13,37 +13,37 @@ primitive { member { id: 0xcd3a8d16 name: "anon_class" - type_id: 0x307fdda9 + type_id: 0x307fdda9 # struct { long x; } } member { id: 0x66d27b29 name: "anon_enum" - type_id: 0x7bdf7a79 + type_id: 0x7bdf7a79 # enum { X = 2, } offset: 192 } member { id: 0x08cb6e25 name: "anon_struct" - type_id: 0x307fdda9 + type_id: 0x307fdda9 # struct { long x; } offset: 64 } member { id: 0x7deb8c98 name: "anon_union" - type_id: 0x7ee944b3 + type_id: 0x7ee944b3 # union { long x; } offset: 128 } member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x307fdda9 kind: STRUCT definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -51,7 +51,7 @@ struct_union { kind: UNION definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -60,16 +60,16 @@ struct_union { name: "Foo" definition { bytesize: 32 - member_id: 0xcd3a8d16 - member_id: 0x08cb6e25 - member_id: 0x7deb8c98 - member_id: 0x66d27b29 + member_id: 0xcd3a8d16 # struct { long x; } anon_class + member_id: 0x08cb6e25 # struct { long x; } anon_struct + member_id: 0x7deb8c98 # union { long x; } anon_union + member_id: 0x66d27b29 # enum { X = 2, } anon_enum } } enumeration { id: 0x7bdf7a79 definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "X" value: 2 @@ -81,10 +81,10 @@ elf_symbol { name: "var" is_defined: true symbol_type: OBJECT - type_id: 0xf6f304f7 + type_id: 0xf6f304f7 # struct Foo full_name: "var" } interface { id: 0x84ea5130 - symbol_id: 0x3997c6eb + symbol_id: 0x3997c6eb # struct Foo var } diff --git a/test_cases/abigail_reader/composite/expected/anonymous_member_c.abi_stg b/test_cases/abigail_reader/composite/expected/anonymous_member_c.abi_stg index 6d48628..f77aff8 100644 --- a/test_cases/abigail_reader/composite/expected/anonymous_member_c.abi_stg +++ b/test_cases/abigail_reader/composite/expected/anonymous_member_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -7,52 +7,52 @@ primitive { } member { id: 0x26e14ed5 - type_id: 0x14ab7fa8 + type_id: 0x14ab7fa8 # struct { int two; } offset: 32 } member { id: 0x2738f5df - type_id: 0x13cda76e + type_id: 0x13cda76e # struct { int one; } } member { id: 0x29b68d56 - type_id: 0x29f46346 + type_id: 0x29f46346 # struct { int eight; } offset: 96 } member { id: 0x2aee20bc - type_id: 0x2496e164 + type_id: 0x2496e164 # struct { int four; } offset: 64 } member { id: 0xc6609e76 name: "eight" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xf3ea96ff name: "four" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x2e878ed7 name: "one" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x331cedce name: "two" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0x11abcb4e kind: STRUCT definition { bytesize: 16 - member_id: 0x2738f5df - member_id: 0x26e14ed5 - member_id: 0x2aee20bc - member_id: 0x29b68d56 + member_id: 0x2738f5df # struct { int one; } + member_id: 0x26e14ed5 # struct { int two; } + member_id: 0x2aee20bc # struct { int four; } + member_id: 0x29b68d56 # struct { int eight; } } } struct_union { @@ -60,7 +60,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0x2e878ed7 + member_id: 0x2e878ed7 # int one } } struct_union { @@ -68,7 +68,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0x331cedce + member_id: 0x331cedce # int two } } struct_union { @@ -76,7 +76,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0xf3ea96ff + member_id: 0xf3ea96ff # int four } } struct_union { @@ -84,7 +84,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0xc6609e76 + member_id: 0xc6609e76 # int eight } } elf_symbol { @@ -92,10 +92,10 @@ elf_symbol { name: "v" is_defined: true symbol_type: OBJECT - type_id: 0x11abcb4e + type_id: 0x11abcb4e # struct { struct { int one; }; struct { int two; }; struct { int four; }; struct { int eight; }; } full_name: "v" } interface { id: 0x84ea5130 - symbol_id: 0xf48dba91 + symbol_id: 0xf48dba91 # struct { struct { int one; }; struct { int two; }; struct { int four; }; struct { int eight; }; } v } diff --git a/test_cases/abigail_reader/composite/expected/anonymous_member_chain_c.abi_stg b/test_cases/abigail_reader/composite/expected/anonymous_member_chain_c.abi_stg index bd119d6..2f5ca70 100644 --- a/test_cases/abigail_reader/composite/expected/anonymous_member_chain_c.abi_stg +++ b/test_cases/abigail_reader/composite/expected/anonymous_member_chain_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x384f7d7c name: "char" @@ -12,32 +12,32 @@ primitive { } member { id: 0x2a24396d - type_id: 0x27be95a5 + type_id: 0x27be95a5 # struct { char y; } } member { id: 0x2fddd982 - type_id: 0x3059161a + type_id: 0x3059161a # struct { int x; } } member { id: 0x348a54af - type_id: 0x5d0722af + type_id: 0x5d0722af # union { struct { int x; }; struct { char y; }; } } member { id: 0xa0d54b05 name: "x" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xff4b45f9 name: "y" - type_id: 0x384f7d7c + type_id: 0x384f7d7c # char } struct_union { id: 0x27be95a5 kind: STRUCT definition { bytesize: 1 - member_id: 0xff4b45f9 + member_id: 0xff4b45f9 # char y } } struct_union { @@ -45,7 +45,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } struct_union { @@ -53,8 +53,8 @@ struct_union { kind: UNION definition { bytesize: 4 - member_id: 0x2fddd982 - member_id: 0x2a24396d + member_id: 0x2fddd982 # struct { int x; } + member_id: 0x2a24396d # struct { char y; } } } struct_union { @@ -63,22 +63,22 @@ struct_union { name: "A" definition { bytesize: 4 - member_id: 0x348a54af + member_id: 0x348a54af # union { struct { int x; }; struct { char y; }; } } } function { id: 0x4f13c399 - return_type_id: 0xc1147dbd + return_type_id: 0xc1147dbd # struct A } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0x4f13c399 + type_id: 0x4f13c399 # struct A() full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # struct A foo() } diff --git a/test_cases/abigail_reader/composite/expected/base_class_order_cc.abi_stg b/test_cases/abigail_reader/composite/expected/base_class_order_cc.abi_stg index 3945d9f..a085d86 100644 --- a/test_cases/abigail_reader/composite/expected/base_class_order_cc.abi_stg +++ b/test_cases/abigail_reader/composite/expected/base_class_order_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -7,58 +7,58 @@ primitive { } base_class { id: 0x1fbc7d3f - type_id: 0x207acb9f + type_id: 0x207acb9f # struct B offset: 32 inheritance: NON_VIRTUAL } base_class { id: 0x1fbc7d40 - type_id: 0x207acb9f + type_id: 0x207acb9f # struct B inheritance: NON_VIRTUAL } base_class { id: 0x27aeadc1 - type_id: 0xc0318865 + type_id: 0xc0318865 # struct C inheritance: NON_VIRTUAL } base_class { id: 0x27aeadc2 - type_id: 0xc0318865 + type_id: 0xc0318865 # struct C offset: 64 inheritance: NON_VIRTUAL } base_class { id: 0x27e7d0b7 - type_id: 0xc1147dbd + type_id: 0xc1147dbd # struct A offset: 32 inheritance: NON_VIRTUAL } member { id: 0x8dbf34b3 name: "m" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 96 } member { id: 0x8dbf39d1 name: "m" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 64 } member { id: 0xa0d54b05 name: "x" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xff142a57 name: "y" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x21525565 name: "z" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0xc1147dbd @@ -66,7 +66,7 @@ struct_union { name: "A" definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } struct_union { @@ -75,9 +75,9 @@ struct_union { name: "AddRemove" definition { bytesize: 12 - base_class_id: 0x27aeadc1 - base_class_id: 0x1fbc7d3f - member_id: 0x8dbf39d1 + base_class_id: 0x27aeadc1 # struct C + base_class_id: 0x1fbc7d3f # struct B + member_id: 0x8dbf39d1 # int m } } struct_union { @@ -86,7 +86,7 @@ struct_union { name: "B" definition { bytesize: 4 - member_id: 0xff142a57 + member_id: 0xff142a57 # int y } } struct_union { @@ -95,7 +95,7 @@ struct_union { name: "C" definition { bytesize: 4 - member_id: 0x21525565 + member_id: 0x21525565 # int z } } struct_union { @@ -104,10 +104,10 @@ struct_union { name: "DiffOrder" definition { bytesize: 16 - base_class_id: 0x1fbc7d40 - base_class_id: 0x27e7d0b7 - base_class_id: 0x27aeadc2 - member_id: 0x8dbf34b3 + base_class_id: 0x1fbc7d40 # struct B + base_class_id: 0x27e7d0b7 # struct A + base_class_id: 0x27aeadc2 # struct C + member_id: 0x8dbf34b3 # int m } } elf_symbol { @@ -115,7 +115,7 @@ elf_symbol { name: "add_remove" is_defined: true symbol_type: OBJECT - type_id: 0x69557e8a + type_id: 0x69557e8a # struct AddRemove full_name: "add_remove" } elf_symbol { @@ -123,11 +123,11 @@ elf_symbol { name: "diff_order" is_defined: true symbol_type: OBJECT - type_id: 0x4e854f8f + type_id: 0x4e854f8f # struct DiffOrder full_name: "diff_order" } interface { id: 0x84ea5130 - symbol_id: 0x4a0401b7 - symbol_id: 0x18b35aa3 + symbol_id: 0x4a0401b7 # struct AddRemove add_remove + symbol_id: 0x18b35aa3 # struct DiffOrder diff_order } diff --git a/test_cases/abigail_reader/composite/expected/base_class_size_cc.abi_stg b/test_cases/abigail_reader/composite/expected/base_class_size_cc.abi_stg index 270524a..e93ca30 100644 --- a/test_cases/abigail_reader/composite/expected/base_class_size_cc.abi_stg +++ b/test_cases/abigail_reader/composite/expected/base_class_size_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x4585663f name: "unsigned int" @@ -17,34 +17,34 @@ primitive { } base_class { id: 0x1fbc7d3f - type_id: 0x207acb9f + type_id: 0x207acb9f # struct B inheritance: NON_VIRTUAL } base_class { id: 0x27e7d0b7 - type_id: 0xc1147dbd + type_id: 0xc1147dbd # struct A inheritance: NON_VIRTUAL } member { id: 0xa0f7eeb0 name: "x" - type_id: 0x4585663f + type_id: 0x4585663f # unsigned int } member { id: 0xff8f0499 name: "y" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } member { id: 0x21525184 name: "z" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 64 } member { id: 0x2152585e name: "z" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 32 } struct_union { @@ -53,7 +53,7 @@ struct_union { name: "A" definition { bytesize: 4 - member_id: 0xa0f7eeb0 + member_id: 0xa0f7eeb0 # unsigned int x } } struct_union { @@ -62,7 +62,7 @@ struct_union { name: "B" definition { bytesize: 8 - member_id: 0xff8f0499 + member_id: 0xff8f0499 # long y } } struct_union { @@ -71,8 +71,8 @@ struct_union { name: "DiffSize" definition { bytesize: 16 - base_class_id: 0x1fbc7d3f - member_id: 0x21525184 + base_class_id: 0x1fbc7d3f # struct B + member_id: 0x21525184 # int z } } struct_union { @@ -81,8 +81,8 @@ struct_union { name: "SameSize" definition { bytesize: 8 - base_class_id: 0x27e7d0b7 - member_id: 0x2152585e + base_class_id: 0x27e7d0b7 # struct A + member_id: 0x2152585e # int z } } elf_symbol { @@ -90,7 +90,7 @@ elf_symbol { name: "diff_size" is_defined: true symbol_type: OBJECT - type_id: 0x5e576161 + type_id: 0x5e576161 # struct DiffSize full_name: "diff_size" } elf_symbol { @@ -98,11 +98,11 @@ elf_symbol { name: "same_size" is_defined: true symbol_type: OBJECT - type_id: 0xb538a8b6 + type_id: 0xb538a8b6 # struct SameSize full_name: "same_size" } interface { id: 0x84ea5130 - symbol_id: 0x7eb2aa05 - symbol_id: 0x43763562 + symbol_id: 0x7eb2aa05 # struct DiffSize diff_size + symbol_id: 0x43763562 # struct SameSize same_size } diff --git a/test_cases/abigail_reader/composite/expected/forward_c.abi_stg b/test_cases/abigail_reader/composite/expected/forward_c.abi_stg index 0488423..e3165a6 100644 --- a/test_cases/abigail_reader/composite/expected/forward_c.abi_stg +++ b/test_cases/abigail_reader/composite/expected/forward_c.abi_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x1945b139 kind: POINTER - pointee_type_id: 0x4f562278 + pointee_type_id: 0x4f562278 # struct S } pointer_reference { id: 0x2467b5d6 kind: POINTER - pointee_type_id: 0xbbde31c7 + pointee_type_id: 0xbbde31c7 # enum E } pointer_reference { id: 0x26fa5112 kind: POINTER - pointee_type_id: 0xb1a9a2d5 + pointee_type_id: 0xb1a9a2d5 # union U } struct_union { id: 0x4f562278 @@ -34,7 +34,7 @@ elf_symbol { name: "v0" is_defined: true symbol_type: OBJECT - type_id: 0x2467b5d6 + type_id: 0x2467b5d6 # enum E* full_name: "v0" } elf_symbol { @@ -42,7 +42,7 @@ elf_symbol { name: "v1" is_defined: true symbol_type: OBJECT - type_id: 0x1945b139 + type_id: 0x1945b139 # struct S* full_name: "v1" } elf_symbol { @@ -50,12 +50,12 @@ elf_symbol { name: "v2" is_defined: true symbol_type: OBJECT - type_id: 0x26fa5112 + type_id: 0x26fa5112 # union U* full_name: "v2" } interface { id: 0x84ea5130 - symbol_id: 0xead90f5f - symbol_id: 0xab18a5e8 - symbol_id: 0x975e59cf + symbol_id: 0xead90f5f # enum E* v0 + symbol_id: 0xab18a5e8 # struct S* v1 + symbol_id: 0x975e59cf # union U* v2 } diff --git a/test_cases/abigail_reader/composite/expected/kind_cc.abi_stg b/test_cases/abigail_reader/composite/expected/kind_cc.abi_stg index 2eaff52..3a59d4c 100644 --- a/test_cases/abigail_reader/composite/expected/kind_cc.abi_stg +++ b/test_cases/abigail_reader/composite/expected/kind_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xfc0e1dbd name: "long" @@ -8,17 +8,17 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } member { id: 0xff8f0499 name: "y" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } member { id: 0x21c97bab name: "z" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x80b903a7 @@ -26,7 +26,7 @@ struct_union { name: "Class" definition { bytesize: 8 - member_id: 0x21c97bab + member_id: 0x21c97bab # long z } } struct_union { @@ -35,7 +35,7 @@ struct_union { name: "Struct" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -44,7 +44,7 @@ struct_union { name: "Union" definition { bytesize: 8 - member_id: 0xff8f0499 + member_id: 0xff8f0499 # long y } } elf_symbol { @@ -52,7 +52,7 @@ elf_symbol { name: "foo_class" is_defined: true symbol_type: OBJECT - type_id: 0x80b903a7 + type_id: 0x80b903a7 # struct Class full_name: "foo_class" } elf_symbol { @@ -60,7 +60,7 @@ elf_symbol { name: "foo_struct" is_defined: true symbol_type: OBJECT - type_id: 0xae62fdac + type_id: 0xae62fdac # struct Struct full_name: "foo_struct" } elf_symbol { @@ -68,12 +68,12 @@ elf_symbol { name: "foo_union" is_defined: true symbol_type: OBJECT - type_id: 0x58ad1075 + type_id: 0x58ad1075 # union Union full_name: "foo_union" } interface { id: 0x84ea5130 - symbol_id: 0x663a751a - symbol_id: 0x8361f42b - symbol_id: 0xc77e6f56 + symbol_id: 0x663a751a # struct Class foo_class + symbol_id: 0x8361f42b # struct Struct foo_struct + symbol_id: 0xc77e6f56 # union Union foo_union } diff --git a/test_cases/abigail_reader/composite/expected/virtual_inheritance_cc.abi_stg b/test_cases/abigail_reader/composite/expected/virtual_inheritance_cc.abi_stg index d6f3907..ece0681 100644 --- a/test_cases/abigail_reader/composite/expected/virtual_inheritance_cc.abi_stg +++ b/test_cases/abigail_reader/composite/expected/virtual_inheritance_cc.abi_stg @@ -1,30 +1,30 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface base_class { id: 0x1fbc7d3f - type_id: 0x207acb9f + type_id: 0x207acb9f # struct B offset: 8 inheritance: NON_VIRTUAL } base_class { id: 0x27e7d0b7 - type_id: 0xc1147dbd + type_id: 0xc1147dbd # struct A inheritance: NON_VIRTUAL } base_class { id: 0x35d2bca3 - type_id: 0x89c1cdee + type_id: 0x89c1cdee # struct Base inheritance: NON_VIRTUAL } base_class { id: 0xc09b23a0 - type_id: 0x207acb9f + type_id: 0x207acb9f # struct B offset: 256 inheritance: VIRTUAL } base_class { id: 0xf8c08e28 - type_id: 0xc1147dbd + type_id: 0xc1147dbd # struct A offset: 192 inheritance: VIRTUAL } @@ -34,7 +34,7 @@ struct_union { name: "A" definition { bytesize: 1 - base_class_id: 0x35d2bca3 + base_class_id: 0x35d2bca3 # struct Base } } struct_union { @@ -43,7 +43,7 @@ struct_union { name: "B" definition { bytesize: 1 - base_class_id: 0x35d2bca3 + base_class_id: 0x35d2bca3 # struct Base } } struct_union { @@ -60,8 +60,8 @@ struct_union { name: "NonToVirtual" definition { bytesize: 16 - base_class_id: 0xf8c08e28 - base_class_id: 0xc09b23a0 + base_class_id: 0xf8c08e28 # struct A + base_class_id: 0xc09b23a0 # struct B } } struct_union { @@ -70,8 +70,8 @@ struct_union { name: "VirtualToNon" definition { bytesize: 2 - base_class_id: 0x27e7d0b7 - base_class_id: 0x1fbc7d3f + base_class_id: 0x27e7d0b7 # struct A + base_class_id: 0x1fbc7d3f # struct B } } elf_symbol { @@ -156,7 +156,7 @@ elf_symbol { name: "non_to_virtual" is_defined: true symbol_type: OBJECT - type_id: 0xf69d5505 + type_id: 0xf69d5505 # struct NonToVirtual full_name: "non_to_virtual" } elf_symbol { @@ -164,22 +164,22 @@ elf_symbol { name: "virtual_to_non" is_defined: true symbol_type: OBJECT - type_id: 0x61cd3569 + type_id: 0x61cd3569 # struct VirtualToNon full_name: "virtual_to_non" } interface { id: 0x84ea5130 - symbol_id: 0x2ee62e36 - symbol_id: 0x61d9eaff - symbol_id: 0x6cd6c36e - symbol_id: 0xa299f851 - symbol_id: 0x24d58148 - symbol_id: 0x4beeefa7 - symbol_id: 0x4681bdd1 - symbol_id: 0x19ce5ac1 - symbol_id: 0xbc82394c - symbol_id: 0xd4bd55f3 - symbol_id: 0xdebc2088 - symbol_id: 0x486f617d - symbol_id: 0x2d368ead + symbol_id: 0x2ee62e36 # _ZN12NonToVirtualC1Ev + symbol_id: 0x61d9eaff # _ZTI12NonToVirtual + symbol_id: 0x6cd6c36e # _ZTI1A + symbol_id: 0xa299f851 # _ZTI1B + symbol_id: 0x24d58148 # _ZTI4Base + symbol_id: 0x4beeefa7 # _ZTS12NonToVirtual + symbol_id: 0x4681bdd1 # _ZTS1A + symbol_id: 0x19ce5ac1 # _ZTS1B + symbol_id: 0xbc82394c # _ZTS4Base + symbol_id: 0xd4bd55f3 # _ZTT12NonToVirtual + symbol_id: 0xdebc2088 # _ZTV12NonToVirtual + symbol_id: 0x486f617d # struct NonToVirtual non_to_virtual + symbol_id: 0x2d368ead # struct VirtualToNon virtual_to_non } diff --git a/test_cases/abigail_reader/composite/expected/virtual_only_base_class_cc.abi_stg b/test_cases/abigail_reader/composite/expected/virtual_only_base_class_cc.abi_stg index a294342..882accf 100644 --- a/test_cases/abigail_reader/composite/expected/virtual_only_base_class_cc.abi_stg +++ b/test_cases/abigail_reader/composite/expected/virtual_only_base_class_cc.abi_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x0b5e55a4 kind: POINTER - pointee_type_id: 0x0739b00c + pointee_type_id: 0x0739b00c # struct X } pointer_reference { id: 0x134ef871 kind: POINTER - pointee_type_id: 0x677b0759 + pointee_type_id: 0x677b0759 # struct Y } pointer_reference { id: 0xc65e4373 kind: LVALUE_REFERENCE - pointee_type_id: 0x0739b00c + pointee_type_id: 0x0739b00c # struct X } primitive { id: 0x6720d32f @@ -22,34 +22,34 @@ primitive { } base_class { id: 0x166ca3db - type_id: 0x0739b00c + type_id: 0x0739b00c # struct X inheritance: NON_VIRTUAL } method { id: 0x4dd47407 mangled_name: "_ZN1X1fEv" name: "f" - type_id: 0x9f577646 + type_id: 0x9f577646 # int(struct X*) } method { id: 0xb8b6ef68 mangled_name: "_ZN1X1gEv" name: "g" vtable_offset: 1 - type_id: 0x9f577646 + type_id: 0x9f577646 # int(struct X*) } method { id: 0x63c715c4 mangled_name: "_ZN1Y1fEv" name: "f" - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) } method { id: 0xe8e61433 mangled_name: "_ZN1Y1gEv" name: "g" vtable_offset: 1 - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) } struct_union { id: 0x0739b00c @@ -57,8 +57,8 @@ struct_union { name: "X" definition { bytesize: 8 - method_id: 0x4dd47407 - method_id: 0xb8b6ef68 + method_id: 0x4dd47407 # int f(struct X*) + method_id: 0xb8b6ef68 # int g(struct X*) } } struct_union { @@ -67,36 +67,36 @@ struct_union { name: "Y" definition { bytesize: 8 - base_class_id: 0x166ca3db - method_id: 0x63c715c4 - method_id: 0xe8e61433 + base_class_id: 0x166ca3db # struct X + method_id: 0x63c715c4 # int f(struct Y*) + method_id: 0xe8e61433 # int g(struct Y*) } } function { id: 0x99535d33 - return_type_id: 0x6720d32f - parameter_id: 0x134ef871 + return_type_id: 0x6720d32f # int + parameter_id: 0x134ef871 # struct Y* } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } function { id: 0x9f577646 - return_type_id: 0x6720d32f - parameter_id: 0x0b5e55a4 + return_type_id: 0x6720d32f # int + parameter_id: 0x0b5e55a4 # struct X* } function { id: 0xac1773f3 - return_type_id: 0x6720d32f - parameter_id: 0xc65e4373 + return_type_id: 0x6720d32f # int + parameter_id: 0xc65e4373 # struct X& } elf_symbol { id: 0x10da60a3 name: "_Z3foov" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "foo" } elf_symbol { @@ -104,7 +104,7 @@ elf_symbol { name: "_Z3funR1X" is_defined: true symbol_type: FUNCTION - type_id: 0xac1773f3 + type_id: 0xac1773f3 # int(struct X&) full_name: "fun" } elf_symbol { @@ -119,7 +119,7 @@ elf_symbol { name: "_ZN1Y1fEv" is_defined: true symbol_type: FUNCTION - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) full_name: "Y::f" } elf_symbol { @@ -127,7 +127,7 @@ elf_symbol { name: "_ZN1Y1gEv" is_defined: true symbol_type: FUNCTION - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) full_name: "Y::g" } elf_symbol { @@ -157,13 +157,13 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0x10da60a3 - symbol_id: 0xbc33871c - symbol_id: 0x0bbcf1df - symbol_id: 0x71a2fb93 - symbol_id: 0x938b5d81 - symbol_id: 0x8f2ed63c - symbol_id: 0x62dbf9a8 - symbol_id: 0x68f7d82f - symbol_id: 0x4df3aa88 + symbol_id: 0x10da60a3 # int foo() + symbol_id: 0xbc33871c # int fun(struct X&) + symbol_id: 0x0bbcf1df # _ZN1XC2Ev + symbol_id: 0x71a2fb93 # int Y::f(struct Y*) + symbol_id: 0x938b5d81 # int Y::g(struct Y*) + symbol_id: 0x8f2ed63c # _ZN1YC2Ev + symbol_id: 0x62dbf9a8 # _ZTI1Y + symbol_id: 0x68f7d82f # _ZTS1Y + symbol_id: 0x4df3aa88 # _ZTV1Y } diff --git a/test_cases/abigail_reader/enum/expected/anonymous_c.abi_stg b/test_cases/abigail_reader/enum/expected/anonymous_c.abi_stg index 3ff0d55..9184bc4 100644 --- a/test_cases/abigail_reader/enum/expected/anonymous_c.abi_stg +++ b/test_cases/abigail_reader/enum/expected/anonymous_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x398ea63b name: "unnamed-enum-underlying-type-32" @@ -8,7 +8,7 @@ primitive { enumeration { id: 0x52d563df definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "FOO_ZERO" } @@ -31,10 +31,10 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0x52d563df + type_id: 0x52d563df # enum { FOO_ZERO = 0, FOO_ONE = 1, FOO_TWO = 2, FOO_THREE = 3, } full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # enum { FOO_ZERO = 0, FOO_ONE = 1, FOO_TWO = 2, FOO_THREE = 3, } foo } diff --git a/test_cases/abigail_reader/enum/expected/declaration_only_c.abi_stg b/test_cases/abigail_reader/enum/expected/declaration_only_c.abi_stg index 01560cf..c3cfed3 100644 --- a/test_cases/abigail_reader/enum/expected/declaration_only_c.abi_stg +++ b/test_cases/abigail_reader/enum/expected/declaration_only_c.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x256d8564 kind: POINTER - pointee_type_id: 0xbff6f30c + pointee_type_id: 0xbff6f30c # enum Foo } enumeration { id: 0xbff6f30c @@ -14,10 +14,10 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0x256d8564 + type_id: 0x256d8564 # enum Foo* full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # enum Foo* foo } diff --git a/test_cases/abigail_reader/enum/expected/fixed_underlying_type_cc.abi_stg b/test_cases/abigail_reader/enum/expected/fixed_underlying_type_cc.abi_stg index 37f6c5d..2e32c8c 100644 --- a/test_cases/abigail_reader/enum/expected/fixed_underlying_type_cc.abi_stg +++ b/test_cases/abigail_reader/enum/expected/fixed_underlying_type_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x32ed1f25 name: "unnamed-enum-underlying-type-64" @@ -19,7 +19,7 @@ enumeration { id: 0xd3d36586 name: "A" definition { - underlying_type_id: 0x5e852ca5 + underlying_type_id: 0x5e852ca5 # unnamed-enum-underlying-type-8 enumerator { name: "Ae" } @@ -29,7 +29,7 @@ enumeration { id: 0x909102c3 name: "B" definition { - underlying_type_id: 0x32ed1f25 + underlying_type_id: 0x32ed1f25 # unnamed-enum-underlying-type-64 enumerator { name: "Be" } @@ -37,19 +37,19 @@ enumeration { } function { id: 0xf86de391 - return_type_id: 0x4585663f - parameter_id: 0xd3d36586 - parameter_id: 0x909102c3 + return_type_id: 0x4585663f # unsigned int + parameter_id: 0xd3d36586 # enum A + parameter_id: 0x909102c3 # enum B } elf_symbol { id: 0x1b84c9d2 name: "_Z3fun1A1B" is_defined: true symbol_type: FUNCTION - type_id: 0xf86de391 + type_id: 0xf86de391 # unsigned int(enum A, enum B) full_name: "fun" } interface { id: 0x84ea5130 - symbol_id: 0x1b84c9d2 + symbol_id: 0x1b84c9d2 # unsigned int fun(enum A, enum B) } diff --git a/test_cases/abigail_reader/enum/expected/limits_c.abi_stg b/test_cases/abigail_reader/enum/expected/limits_c.abi_stg index ce2b6f4..ed65f83 100644 --- a/test_cases/abigail_reader/enum/expected/limits_c.abi_stg +++ b/test_cases/abigail_reader/enum/expected/limits_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x32ed1f25 name: "unnamed-enum-underlying-type-64" @@ -14,7 +14,7 @@ enumeration { id: 0xd3d36586 name: "A" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "Ae" value: -2147483648 @@ -25,7 +25,7 @@ enumeration { id: 0x909102c3 name: "B" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "Be" value: -1 @@ -36,7 +36,7 @@ enumeration { id: 0x515c78f9 name: "C" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "Ce" value: 2147483647 @@ -47,7 +47,7 @@ enumeration { id: 0x181e741d name: "D" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "De" value: 2147483648 @@ -58,7 +58,7 @@ enumeration { id: 0xd8dfd34f name: "E" definition { - underlying_type_id: 0x32ed1f25 + underlying_type_id: 0x32ed1f25 # unnamed-enum-underlying-type-64 enumerator { name: "Ee" value: -9223372036854775808 @@ -69,7 +69,7 @@ enumeration { id: 0x9b93ce42 name: "F" definition { - underlying_type_id: 0x32ed1f25 + underlying_type_id: 0x32ed1f25 # unnamed-enum-underlying-type-64 enumerator { name: "Fe" value: 9223372036854775807 @@ -80,7 +80,7 @@ enumeration { id: 0x5a53132a name: "G" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "Ge" value: 16777216 @@ -91,7 +91,7 @@ enumeration { id: 0x3717ab70 name: "H" definition { - underlying_type_id: 0x32ed1f25 + underlying_type_id: 0x32ed1f25 # unnamed-enum-underlying-type-64 enumerator { name: "He" value: 281474976710656 @@ -102,7 +102,7 @@ enumeration { id: 0xe9d74c38 name: "I" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "Ie" value: 4294967295 @@ -113,7 +113,7 @@ enumeration { id: 0xaa901a01 name: "J" definition { - underlying_type_id: 0x32ed1f25 + underlying_type_id: 0x32ed1f25 # unnamed-enum-underlying-type-64 enumerator { name: "Je" value: -1 @@ -125,7 +125,7 @@ elf_symbol { name: "G" is_defined: true symbol_type: OBJECT - type_id: 0x5a53132a + type_id: 0x5a53132a # enum G full_name: "G" } elf_symbol { @@ -133,7 +133,7 @@ elf_symbol { name: "a" is_defined: true symbol_type: OBJECT - type_id: 0xd3d36586 + type_id: 0xd3d36586 # enum A full_name: "a" } elf_symbol { @@ -141,7 +141,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: OBJECT - type_id: 0x909102c3 + type_id: 0x909102c3 # enum B full_name: "b" } elf_symbol { @@ -149,7 +149,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0x515c78f9 + type_id: 0x515c78f9 # enum C full_name: "c" } elf_symbol { @@ -157,7 +157,7 @@ elf_symbol { name: "d" is_defined: true symbol_type: OBJECT - type_id: 0x181e741d + type_id: 0x181e741d # enum D full_name: "d" } elf_symbol { @@ -165,7 +165,7 @@ elf_symbol { name: "e" is_defined: true symbol_type: OBJECT - type_id: 0xd8dfd34f + type_id: 0xd8dfd34f # enum E full_name: "e" } elf_symbol { @@ -173,7 +173,7 @@ elf_symbol { name: "f" is_defined: true symbol_type: OBJECT - type_id: 0x9b93ce42 + type_id: 0x9b93ce42 # enum F full_name: "f" } elf_symbol { @@ -181,7 +181,7 @@ elf_symbol { name: "h" is_defined: true symbol_type: OBJECT - type_id: 0x3717ab70 + type_id: 0x3717ab70 # enum H full_name: "h" } elf_symbol { @@ -189,7 +189,7 @@ elf_symbol { name: "i" is_defined: true symbol_type: OBJECT - type_id: 0xe9d74c38 + type_id: 0xe9d74c38 # enum I full_name: "i" } elf_symbol { @@ -197,19 +197,19 @@ elf_symbol { name: "j" is_defined: true symbol_type: OBJECT - type_id: 0xaa901a01 + type_id: 0xaa901a01 # enum J full_name: "j" } interface { id: 0x84ea5130 - symbol_id: 0x79256de9 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x63f6f9b1 - symbol_id: 0xa2b65a7e - symbol_id: 0xe0778f95 - symbol_id: 0x68f3ac2c - symbol_id: 0xa9b30393 - symbol_id: 0xe98c5fb8 + symbol_id: 0x79256de9 # enum G G + symbol_id: 0xa7b0241d # enum A a + symbol_id: 0xe371117a # enum B b + symbol_id: 0x2230fb28 # enum C c + symbol_id: 0x63f6f9b1 # enum D d + symbol_id: 0xa2b65a7e # enum E e + symbol_id: 0xe0778f95 # enum F f + symbol_id: 0x68f3ac2c # enum H h + symbol_id: 0xa9b30393 # enum I i + symbol_id: 0xe98c5fb8 # enum J j } diff --git a/test_cases/abigail_reader/enum/expected/simple_c.abi_stg b/test_cases/abigail_reader/enum/expected/simple_c.abi_stg index 6456087..6b9626d 100644 --- a/test_cases/abigail_reader/enum/expected/simple_c.abi_stg +++ b/test_cases/abigail_reader/enum/expected/simple_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x398ea63b name: "unnamed-enum-underlying-type-32" @@ -9,7 +9,7 @@ enumeration { id: 0x226ff690 name: "Foo" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "FOO_ZERO" } @@ -32,10 +32,10 @@ elf_symbol { name: "bar" is_defined: true symbol_type: OBJECT - type_id: 0x226ff690 + type_id: 0x226ff690 # enum Foo full_name: "bar" } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 + symbol_id: 0xa58ca0b6 # enum Foo bar } diff --git a/test_cases/abigail_reader/function/expected/array_parameter_c.abi_stg b/test_cases/abigail_reader/function/expected/array_parameter_c.abi_stg index 31deca4..cb2a3ac 100644 --- a/test_cases/abigail_reader/function/expected/array_parameter_c.abi_stg +++ b/test_cases/abigail_reader/function/expected/array_parameter_c.abi_stg @@ -1,24 +1,24 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x0483e6f8 kind: POINTER - pointee_type_id: 0x384f7d7c + pointee_type_id: 0x384f7d7c # char } pointer_reference { id: 0x0fd17562 kind: POINTER - pointee_type_id: 0x15053314 + pointee_type_id: 0x15053314 # double } pointer_reference { id: 0x3593bec8 kind: POINTER - pointee_type_id: 0xfc0e1dbd + pointee_type_id: 0xfc0e1dbd # long } qualified { id: 0xd0ccb483 qualifier: CONST - qualified_type_id: 0x33756485 + qualified_type_id: 0x33756485 # unsigned long } primitive { id: 0x15053314 @@ -47,28 +47,28 @@ primitive { } function { id: 0x0fbdff1a - return_type_id: 0x384f7d7c - parameter_id: 0x3593bec8 + return_type_id: 0x384f7d7c # char + parameter_id: 0x3593bec8 # long* } function { id: 0x12af7c46 - return_type_id: 0x384f7d7c - parameter_id: 0x4585663f - parameter_id: 0x4585663f - parameter_id: 0x0483e6f8 + return_type_id: 0x384f7d7c # char + parameter_id: 0x4585663f # unsigned int + parameter_id: 0x4585663f # unsigned int + parameter_id: 0x0483e6f8 # char* } function { id: 0x13870cf2 - return_type_id: 0x384f7d7c - parameter_id: 0x4585663f - parameter_id: 0x0fd17562 + return_type_id: 0x384f7d7c # char + parameter_id: 0x4585663f # unsigned int + parameter_id: 0x0fd17562 # double* } elf_symbol { id: 0xa58ca0b6 name: "bar" is_defined: true symbol_type: FUNCTION - type_id: 0x0fbdff1a + type_id: 0x0fbdff1a # char(long*) full_name: "bar" } elf_symbol { @@ -76,7 +76,7 @@ elf_symbol { name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0x0fbdff1a + type_id: 0x0fbdff1a # char(long*) full_name: "foo" } elf_symbol { @@ -84,7 +84,7 @@ elf_symbol { name: "l" is_defined: true symbol_type: OBJECT - type_id: 0xd0ccb483 + type_id: 0xd0ccb483 # const unsigned long full_name: "l" } elf_symbol { @@ -92,7 +92,7 @@ elf_symbol { name: "quux" is_defined: true symbol_type: FUNCTION - type_id: 0x13870cf2 + type_id: 0x13870cf2 # char(unsigned int, double*) full_name: "quux" } elf_symbol { @@ -100,7 +100,7 @@ elf_symbol { name: "spong" is_defined: true symbol_type: FUNCTION - type_id: 0x13870cf2 + type_id: 0x13870cf2 # char(unsigned int, double*) full_name: "spong" } elf_symbol { @@ -108,15 +108,15 @@ elf_symbol { name: "wibble" is_defined: true symbol_type: FUNCTION - type_id: 0x12af7c46 + type_id: 0x12af7c46 # char(unsigned int, unsigned int, char*) full_name: "wibble" } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 - symbol_id: 0x06f8338c - symbol_id: 0x6df237e3 - symbol_id: 0x4602d7e1 - symbol_id: 0x376a8db4 - symbol_id: 0x3579f91c + symbol_id: 0xa58ca0b6 # char bar(long*) + symbol_id: 0x06f8338c # char foo(long*) + symbol_id: 0x6df237e3 # const unsigned long l + symbol_id: 0x4602d7e1 # char quux(unsigned int, double*) + symbol_id: 0x376a8db4 # char spong(unsigned int, double*) + symbol_id: 0x3579f91c # char wibble(unsigned int, unsigned int, char*) } diff --git a/test_cases/abigail_reader/function/expected/methods_cc.abi_stg b/test_cases/abigail_reader/function/expected/methods_cc.abi_stg index a935942..5455065 100644 --- a/test_cases/abigail_reader/function/expected/methods_cc.abi_stg +++ b/test_cases/abigail_reader/function/expected/methods_cc.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x07c134ac kind: POINTER - pointee_type_id: 0x3544342c + pointee_type_id: 0x3544342c # struct Func } primitive { id: 0x6720d32f @@ -18,7 +18,7 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x3544342c @@ -26,37 +26,37 @@ struct_union { name: "Func" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } function { id: 0x9c70ae04 - return_type_id: 0x6720d32f - parameter_id: 0x07c134ac + return_type_id: 0x6720d32f # int + parameter_id: 0x07c134ac # struct Func* } function { id: 0x9dec2d48 - return_type_id: 0x6720d32f - parameter_id: 0x07c134ac - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x07c134ac # struct Func* + parameter_id: 0x6720d32f # int } function { id: 0x9f809672 - return_type_id: 0x6720d32f - parameter_id: 0x07c134ac - parameter_id: 0xfc0e1dbd + return_type_id: 0x6720d32f # int + parameter_id: 0x07c134ac # struct Func* + parameter_id: 0xfc0e1dbd # long } function { id: 0xa6d076b2 - return_type_id: 0xfc0e1dbd - parameter_id: 0x07c134ac + return_type_id: 0xfc0e1dbd # long + parameter_id: 0x07c134ac # struct Func* } elf_symbol { id: 0x905e5cdc name: "_ZN4Func10remove_parEv" is_defined: true symbol_type: FUNCTION - type_id: 0x9c70ae04 + type_id: 0x9c70ae04 # int(struct Func*) full_name: "Func::remove_par" } elf_symbol { @@ -64,7 +64,7 @@ elf_symbol { name: "_ZN4Func10rename_newEv" is_defined: true symbol_type: FUNCTION - type_id: 0x9c70ae04 + type_id: 0x9c70ae04 # int(struct Func*) full_name: "Func::rename_new" } elf_symbol { @@ -72,7 +72,7 @@ elf_symbol { name: "_ZN4Func15change_par_nameEi" is_defined: true symbol_type: FUNCTION - type_id: 0x9dec2d48 + type_id: 0x9dec2d48 # int(struct Func*, int) full_name: "Func::change_par_name" } elf_symbol { @@ -80,7 +80,7 @@ elf_symbol { name: "_ZN4Func15change_par_typeEl" is_defined: true symbol_type: FUNCTION - type_id: 0x9f809672 + type_id: 0x9f809672 # int(struct Func*, long) full_name: "Func::change_par_type" } elf_symbol { @@ -88,7 +88,7 @@ elf_symbol { name: "_ZN4Func18change_return_typeEv" is_defined: true symbol_type: FUNCTION - type_id: 0xa6d076b2 + type_id: 0xa6d076b2 # long(struct Func*) full_name: "Func::change_return_type" } elf_symbol { @@ -96,7 +96,7 @@ elf_symbol { name: "_ZN4Func7add_parEi" is_defined: true symbol_type: FUNCTION - type_id: 0x9dec2d48 + type_id: 0x9dec2d48 # int(struct Func*, int) full_name: "Func::add_par" } elf_symbol { @@ -104,16 +104,16 @@ elf_symbol { name: "var" is_defined: true symbol_type: OBJECT - type_id: 0x3544342c + type_id: 0x3544342c # struct Func full_name: "var" } interface { id: 0x84ea5130 - symbol_id: 0x905e5cdc - symbol_id: 0xb2a4b8f4 - symbol_id: 0x3f2e69f4 - symbol_id: 0xae78d7be - symbol_id: 0x6168ec15 - symbol_id: 0x5f3f90d1 - symbol_id: 0x3997c6eb + symbol_id: 0x905e5cdc # int Func::remove_par(struct Func*) + symbol_id: 0xb2a4b8f4 # int Func::rename_new(struct Func*) + symbol_id: 0x3f2e69f4 # int Func::change_par_name(struct Func*, int) + symbol_id: 0xae78d7be # int Func::change_par_type(struct Func*, long) + symbol_id: 0x6168ec15 # long Func::change_return_type(struct Func*) + symbol_id: 0x5f3f90d1 # int Func::add_par(struct Func*, int) + symbol_id: 0x3997c6eb # struct Func var } diff --git a/test_cases/abigail_reader/function/expected/parameters_c.abi_stg b/test_cases/abigail_reader/function/expected/parameters_c.abi_stg index 30e3fa0..5b92356 100644 --- a/test_cases/abigail_reader/function/expected/parameters_c.abi_stg +++ b/test_cases/abigail_reader/function/expected/parameters_c.abi_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x2be339a0 kind: POINTER - pointee_type_id: 0x85cc001f + pointee_type_id: 0x85cc001f # int(int, int, int, int) } pointer_reference { id: 0x2be35e80 kind: POINTER - pointee_type_id: 0x85cd9c9c + pointee_type_id: 0x85cd9c9c # int(int, int, int) } pointer_reference { id: 0x2be52c8d kind: POINTER - pointee_type_id: 0x85d454a8 + pointee_type_id: 0x85d454a8 # int(int, int) } primitive { id: 0x6720d32f @@ -23,72 +23,72 @@ primitive { member { id: 0xab194353 name: "f01" - type_id: 0x2be52c8d + type_id: 0x2be52c8d # int(*)(int, int) } member { id: 0xe7582706 name: "f02" - type_id: 0x2be52c8d + type_id: 0x2be52c8d # int(*)(int, int) offset: 64 } member { id: 0x269f96e1 name: "f03" - type_id: 0x2be52c8d + type_id: 0x2be52c8d # int(*)(int, int) offset: 128 } member { id: 0x6edf7381 name: "f04" - type_id: 0x2be35e80 + type_id: 0x2be35e80 # int(*)(int, int, int) offset: 192 } member { id: 0xae1e0655 name: "f05" - type_id: 0x2be35e80 + type_id: 0x2be35e80 # int(*)(int, int, int) offset: 256 } member { id: 0xec5d8fef name: "f06" - type_id: 0x2be35e80 + type_id: 0x2be35e80 # int(*)(int, int, int) offset: 320 } member { id: 0x2d9d2928 name: "f07" - type_id: 0x2be35e80 + type_id: 0x2be35e80 # int(*)(int, int, int) offset: 384 } member { id: 0x7fd98f4c name: "f08" - type_id: 0x2be35e80 + type_id: 0x2be35e80 # int(*)(int, int, int) offset: 448 } member { id: 0xbd1a65d0 name: "f09" - type_id: 0x2be339a0 + type_id: 0x2be339a0 # int(*)(int, int, int, int) offset: 512 } member { id: 0x15949fa0 name: "f10" - type_id: 0x2be339a0 + type_id: 0x2be339a0 # int(*)(int, int, int, int) offset: 576 } member { id: 0xd553c44f name: "f11" - type_id: 0x2be339a0 + type_id: 0x2be339a0 # int(*)(int, int, int, int) offset: 640 } member { id: 0x94135c5f name: "f12" - type_id: 0x2be339a0 + type_id: 0x2be339a0 # int(*)(int, int, int, int) offset: 704 } struct_union { @@ -97,47 +97,47 @@ struct_union { name: "S" definition { bytesize: 96 - member_id: 0xab194353 - member_id: 0xe7582706 - member_id: 0x269f96e1 - member_id: 0x6edf7381 - member_id: 0xae1e0655 - member_id: 0xec5d8fef - member_id: 0x2d9d2928 - member_id: 0x7fd98f4c - member_id: 0xbd1a65d0 - member_id: 0x15949fa0 - member_id: 0xd553c44f - member_id: 0x94135c5f + member_id: 0xab194353 # int(* f01)(int, int) + member_id: 0xe7582706 # int(* f02)(int, int) + member_id: 0x269f96e1 # int(* f03)(int, int) + member_id: 0x6edf7381 # int(* f04)(int, int, int) + member_id: 0xae1e0655 # int(* f05)(int, int, int) + member_id: 0xec5d8fef # int(* f06)(int, int, int) + member_id: 0x2d9d2928 # int(* f07)(int, int, int) + member_id: 0x7fd98f4c # int(* f08)(int, int, int) + member_id: 0xbd1a65d0 # int(* f09)(int, int, int, int) + member_id: 0x15949fa0 # int(* f10)(int, int, int, int) + member_id: 0xd553c44f # int(* f11)(int, int, int, int) + member_id: 0x94135c5f # int(* f12)(int, int, int, int) } } function { id: 0x85cc001f - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85cd9c9c - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85d454a8 - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } elf_symbol { id: 0x8bf70937 name: "f01" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f01" } elf_symbol { @@ -145,7 +145,7 @@ elf_symbol { name: "f02" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f02" } elf_symbol { @@ -153,7 +153,7 @@ elf_symbol { name: "f03" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f03" } elf_symbol { @@ -161,7 +161,7 @@ elf_symbol { name: "f04" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f04" } elf_symbol { @@ -169,7 +169,7 @@ elf_symbol { name: "f05" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f05" } elf_symbol { @@ -177,7 +177,7 @@ elf_symbol { name: "f06" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f06" } elf_symbol { @@ -185,7 +185,7 @@ elf_symbol { name: "f07" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f07" } elf_symbol { @@ -193,7 +193,7 @@ elf_symbol { name: "f08" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f08" } elf_symbol { @@ -201,7 +201,7 @@ elf_symbol { name: "f09" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f09" } elf_symbol { @@ -209,7 +209,7 @@ elf_symbol { name: "f10" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f10" } elf_symbol { @@ -217,7 +217,7 @@ elf_symbol { name: "f11" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f11" } elf_symbol { @@ -225,7 +225,7 @@ elf_symbol { name: "f12" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f12" } elf_symbol { @@ -233,22 +233,22 @@ elf_symbol { name: "s" is_defined: true symbol_type: OBJECT - type_id: 0xf57dfbfc + type_id: 0xf57dfbfc # struct S full_name: "s" } interface { id: 0x84ea5130 - symbol_id: 0x8bf70937 - symbol_id: 0xcab4baef - symbol_id: 0x09745218 - symbol_id: 0xb2312b1c - symbol_id: 0x76f6b896 - symbol_id: 0x37b65de0 - symbol_id: 0xf477c0b7 - symbol_id: 0x4aca4031 - symbol_id: 0x858be3e5 - symbol_id: 0x288f47a4 - symbol_id: 0xe9cfbccb - symbol_id: 0xaf0c113b - symbol_id: 0x3e4f6c44 + symbol_id: 0x8bf70937 # int f01(int, int) + symbol_id: 0xcab4baef # int f02(int, int) + symbol_id: 0x09745218 # int f03(int, int) + symbol_id: 0xb2312b1c # int f04(int, int, int) + symbol_id: 0x76f6b896 # int f05(int, int, int) + symbol_id: 0x37b65de0 # int f06(int, int, int) + symbol_id: 0xf477c0b7 # int f07(int, int, int) + symbol_id: 0x4aca4031 # int f08(int, int, int) + symbol_id: 0x858be3e5 # int f09(int, int, int, int) + symbol_id: 0x288f47a4 # int f10(int, int, int, int) + symbol_id: 0xe9cfbccb # int f11(int, int, int, int) + symbol_id: 0xaf0c113b # int f12(int, int, int, int) + symbol_id: 0x3e4f6c44 # struct S s } diff --git a/test_cases/abigail_reader/function/expected/parameters_cc.abi_stg b/test_cases/abigail_reader/function/expected/parameters_cc.abi_stg index 37fa390..07dea80 100644 --- a/test_cases/abigail_reader/function/expected/parameters_cc.abi_stg +++ b/test_cases/abigail_reader/function/expected/parameters_cc.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x37cf4758 kind: POINTER - pointee_type_id: 0xf57dfbfc + pointee_type_id: 0xf57dfbfc # struct S } primitive { id: 0x6720d32f @@ -20,55 +20,55 @@ struct_union { } function { id: 0x85cc001f - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85cd9c9c - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85d454a8 - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x91f67981 - return_type_id: 0x6720d32f - parameter_id: 0x37cf4758 - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x37cf4758 # struct S* + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x91f7e502 - return_type_id: 0x6720d32f - parameter_id: 0x37cf4758 - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x37cf4758 # struct S* + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x91f7fcca - return_type_id: 0x6720d32f - parameter_id: 0x37cf4758 - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x37cf4758 # struct S* + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } elf_symbol { id: 0x04cd8675 name: "_Z3f01ii" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f01" } elf_symbol { @@ -76,7 +76,7 @@ elf_symbol { name: "_Z3f02ii" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f02" } elf_symbol { @@ -84,7 +84,7 @@ elf_symbol { name: "_Z3f03ii" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f03" } elf_symbol { @@ -92,7 +92,7 @@ elf_symbol { name: "_Z3f04iii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f04" } elf_symbol { @@ -100,7 +100,7 @@ elf_symbol { name: "_Z3f05iii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f05" } elf_symbol { @@ -108,7 +108,7 @@ elf_symbol { name: "_Z3f06iii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f06" } elf_symbol { @@ -116,7 +116,7 @@ elf_symbol { name: "_Z3f07iii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f07" } elf_symbol { @@ -124,7 +124,7 @@ elf_symbol { name: "_Z3f08iii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f08" } elf_symbol { @@ -132,7 +132,7 @@ elf_symbol { name: "_Z3f09iiii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f09" } elf_symbol { @@ -140,7 +140,7 @@ elf_symbol { name: "_Z3f10iiii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f10" } elf_symbol { @@ -148,7 +148,7 @@ elf_symbol { name: "_Z3f11iiii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f11" } elf_symbol { @@ -156,7 +156,7 @@ elf_symbol { name: "_Z3f12iiii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f12" } elf_symbol { @@ -164,7 +164,7 @@ elf_symbol { name: "_ZN1S3f01Eii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f67981 + type_id: 0x91f67981 # int(struct S*, int, int) full_name: "S::f01" } elf_symbol { @@ -172,7 +172,7 @@ elf_symbol { name: "_ZN1S3f02Eii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f67981 + type_id: 0x91f67981 # int(struct S*, int, int) full_name: "S::f02" } elf_symbol { @@ -180,7 +180,7 @@ elf_symbol { name: "_ZN1S3f03Eii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f67981 + type_id: 0x91f67981 # int(struct S*, int, int) full_name: "S::f03" } elf_symbol { @@ -188,7 +188,7 @@ elf_symbol { name: "_ZN1S3f04Eiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7e502 + type_id: 0x91f7e502 # int(struct S*, int, int, int) full_name: "S::f04" } elf_symbol { @@ -196,7 +196,7 @@ elf_symbol { name: "_ZN1S3f05Eiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7e502 + type_id: 0x91f7e502 # int(struct S*, int, int, int) full_name: "S::f05" } elf_symbol { @@ -204,7 +204,7 @@ elf_symbol { name: "_ZN1S3f06Eiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7e502 + type_id: 0x91f7e502 # int(struct S*, int, int, int) full_name: "S::f06" } elf_symbol { @@ -212,7 +212,7 @@ elf_symbol { name: "_ZN1S3f07Eiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7e502 + type_id: 0x91f7e502 # int(struct S*, int, int, int) full_name: "S::f07" } elf_symbol { @@ -220,7 +220,7 @@ elf_symbol { name: "_ZN1S3f08Eiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7e502 + type_id: 0x91f7e502 # int(struct S*, int, int, int) full_name: "S::f08" } elf_symbol { @@ -228,7 +228,7 @@ elf_symbol { name: "_ZN1S3f09Eiiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7fcca + type_id: 0x91f7fcca # int(struct S*, int, int, int, int) full_name: "S::f09" } elf_symbol { @@ -236,7 +236,7 @@ elf_symbol { name: "_ZN1S3f10Eiiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7fcca + type_id: 0x91f7fcca # int(struct S*, int, int, int, int) full_name: "S::f10" } elf_symbol { @@ -244,7 +244,7 @@ elf_symbol { name: "_ZN1S3f11Eiiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7fcca + type_id: 0x91f7fcca # int(struct S*, int, int, int, int) full_name: "S::f11" } elf_symbol { @@ -252,7 +252,7 @@ elf_symbol { name: "_ZN1S3f12Eiiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7fcca + type_id: 0x91f7fcca # int(struct S*, int, int, int, int) full_name: "S::f12" } elf_symbol { @@ -260,34 +260,34 @@ elf_symbol { name: "s" is_defined: true symbol_type: OBJECT - type_id: 0xf57dfbfc + type_id: 0xf57dfbfc # struct S full_name: "s" } interface { id: 0x84ea5130 - symbol_id: 0x04cd8675 - symbol_id: 0xd8e7287e - symbol_id: 0x62b93d25 - symbol_id: 0x6d85d90a - symbol_id: 0x3e906889 - symbol_id: 0xdf3dae94 - symbol_id: 0x8242169f - symbol_id: 0xa02977d3 - symbol_id: 0xacc46d56 - symbol_id: 0x19eecc21 - symbol_id: 0xcaac68ac - symbol_id: 0x9dac9678 - symbol_id: 0xb6104462 - symbol_id: 0xe096747f - symbol_id: 0xe75212ee - symbol_id: 0x3f66b497 - symbol_id: 0xba6389ba - symbol_id: 0x9bfbfd6f - symbol_id: 0x7e444f5b - symbol_id: 0x1cea5f3c - symbol_id: 0xf68e705e - symbol_id: 0xb296d732 - symbol_id: 0x12addaa8 - symbol_id: 0xb0e58223 - symbol_id: 0x3e4f6c44 + symbol_id: 0x04cd8675 # int f01(int, int) + symbol_id: 0xd8e7287e # int f02(int, int) + symbol_id: 0x62b93d25 # int f03(int, int) + symbol_id: 0x6d85d90a # int f04(int, int, int) + symbol_id: 0x3e906889 # int f05(int, int, int) + symbol_id: 0xdf3dae94 # int f06(int, int, int) + symbol_id: 0x8242169f # int f07(int, int, int) + symbol_id: 0xa02977d3 # int f08(int, int, int) + symbol_id: 0xacc46d56 # int f09(int, int, int, int) + symbol_id: 0x19eecc21 # int f10(int, int, int, int) + symbol_id: 0xcaac68ac # int f11(int, int, int, int) + symbol_id: 0x9dac9678 # int f12(int, int, int, int) + symbol_id: 0xb6104462 # int S::f01(struct S*, int, int) + symbol_id: 0xe096747f # int S::f02(struct S*, int, int) + symbol_id: 0xe75212ee # int S::f03(struct S*, int, int) + symbol_id: 0x3f66b497 # int S::f04(struct S*, int, int, int) + symbol_id: 0xba6389ba # int S::f05(struct S*, int, int, int) + symbol_id: 0x9bfbfd6f # int S::f06(struct S*, int, int, int) + symbol_id: 0x7e444f5b # int S::f07(struct S*, int, int, int) + symbol_id: 0x1cea5f3c # int S::f08(struct S*, int, int, int) + symbol_id: 0xf68e705e # int S::f09(struct S*, int, int, int, int) + symbol_id: 0xb296d732 # int S::f10(struct S*, int, int, int, int) + symbol_id: 0x12addaa8 # int S::f11(struct S*, int, int, int, int) + symbol_id: 0xb0e58223 # int S::f12(struct S*, int, int, int, int) + symbol_id: 0x3e4f6c44 # struct S s } diff --git a/test_cases/abigail_reader/function/expected/static_method_cc.abi_stg b/test_cases/abigail_reader/function/expected/static_method_cc.abi_stg index 6c4b4b3..cde866c 100644 --- a/test_cases/abigail_reader/function/expected/static_method_cc.abi_stg +++ b/test_cases/abigail_reader/function/expected/static_method_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,7 +8,7 @@ primitive { member { id: 0x8dbf3d30 name: "m" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0xf6f304f7 @@ -16,19 +16,19 @@ struct_union { name: "Foo" definition { bytesize: 4 - member_id: 0x8dbf3d30 + member_id: 0x8dbf3d30 # int m } } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0xdb2df0ad name: "_ZN3Foo3barE" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "Foo::bar" } elf_symbol { @@ -36,7 +36,7 @@ elf_symbol { name: "_ZN3Foo3bazEv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "Foo::baz" } elf_symbol { @@ -44,12 +44,12 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0xf6f304f7 + type_id: 0xf6f304f7 # struct Foo full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0xdb2df0ad - symbol_id: 0x39ee62e8 - symbol_id: 0x06f8338c + symbol_id: 0xdb2df0ad # int Foo::bar + symbol_id: 0x39ee62e8 # int Foo::baz() + symbol_id: 0x06f8338c # struct Foo foo } diff --git a/test_cases/abigail_reader/function/expected/variadic_parameter_cc.abi_stg b/test_cases/abigail_reader/function/expected/variadic_parameter_cc.abi_stg index aa50bad..de9be16 100644 --- a/test_cases/abigail_reader/function/expected/variadic_parameter_cc.abi_stg +++ b/test_cases/abigail_reader/function/expected/variadic_parameter_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0xa52a0930 kind: VARIADIC @@ -11,34 +11,34 @@ primitive { } function { id: 0x85d454a8 - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85fd1e2a - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0xa52a0930 + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0xa52a0930 # ... } function { id: 0x86dc7fc0 - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0xa52a0930 + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0xa52a0930 # ... } function { id: 0xb4ca6163 - return_type_id: 0x6720d32f - parameter_id: 0xa52a0930 + return_type_id: 0x6720d32f # int + parameter_id: 0xa52a0930 # ... } elf_symbol { id: 0xcac6ee98 name: "_Z4foo1iiz" is_defined: true symbol_type: FUNCTION - type_id: 0x85fd1e2a + type_id: 0x85fd1e2a # int(int, int, ...) full_name: "foo1" } elf_symbol { @@ -46,7 +46,7 @@ elf_symbol { name: "_Z4foo2iz" is_defined: true symbol_type: FUNCTION - type_id: 0x86dc7fc0 + type_id: 0x86dc7fc0 # int(int, ...) full_name: "foo2" } elf_symbol { @@ -54,7 +54,7 @@ elf_symbol { name: "_Z4foo3ii" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "foo3" } elf_symbol { @@ -62,13 +62,13 @@ elf_symbol { name: "_Z4foo4z" is_defined: true symbol_type: FUNCTION - type_id: 0xb4ca6163 + type_id: 0xb4ca6163 # int(...) full_name: "foo4" } interface { id: 0x84ea5130 - symbol_id: 0xcac6ee98 - symbol_id: 0xa5cf8676 - symbol_id: 0x2522c6f3 - symbol_id: 0x16a736d0 + symbol_id: 0xcac6ee98 # int foo1(int, int, ...) + symbol_id: 0xa5cf8676 # int foo2(int, ...) + symbol_id: 0x2522c6f3 # int foo3(int, int) + symbol_id: 0x16a736d0 # int foo4(...) } diff --git a/test_cases/abigail_reader/function/expected/virtual_method_cc.abi_stg b/test_cases/abigail_reader/function/expected/virtual_method_cc.abi_stg index 12b5c7d..534a411 100644 --- a/test_cases/abigail_reader/function/expected/virtual_method_cc.abi_stg +++ b/test_cases/abigail_reader/function/expected/virtual_method_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,20 +7,20 @@ special { pointer_reference { id: 0x372cf89a kind: POINTER - pointee_type_id: 0xf6f304f7 + pointee_type_id: 0xf6f304f7 # struct Foo } method { id: 0x91a60460 mangled_name: "_ZN3Foo3barEv" name: "bar" - type_id: 0x1d536fb5 + type_id: 0x1d536fb5 # void(struct Foo*) } method { id: 0x3bae9a68 mangled_name: "_ZN3Foo3bazEv" name: "baz" vtable_offset: 1 - type_id: 0x1d536fb5 + type_id: 0x1d536fb5 # void(struct Foo*) } struct_union { id: 0xf6f304f7 @@ -28,21 +28,21 @@ struct_union { name: "Foo" definition { bytesize: 8 - method_id: 0x91a60460 - method_id: 0x3bae9a68 + method_id: 0x91a60460 # void bar(struct Foo*) + method_id: 0x3bae9a68 # void baz(struct Foo*) } } function { id: 0x1d536fb5 - return_type_id: 0x48b5725f - parameter_id: 0x372cf89a + return_type_id: 0x48b5725f # void + parameter_id: 0x372cf89a # struct Foo* } elf_symbol { id: 0x043f549e name: "_ZN3Foo3barEv" is_defined: true symbol_type: FUNCTION - type_id: 0x1d536fb5 + type_id: 0x1d536fb5 # void(struct Foo*) full_name: "Foo::bar" } elf_symbol { @@ -50,7 +50,7 @@ elf_symbol { name: "_ZN3Foo3bazEv" is_defined: true symbol_type: FUNCTION - type_id: 0x1d536fb5 + type_id: 0x1d536fb5 # void(struct Foo*) full_name: "Foo::baz" } elf_symbol { @@ -76,15 +76,15 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0xf6f304f7 + type_id: 0xf6f304f7 # struct Foo full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x043f549e - symbol_id: 0x39ee62e8 - symbol_id: 0x263987d0 - symbol_id: 0x264c5a0d - symbol_id: 0x9e36cb56 - symbol_id: 0x06f8338c + symbol_id: 0x043f549e # void Foo::bar(struct Foo*) + symbol_id: 0x39ee62e8 # void Foo::baz(struct Foo*) + symbol_id: 0x263987d0 # _ZTI3Foo + symbol_id: 0x264c5a0d # _ZTS3Foo + symbol_id: 0x9e36cb56 # _ZTV3Foo + symbol_id: 0x06f8338c # struct Foo foo } diff --git a/test_cases/abigail_reader/member/expected/member_types_cc.abi_stg b/test_cases/abigail_reader/member/expected/member_types_cc.abi_stg index 1d5392c..c3dd546 100644 --- a/test_cases/abigail_reader/member/expected/member_types_cc.abi_stg +++ b/test_cases/abigail_reader/member/expected/member_types_cc.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x4cf6e5b0 name: "Scope::TypedefDecl" - referred_type_id: 0xfc0e1dbd + referred_type_id: 0xfc0e1dbd # long } primitive { id: 0x398ea63b @@ -18,7 +18,7 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0xcaaeb4e7 @@ -26,7 +26,7 @@ struct_union { name: "Scope::ClassDecl" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -35,7 +35,7 @@ struct_union { name: "Scope::StructDecl" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -44,14 +44,14 @@ struct_union { name: "Scope::UnionDecl" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } enumeration { id: 0x83c8a573 name: "Scope::EnumDecl" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "X" value: 2 @@ -63,7 +63,7 @@ elf_symbol { name: "class_decl" is_defined: true symbol_type: OBJECT - type_id: 0xcaaeb4e7 + type_id: 0xcaaeb4e7 # struct Scope::ClassDecl full_name: "class_decl" } elf_symbol { @@ -71,7 +71,7 @@ elf_symbol { name: "enum_decl" is_defined: true symbol_type: OBJECT - type_id: 0x83c8a573 + type_id: 0x83c8a573 # enum Scope::EnumDecl full_name: "enum_decl" } elf_symbol { @@ -79,7 +79,7 @@ elf_symbol { name: "struct_decl" is_defined: true symbol_type: OBJECT - type_id: 0x7c169231 + type_id: 0x7c169231 # struct Scope::StructDecl full_name: "struct_decl" } elf_symbol { @@ -87,7 +87,7 @@ elf_symbol { name: "typedef_decl" is_defined: true symbol_type: OBJECT - type_id: 0x4cf6e5b0 + type_id: 0x4cf6e5b0 # Scope::TypedefDecl full_name: "typedef_decl" } elf_symbol { @@ -95,14 +95,14 @@ elf_symbol { name: "union_decl" is_defined: true symbol_type: OBJECT - type_id: 0xb493105f + type_id: 0xb493105f # union Scope::UnionDecl full_name: "union_decl" } interface { id: 0x84ea5130 - symbol_id: 0x477e22e9 - symbol_id: 0xd58568f2 - symbol_id: 0x2e5e5d2a - symbol_id: 0xb9b8f74f - symbol_id: 0xc1804b63 + symbol_id: 0x477e22e9 # struct Scope::ClassDecl class_decl + symbol_id: 0xd58568f2 # enum Scope::EnumDecl enum_decl + symbol_id: 0x2e5e5d2a # struct Scope::StructDecl struct_decl + symbol_id: 0xb9b8f74f # Scope::TypedefDecl typedef_decl + symbol_id: 0xc1804b63 # union Scope::UnionDecl union_decl } diff --git a/test_cases/abigail_reader/member/expected/pointer_to_member_cc.abi_stg b/test_cases/abigail_reader/member/expected/pointer_to_member_cc.abi_stg index 37bf79e..8474ce5 100644 --- a/test_cases/abigail_reader/member/expected/pointer_to_member_cc.abi_stg +++ b/test_cases/abigail_reader/member/expected/pointer_to_member_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,18 +7,18 @@ special { pointer_reference { id: 0x0eb62dc3 kind: POINTER - pointee_type_id: 0x10985193 + pointee_type_id: 0x10985193 # void() } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0xba0e5cd0 name: "_Z2s2v" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "s2" } elf_symbol { @@ -26,7 +26,7 @@ elf_symbol { name: "_Z7pmz_funv" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "pmz_fun" } elf_symbol { @@ -88,7 +88,7 @@ elf_symbol { name: "s3" is_defined: true symbol_type: OBJECT - type_id: 0x0eb62dc3 + type_id: 0x0eb62dc3 # void(*)() full_name: "s3" } elf_symbol { @@ -129,22 +129,22 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0xba0e5cd0 - symbol_id: 0x13e4cc52 - symbol_id: 0x648621f2 - symbol_id: 0xff819903 - symbol_id: 0x2ec71519 - symbol_id: 0xa0583676 - symbol_id: 0xfd020c80 - symbol_id: 0xf60097d9 - symbol_id: 0xc90bc4a4 - symbol_id: 0xdaa14405 - symbol_id: 0x1660e091 - symbol_id: 0x9be13bad - symbol_id: 0xd5a33a44 - symbol_id: 0x136353fe - symbol_id: 0x57200721 - symbol_id: 0x94e3994e - symbol_id: 0xd0a5df97 - symbol_id: 0x3065441f + symbol_id: 0xba0e5cd0 # void s2() + symbol_id: 0x13e4cc52 # void pmz_fun() + symbol_id: 0x648621f2 # pmc + symbol_id: 0xff819903 # pmcu + symbol_id: 0x2ec71519 # pmd + symbol_id: 0xa0583676 # pmf + symbol_id: 0xfd020c80 # pmi + symbol_id: 0xf60097d9 # pmu + symbol_id: 0xc90bc4a4 # pmy + symbol_id: 0xdaa14405 # s0 + symbol_id: 0x1660e091 # s1 + symbol_id: 0x9be13bad # void(* s3)() + symbol_id: 0xd5a33a44 # s4 + symbol_id: 0x136353fe # s5 + symbol_id: 0x57200721 # s6 + symbol_id: 0x94e3994e # s7 + symbol_id: 0xd0a5df97 # s8 + symbol_id: 0x3065441f # s9 } diff --git a/test_cases/abigail_reader/misc/expected/enum_c.abi_stg b/test_cases/abigail_reader/misc/expected/enum_c.abi_stg index aa91405..655ed73 100644 --- a/test_cases/abigail_reader/misc/expected/enum_c.abi_stg +++ b/test_cases/abigail_reader/misc/expected/enum_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x398ea63b name: "unnamed-enum-underlying-type-32" @@ -9,7 +9,7 @@ enumeration { id: 0x226ff690 name: "Foo" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "FOO_ONE" value: 1 @@ -30,18 +30,18 @@ enumeration { } function { id: 0x97c8da2d - return_type_id: 0x226ff690 - parameter_id: 0x226ff690 + return_type_id: 0x226ff690 # enum Foo + parameter_id: 0x226ff690 # enum Foo } elf_symbol { id: 0xdfa4312b name: "getEnum" is_defined: true symbol_type: FUNCTION - type_id: 0x97c8da2d + type_id: 0x97c8da2d # enum Foo(enum Foo) full_name: "getEnum" } interface { id: 0x84ea5130 - symbol_id: 0xdfa4312b + symbol_id: 0xdfa4312b # enum Foo getEnum(enum Foo) } diff --git a/test_cases/abigail_reader/misc/expected/enum_cc.abi_stg b/test_cases/abigail_reader/misc/expected/enum_cc.abi_stg index c69ce16..f9bf878 100644 --- a/test_cases/abigail_reader/misc/expected/enum_cc.abi_stg +++ b/test_cases/abigail_reader/misc/expected/enum_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,12 +7,12 @@ special { pointer_reference { id: 0xf3bba530 kind: LVALUE_REFERENCE - pointee_type_id: 0xd0ae2902 + pointee_type_id: 0xd0ae2902 # const enum Colour } qualified { id: 0xd0ae2902 qualifier: CONST - qualified_type_id: 0x32ff1281 + qualified_type_id: 0x32ff1281 # enum Colour } primitive { id: 0x5e852ca5 @@ -23,7 +23,7 @@ enumeration { id: 0x32ff1281 name: "Colour" definition { - underlying_type_id: 0x5e852ca5 + underlying_type_id: 0x5e852ca5 # unnamed-enum-underlying-type-8 enumerator { name: "red" } @@ -39,18 +39,18 @@ enumeration { } function { id: 0x2c76b8df - return_type_id: 0x48b5725f - parameter_id: 0xf3bba530 + return_type_id: 0x48b5725f # void + parameter_id: 0xf3bba530 # const enum Colour& } elf_symbol { id: 0x80272d52 name: "_Z3fooRK6Colour" is_defined: true symbol_type: FUNCTION - type_id: 0x2c76b8df + type_id: 0x2c76b8df # void(const enum Colour&) full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x80272d52 + symbol_id: 0x80272d52 # void foo(const enum Colour&) } diff --git a/test_cases/abigail_reader/misc/expected/enum_const_c.abi_stg b/test_cases/abigail_reader/misc/expected/enum_const_c.abi_stg index 9378ee7..b89f2a5 100644 --- a/test_cases/abigail_reader/misc/expected/enum_const_c.abi_stg +++ b/test_cases/abigail_reader/misc/expected/enum_const_c.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x7d386fee name: "Foo" - referred_type_id: 0x226ff690 + referred_type_id: 0x226ff690 # enum Foo } primitive { id: 0x398ea63b @@ -14,7 +14,7 @@ enumeration { id: 0x226ff690 name: "Foo" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "FOO_ONE" value: 1 @@ -31,18 +31,18 @@ enumeration { } function { id: 0xe47b32e5 - return_type_id: 0x7d386fee - parameter_id: 0x7d386fee + return_type_id: 0x7d386fee # Foo + parameter_id: 0x7d386fee # Foo } elf_symbol { id: 0xdfa4312b name: "getEnum" is_defined: true symbol_type: FUNCTION - type_id: 0xe47b32e5 + type_id: 0xe47b32e5 # Foo(Foo) full_name: "getEnum" } interface { id: 0x84ea5130 - symbol_id: 0xdfa4312b + symbol_id: 0xdfa4312b # Foo getEnum(Foo) } diff --git a/test_cases/abigail_reader/namespace/expected/nested_anonymous_types_cc.abi_stg b/test_cases/abigail_reader/namespace/expected/nested_anonymous_types_cc.abi_stg index 917feb5..f94725a 100644 --- a/test_cases/abigail_reader/namespace/expected/nested_anonymous_types_cc.abi_stg +++ b/test_cases/abigail_reader/namespace/expected/nested_anonymous_types_cc.abi_stg @@ -1,24 +1,24 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0xc7d29913 name: "Scope::AnonClass" - referred_type_id: 0x307fdda9 + referred_type_id: 0x307fdda9 # struct { long x; } } typedef { id: 0x9d6a1225 name: "Scope::AnonEnum" - referred_type_id: 0x7bdf7a79 + referred_type_id: 0x7bdf7a79 # enum { X = 2, } } typedef { id: 0xa7b0b85b name: "Scope::AnonStruct" - referred_type_id: 0x307fdda9 + referred_type_id: 0x307fdda9 # struct { long x; } } typedef { id: 0x0ffeca80 name: "Scope::AnonUnion" - referred_type_id: 0x7ee944b3 + referred_type_id: 0x7ee944b3 # union { long x; } } primitive { id: 0x398ea63b @@ -33,14 +33,14 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x307fdda9 kind: STRUCT definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -48,13 +48,13 @@ struct_union { kind: UNION definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } enumeration { id: 0x7bdf7a79 definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "X" value: 2 @@ -66,7 +66,7 @@ elf_symbol { name: "anon_class" is_defined: true symbol_type: OBJECT - type_id: 0xc7d29913 + type_id: 0xc7d29913 # Scope::AnonClass full_name: "anon_class" } elf_symbol { @@ -74,7 +74,7 @@ elf_symbol { name: "anon_enum" is_defined: true symbol_type: OBJECT - type_id: 0x9d6a1225 + type_id: 0x9d6a1225 # Scope::AnonEnum full_name: "anon_enum" } elf_symbol { @@ -82,7 +82,7 @@ elf_symbol { name: "anon_struct" is_defined: true symbol_type: OBJECT - type_id: 0xa7b0b85b + type_id: 0xa7b0b85b # Scope::AnonStruct full_name: "anon_struct" } elf_symbol { @@ -90,13 +90,13 @@ elf_symbol { name: "anon_union" is_defined: true symbol_type: OBJECT - type_id: 0x0ffeca80 + type_id: 0x0ffeca80 # Scope::AnonUnion full_name: "anon_union" } interface { id: 0x84ea5130 - symbol_id: 0x27c36e84 - symbol_id: 0xbf616178 - symbol_id: 0x13b082fd - symbol_id: 0x5465a5f8 + symbol_id: 0x27c36e84 # Scope::AnonClass anon_class + symbol_id: 0xbf616178 # Scope::AnonEnum anon_enum + symbol_id: 0x13b082fd # Scope::AnonStruct anon_struct + symbol_id: 0x5465a5f8 # Scope::AnonUnion anon_union } diff --git a/test_cases/abigail_reader/namespace/expected/nested_cc.abi_stg b/test_cases/abigail_reader/namespace/expected/nested_cc.abi_stg index 7921eb3..1f5e889 100644 --- a/test_cases/abigail_reader/namespace/expected/nested_cc.abi_stg +++ b/test_cases/abigail_reader/namespace/expected/nested_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xfc0e1dbd name: "long" @@ -8,7 +8,7 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0xe765e7d3 @@ -16,7 +16,7 @@ struct_union { name: "foo::str" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -25,7 +25,7 @@ struct_union { name: "n1::n2::n3::str" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } elf_symbol { @@ -33,7 +33,7 @@ elf_symbol { name: "_ZN2n12n22n35var_nE" is_defined: true symbol_type: OBJECT - type_id: 0xe4ac9186 + type_id: 0xe4ac9186 # struct n1::n2::n3::str full_name: "n1::n2::n3::var_n" } elf_symbol { @@ -41,7 +41,7 @@ elf_symbol { name: "_ZN2n12n22n37var_fooE" is_defined: true symbol_type: OBJECT - type_id: 0xe765e7d3 + type_id: 0xe765e7d3 # struct foo::str full_name: "n1::n2::n3::var_foo" } elf_symbol { @@ -49,7 +49,7 @@ elf_symbol { name: "_ZN2n12n27var_fooE" is_defined: true symbol_type: OBJECT - type_id: 0xe765e7d3 + type_id: 0xe765e7d3 # struct foo::str full_name: "n1::n2::var_foo" } elf_symbol { @@ -57,7 +57,7 @@ elf_symbol { name: "_ZN2n17var_fooE" is_defined: true symbol_type: OBJECT - type_id: 0xe765e7d3 + type_id: 0xe765e7d3 # struct foo::str full_name: "n1::var_foo" } elf_symbol { @@ -65,7 +65,7 @@ elf_symbol { name: "_ZN3foo7var_fooE" is_defined: true symbol_type: OBJECT - type_id: 0xe765e7d3 + type_id: 0xe765e7d3 # struct foo::str full_name: "foo::var_foo" } elf_symbol { @@ -73,7 +73,7 @@ elf_symbol { name: "var_foo" is_defined: true symbol_type: OBJECT - type_id: 0xe765e7d3 + type_id: 0xe765e7d3 # struct foo::str full_name: "var_foo" } elf_symbol { @@ -81,16 +81,16 @@ elf_symbol { name: "var_n" is_defined: true symbol_type: OBJECT - type_id: 0xe4ac9186 + type_id: 0xe4ac9186 # struct n1::n2::n3::str full_name: "var_n" } interface { id: 0x84ea5130 - symbol_id: 0x36450b1b - symbol_id: 0x3de752de - symbol_id: 0xa7d38296 - symbol_id: 0x17ba9f4f - symbol_id: 0xe093a53a - symbol_id: 0x685e3a30 - symbol_id: 0x9bc7e018 + symbol_id: 0x36450b1b # struct n1::n2::n3::str n1::n2::n3::var_n + symbol_id: 0x3de752de # struct foo::str n1::n2::n3::var_foo + symbol_id: 0xa7d38296 # struct foo::str n1::n2::var_foo + symbol_id: 0x17ba9f4f # struct foo::str n1::var_foo + symbol_id: 0xe093a53a # struct foo::str foo::var_foo + symbol_id: 0x685e3a30 # struct foo::str var_foo + symbol_id: 0x9bc7e018 # struct n1::n2::n3::str var_n } diff --git a/test_cases/abigail_reader/namespace/expected/simple_cc.abi_stg b/test_cases/abigail_reader/namespace/expected/simple_cc.abi_stg index 55a5cda..04ce99e 100644 --- a/test_cases/abigail_reader/namespace/expected/simple_cc.abi_stg +++ b/test_cases/abigail_reader/namespace/expected/simple_cc.abi_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0xbc115339 name: "foo::type_definition" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } qualified { id: 0xc5d9d969 qualifier: CONST - qualified_type_id: 0x6720d32f + qualified_type_id: 0x6720d32f # int } primitive { id: 0x398ea63b @@ -23,12 +23,12 @@ primitive { array { id: 0xf0341a7a number_of_elements: 5 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } member { id: 0xa0d54b05 name: "x" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0x3ba6625d @@ -36,7 +36,7 @@ struct_union { name: "foo::S" definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } struct_union { @@ -45,14 +45,14 @@ struct_union { name: "foo::U" definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } enumeration { id: 0x249cfa0e name: "foo::E" definition { - underlying_type_id: 0x398ea63b + underlying_type_id: 0x398ea63b # unnamed-enum-underlying-type-32 enumerator { name: "X" } @@ -64,14 +64,14 @@ enumeration { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x582117f7 name: "_ZN3foo2x1E" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "foo::x1" } elf_symbol { @@ -79,7 +79,7 @@ elf_symbol { name: "_ZN3foo2x2E" is_defined: true symbol_type: OBJECT - type_id: 0xf0341a7a + type_id: 0xf0341a7a # int[5] full_name: "foo::x2" } elf_symbol { @@ -87,7 +87,7 @@ elf_symbol { name: "_ZN3foo2x3E" is_defined: true symbol_type: OBJECT - type_id: 0xc5d9d969 + type_id: 0xc5d9d969 # const int full_name: "foo::x3" } elf_symbol { @@ -95,7 +95,7 @@ elf_symbol { name: "_ZN3foo2x4E" is_defined: true symbol_type: OBJECT - type_id: 0xbc115339 + type_id: 0xbc115339 # foo::type_definition full_name: "foo::x4" } elf_symbol { @@ -103,7 +103,7 @@ elf_symbol { name: "_ZN3foo2x5Ev" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "foo::x5" } elf_symbol { @@ -111,7 +111,7 @@ elf_symbol { name: "_ZN3foo2x6E" is_defined: true symbol_type: OBJECT - type_id: 0x3ba6625d + type_id: 0x3ba6625d # struct foo::S full_name: "foo::x6" } elf_symbol { @@ -119,7 +119,7 @@ elf_symbol { name: "_ZN3foo2x7E" is_defined: true symbol_type: OBJECT - type_id: 0xf05bf1c2 + type_id: 0xf05bf1c2 # union foo::U full_name: "foo::x7" } elf_symbol { @@ -127,17 +127,17 @@ elf_symbol { name: "_ZN3foo2x8E" is_defined: true symbol_type: OBJECT - type_id: 0x249cfa0e + type_id: 0x249cfa0e # enum foo::E full_name: "foo::x8" } interface { id: 0x84ea5130 - symbol_id: 0x582117f7 - symbol_id: 0x717ce2f2 - symbol_id: 0x4a892240 - symbol_id: 0x4ec44cf8 - symbol_id: 0x4d2c388b - symbol_id: 0x4e82b74d - symbol_id: 0x60294099 - symbol_id: 0x59b8d44f + symbol_id: 0x582117f7 # int foo::x1 + symbol_id: 0x717ce2f2 # int foo::x2[5] + symbol_id: 0x4a892240 # const int foo::x3 + symbol_id: 0x4ec44cf8 # foo::type_definition foo::x4 + symbol_id: 0x4d2c388b # int foo::x5() + symbol_id: 0x4e82b74d # struct foo::S foo::x6 + symbol_id: 0x60294099 # union foo::U foo::x7 + symbol_id: 0x59b8d44f # enum foo::E foo::x8 } diff --git a/test_cases/abigail_reader/namespace/expected/using_namespace_in_function_cc.abi_stg b/test_cases/abigail_reader/namespace/expected/using_namespace_in_function_cc.abi_stg index 0a94e39..40cfa60 100644 --- a/test_cases/abigail_reader/namespace/expected/using_namespace_in_function_cc.abi_stg +++ b/test_cases/abigail_reader/namespace/expected/using_namespace_in_function_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -7,17 +7,17 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 + symbol_id: 0x92009dc1 # int bar() } 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 } diff --git a/test_cases/abigail_reader/primitive/expected/long_c.abi_stg b/test_cases/abigail_reader/primitive/expected/long_c.abi_stg index 6eef7d6..755ec01 100644 --- a/test_cases/abigail_reader/primitive/expected/long_c.abi_stg +++ b/test_cases/abigail_reader/primitive/expected/long_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xfc0e1dbd name: "long" @@ -8,66 +8,66 @@ primitive { member { id: 0xdad40c3c name: "il" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 128 } member { id: 0x1934e8aa name: "ils" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 512 } member { id: 0x6ab2f0c1 name: "isl" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 320 } member { id: 0xc5e5bb0a name: "l" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } member { id: 0x19f06659 name: "li" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 64 } member { id: 0xc4e47a0b name: "lis" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 576 } member { id: 0xa876c9e9 name: "ls" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 256 } member { id: 0x78182039 name: "lsi" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 640 } member { id: 0x12cd1cc1 name: "sil" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 384 } member { id: 0xc3afc5a8 name: "sl" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 192 } member { id: 0xf959dfd3 name: "sli" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 448 } struct_union { @@ -76,17 +76,17 @@ struct_union { name: "L" definition { bytesize: 88 - member_id: 0xc5e5bb0a - member_id: 0x19f06659 - member_id: 0xdad40c3c - member_id: 0xc3afc5a8 - member_id: 0xa876c9e9 - member_id: 0x6ab2f0c1 - member_id: 0x12cd1cc1 - member_id: 0xf959dfd3 - member_id: 0x1934e8aa - member_id: 0xc4e47a0b - member_id: 0x78182039 + member_id: 0xc5e5bb0a # long l + member_id: 0x19f06659 # long li + member_id: 0xdad40c3c # long il + member_id: 0xc3afc5a8 # long sl + member_id: 0xa876c9e9 # long ls + member_id: 0x6ab2f0c1 # long isl + member_id: 0x12cd1cc1 # long sil + member_id: 0xf959dfd3 # long sli + member_id: 0x1934e8aa # long ils + member_id: 0xc4e47a0b # long lis + member_id: 0x78182039 # long lsi } } elf_symbol { @@ -94,10 +94,10 @@ elf_symbol { name: "l" is_defined: true symbol_type: OBJECT - type_id: 0x61496952 + type_id: 0x61496952 # struct L full_name: "l" } interface { id: 0x84ea5130 - symbol_id: 0x6df237e3 + symbol_id: 0x6df237e3 # struct L l } diff --git a/test_cases/abigail_reader/qualified/expected/const_long_c.abi_stg b/test_cases/abigail_reader/qualified/expected/const_long_c.abi_stg index 9efa0da..8a68b46 100644 --- a/test_cases/abigail_reader/qualified/expected/const_long_c.abi_stg +++ b/test_cases/abigail_reader/qualified/expected/const_long_c.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface qualified { id: 0xe3126acd qualifier: CONST - qualified_type_id: 0xfc0e1dbd + qualified_type_id: 0xfc0e1dbd # long } primitive { id: 0xfc0e1dbd @@ -13,228 +13,228 @@ primitive { member { id: 0x0a01f4af name: "cil" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 320 } member { id: 0xedaeeb40 name: "cils" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1664 } member { id: 0x999e7913 name: "cisl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 896 } member { id: 0xc962410a name: "cl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long } member { id: 0x66b6a49d name: "cli" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 128 } member { id: 0x3ec28fbb name: "clis" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1920 } member { id: 0xc5fc75d0 name: "cls" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 704 } member { id: 0x8893f180 name: "clsi" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2176 } member { id: 0xdf7dc4fb name: "csil" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1152 } member { id: 0x35f6068c name: "csl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 512 } member { id: 0x15047367 name: "csli" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1408 } member { id: 0x4b41dd07 name: "icl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 384 } member { id: 0x4a9f67b8 name: "icls" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1728 } member { id: 0xc426445d name: "icsl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 960 } member { id: 0x35215f8e name: "ilc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 448 } member { id: 0x0f947358 name: "ilcs" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1792 } member { id: 0x01907246 name: "ilsc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1856 } member { id: 0x49da99b9 name: "iscl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1024 } member { id: 0x90c3741b name: "islc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1088 } member { id: 0x946ca9b8 name: "lc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 64 } member { id: 0x63bc1552 name: "lci" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 192 } member { id: 0xb4a02dd3 name: "lcis" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1984 } member { id: 0xcb36c2fb name: "lcs" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 768 } member { id: 0xf8f76ae6 name: "lcsi" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2240 } member { id: 0xc8cc0629 name: "lic" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 256 } member { id: 0x53c916c0 name: "lics" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2048 } member { id: 0x798a5330 name: "lisc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2112 } member { id: 0xf0837e5f name: "lsc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 832 } member { id: 0xe637ee4e name: "lsci" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2304 } member { id: 0x67e974e2 name: "lsic" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2368 } member { id: 0x4da63353 name: "scil" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1216 } member { id: 0x0dafd156 name: "scl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 576 } member { id: 0x938d2db4 name: "scli" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1472 } member { id: 0xa4f141c8 name: "sicl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1280 } member { id: 0x58e0f4ff name: "silc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1344 } member { id: 0x7dc4253c name: "slc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 640 } member { id: 0x3d2863c0 name: "slci" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1536 } member { id: 0x3d727335 name: "slic" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1600 } struct_union { @@ -243,44 +243,44 @@ struct_union { name: "CL" definition { bytesize: 304 - member_id: 0xc962410a - member_id: 0x946ca9b8 - member_id: 0x66b6a49d - member_id: 0x63bc1552 - member_id: 0xc8cc0629 - member_id: 0x0a01f4af - member_id: 0x4b41dd07 - member_id: 0x35215f8e - member_id: 0x35f6068c - member_id: 0x0dafd156 - member_id: 0x7dc4253c - member_id: 0xc5fc75d0 - member_id: 0xcb36c2fb - member_id: 0xf0837e5f - member_id: 0x999e7913 - member_id: 0xc426445d - member_id: 0x49da99b9 - member_id: 0x90c3741b - member_id: 0xdf7dc4fb - member_id: 0x4da63353 - member_id: 0xa4f141c8 - member_id: 0x58e0f4ff - member_id: 0x15047367 - member_id: 0x938d2db4 - member_id: 0x3d2863c0 - member_id: 0x3d727335 - member_id: 0xedaeeb40 - member_id: 0x4a9f67b8 - member_id: 0x0f947358 - member_id: 0x01907246 - member_id: 0x3ec28fbb - member_id: 0xb4a02dd3 - member_id: 0x53c916c0 - member_id: 0x798a5330 - member_id: 0x8893f180 - member_id: 0xf8f76ae6 - member_id: 0xe637ee4e - member_id: 0x67e974e2 + member_id: 0xc962410a # const long cl + member_id: 0x946ca9b8 # const long lc + member_id: 0x66b6a49d # const long cli + member_id: 0x63bc1552 # const long lci + member_id: 0xc8cc0629 # const long lic + member_id: 0x0a01f4af # const long cil + member_id: 0x4b41dd07 # const long icl + member_id: 0x35215f8e # const long ilc + member_id: 0x35f6068c # const long csl + member_id: 0x0dafd156 # const long scl + member_id: 0x7dc4253c # const long slc + member_id: 0xc5fc75d0 # const long cls + member_id: 0xcb36c2fb # const long lcs + member_id: 0xf0837e5f # const long lsc + member_id: 0x999e7913 # const long cisl + member_id: 0xc426445d # const long icsl + member_id: 0x49da99b9 # const long iscl + member_id: 0x90c3741b # const long islc + member_id: 0xdf7dc4fb # const long csil + member_id: 0x4da63353 # const long scil + member_id: 0xa4f141c8 # const long sicl + member_id: 0x58e0f4ff # const long silc + member_id: 0x15047367 # const long csli + member_id: 0x938d2db4 # const long scli + member_id: 0x3d2863c0 # const long slci + member_id: 0x3d727335 # const long slic + member_id: 0xedaeeb40 # const long cils + member_id: 0x4a9f67b8 # const long icls + member_id: 0x0f947358 # const long ilcs + member_id: 0x01907246 # const long ilsc + member_id: 0x3ec28fbb # const long clis + member_id: 0xb4a02dd3 # const long lcis + member_id: 0x53c916c0 # const long lics + member_id: 0x798a5330 # const long lisc + member_id: 0x8893f180 # const long clsi + member_id: 0xf8f76ae6 # const long lcsi + member_id: 0xe637ee4e # const long lsci + member_id: 0x67e974e2 # const long lsic } } elf_symbol { @@ -288,10 +288,10 @@ elf_symbol { name: "cl" is_defined: true symbol_type: OBJECT - type_id: 0xf9007b0e + type_id: 0xf9007b0e # struct CL full_name: "cl" } interface { id: 0x84ea5130 - symbol_id: 0x89cb2256 + symbol_id: 0x89cb2256 # struct CL cl } diff --git a/test_cases/abigail_reader/qualified/expected/int_c.abi_stg b/test_cases/abigail_reader/qualified/expected/int_c.abi_stg index 8766e52..9679528 100644 --- a/test_cases/abigail_reader/qualified/expected/int_c.abi_stg +++ b/test_cases/abigail_reader/qualified/expected/int_c.abi_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface qualified { id: 0x8dde4646 qualifier: VOLATILE - qualified_type_id: 0x6720d32f + qualified_type_id: 0x6720d32f # int } qualified { id: 0xc5d9d969 qualifier: CONST - qualified_type_id: 0x6720d32f + qualified_type_id: 0x6720d32f # int } qualified { id: 0xff667c33 qualifier: CONST - qualified_type_id: 0x8dde4646 + qualified_type_id: 0x8dde4646 # volatile int } primitive { id: 0x6720d32f @@ -25,7 +25,7 @@ elf_symbol { name: "a" is_defined: true symbol_type: OBJECT - type_id: 0xc5d9d969 + type_id: 0xc5d9d969 # const int full_name: "a" } elf_symbol { @@ -33,7 +33,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: OBJECT - type_id: 0x8dde4646 + type_id: 0x8dde4646 # volatile int full_name: "b" } elf_symbol { @@ -41,7 +41,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0xff667c33 + type_id: 0xff667c33 # const volatile int full_name: "c" } elf_symbol { @@ -49,13 +49,13 @@ elf_symbol { name: "d" is_defined: true symbol_type: OBJECT - type_id: 0xff667c33 + type_id: 0xff667c33 # const volatile int full_name: "d" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x63f6f9b1 + symbol_id: 0xa7b0241d # const int a + symbol_id: 0xe371117a # volatile int b + symbol_id: 0x2230fb28 # const volatile int c + symbol_id: 0x63f6f9b1 # const volatile int d } diff --git a/test_cases/abigail_reader/qualified/expected/pointers_c.abi_stg b/test_cases/abigail_reader/qualified/expected/pointers_c.abi_stg index 0bc5f3d..120468e 100644 --- a/test_cases/abigail_reader/qualified/expected/pointers_c.abi_stg +++ b/test_cases/abigail_reader/qualified/expected/pointers_c.abi_stg @@ -1,39 +1,39 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x13580d6c kind: POINTER - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0x3be64ffd kind: POINTER - pointee_type_id: 0xc5d9d969 + pointee_type_id: 0xc5d9d969 # const int } qualified { id: 0x4008d327 qualifier: RESTRICT - qualified_type_id: 0x13580d6c + qualified_type_id: 0x13580d6c # int* } qualified { id: 0x4a274383 qualifier: RESTRICT - qualified_type_id: 0x3be64ffd + qualified_type_id: 0x3be64ffd # const int* } qualified { id: 0xc5d9d969 qualifier: CONST - qualified_type_id: 0x6720d32f + qualified_type_id: 0x6720d32f # int } qualified { id: 0xcc13d96b qualifier: CONST - qualified_type_id: 0x4008d327 + qualified_type_id: 0x4008d327 # int* restrict } qualified { id: 0xd8c7eef9 qualifier: CONST - qualified_type_id: 0x13580d6c + qualified_type_id: 0x13580d6c # int* } primitive { id: 0x6720d32f @@ -45,7 +45,7 @@ elf_symbol { name: "a" is_defined: true symbol_type: OBJECT - type_id: 0x3be64ffd + type_id: 0x3be64ffd # const int* full_name: "a" } elf_symbol { @@ -53,7 +53,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: OBJECT - type_id: 0xd8c7eef9 + type_id: 0xd8c7eef9 # int* const full_name: "b" } elf_symbol { @@ -61,7 +61,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0x4008d327 + type_id: 0x4008d327 # int* restrict full_name: "c" } elf_symbol { @@ -69,7 +69,7 @@ elf_symbol { name: "d" is_defined: true symbol_type: OBJECT - type_id: 0x4a274383 + type_id: 0x4a274383 # const int* restrict full_name: "d" } elf_symbol { @@ -77,7 +77,7 @@ elf_symbol { name: "e" is_defined: true symbol_type: OBJECT - type_id: 0xcc13d96b + type_id: 0xcc13d96b # int* restrict const full_name: "e" } elf_symbol { @@ -85,15 +85,15 @@ elf_symbol { name: "f" is_defined: true symbol_type: OBJECT - type_id: 0xcc13d96b + type_id: 0xcc13d96b # int* restrict const full_name: "f" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x63f6f9b1 - symbol_id: 0xa2b65a7e - symbol_id: 0xe0778f95 + symbol_id: 0xa7b0241d # const int* a + symbol_id: 0xe371117a # int* const b + symbol_id: 0x2230fb28 # int* restrict c + symbol_id: 0x63f6f9b1 # const int* restrict d + symbol_id: 0xa2b65a7e # int* restrict const e + symbol_id: 0xe0778f95 # int* restrict const f } diff --git a/test_cases/abigail_reader/qualified/expected/useless_c.abi_stg b/test_cases/abigail_reader/qualified/expected/useless_c.abi_stg index 19b006e..2449a6c 100644 --- a/test_cases/abigail_reader/qualified/expected/useless_c.abi_stg +++ b/test_cases/abigail_reader/qualified/expected/useless_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,37 +7,37 @@ special { pointer_reference { id: 0x0dd55c4a kind: POINTER - pointee_type_id: 0x1d1597b4 + pointee_type_id: 0x1d1597b4 # void(const volatile struct foo*) } pointer_reference { id: 0x24b3ee1b kind: POINTER - pointee_type_id: 0xb88f5ef1 + pointee_type_id: 0xb88f5ef1 # struct foo } pointer_reference { id: 0x3637189c kind: POINTER - pointee_type_id: 0xf29c84ee + pointee_type_id: 0xf29c84ee # const volatile struct foo } qualified { id: 0x9763259f qualifier: VOLATILE - qualified_type_id: 0x0dd55c4a + qualified_type_id: 0x0dd55c4a # void(*)(const volatile struct foo*) } qualified { id: 0xba35a531 qualifier: VOLATILE - qualified_type_id: 0xb88f5ef1 + qualified_type_id: 0xb88f5ef1 # struct foo } qualified { id: 0xf29c84ee qualifier: CONST - qualified_type_id: 0xba35a531 + qualified_type_id: 0xba35a531 # volatile struct foo } qualified { id: 0xf9c924c5 qualifier: CONST - qualified_type_id: 0x9763259f + qualified_type_id: 0x9763259f # void(* volatile)(const volatile struct foo*) } struct_union { id: 0xb88f5ef1 @@ -48,25 +48,25 @@ struct_union { } function { id: 0x13ed0681 - return_type_id: 0x48b5725f - parameter_id: 0x0dd55c4a + return_type_id: 0x48b5725f # void + parameter_id: 0x0dd55c4a # void(*)(const volatile struct foo*) } function { id: 0x19b4aa15 - return_type_id: 0x48b5725f - parameter_id: 0x24b3ee1b + return_type_id: 0x48b5725f # void + parameter_id: 0x24b3ee1b # struct foo* } function { id: 0x1d1597b4 - return_type_id: 0x48b5725f - parameter_id: 0x3637189c + return_type_id: 0x48b5725f # void + parameter_id: 0x3637189c # const volatile struct foo* } elf_symbol { id: 0xa58ca0b6 name: "bar" is_defined: true symbol_type: FUNCTION - type_id: 0x1d1597b4 + type_id: 0x1d1597b4 # void(const volatile struct foo*) full_name: "bar" } elf_symbol { @@ -74,7 +74,7 @@ elf_symbol { name: "bar_2" is_defined: true symbol_type: FUNCTION - type_id: 0x19b4aa15 + type_id: 0x19b4aa15 # void(struct foo*) full_name: "bar_2" } elf_symbol { @@ -82,7 +82,7 @@ elf_symbol { name: "baz" is_defined: true symbol_type: FUNCTION - type_id: 0x13ed0681 + type_id: 0x13ed0681 # void(void(*)(const volatile struct foo*)) full_name: "baz" } elf_symbol { @@ -90,13 +90,13 @@ elf_symbol { name: "quux" is_defined: true symbol_type: OBJECT - type_id: 0xf9c924c5 + type_id: 0xf9c924c5 # void(* volatile const)(const volatile struct foo*) full_name: "quux" } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 - symbol_id: 0xe89bbaac - symbol_id: 0xbf8fc404 - symbol_id: 0x4602d7e1 + symbol_id: 0xa58ca0b6 # void bar(const volatile struct foo*) + symbol_id: 0xe89bbaac # void bar_2(struct foo*) + symbol_id: 0xbf8fc404 # void baz(void(*)(const volatile struct foo*)) + symbol_id: 0x4602d7e1 # void(* volatile const quux)(const volatile struct foo*) } diff --git a/test_cases/abigail_reader/reference/expected/type_cc.abi_stg b/test_cases/abigail_reader/reference/expected/type_cc.abi_stg index 8c173af..35c8b7a 100644 --- a/test_cases/abigail_reader/reference/expected/type_cc.abi_stg +++ b/test_cases/abigail_reader/reference/expected/type_cc.abi_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x13580d6c kind: POINTER - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0x6398b08c kind: RVALUE_REFERENCE - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0xde581bbb kind: LVALUE_REFERENCE - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -23,18 +23,18 @@ primitive { member { id: 0xc46f84f6 name: "lref" - type_id: 0xde581bbb + type_id: 0xde581bbb # int& offset: 64 } member { id: 0x46e392d8 name: "ptr" - type_id: 0x13580d6c + type_id: 0x13580d6c # int* } member { id: 0x2a89c81c name: "rref" - type_id: 0x6398b08c + type_id: 0x6398b08c # int&& offset: 128 } struct_union { @@ -43,25 +43,25 @@ struct_union { name: "foo" definition { bytesize: 24 - member_id: 0x46e392d8 - member_id: 0xc46f84f6 - member_id: 0x2a89c81c + member_id: 0x46e392d8 # int* ptr + member_id: 0xc46f84f6 # int& lref + member_id: 0x2a89c81c # int&& rref } } function { id: 0xb3a33493 - return_type_id: 0x6720d32f - parameter_id: 0xb88f5ef1 + return_type_id: 0x6720d32f # int + parameter_id: 0xb88f5ef1 # struct foo } elf_symbol { id: 0x68629c2b name: "_Z4func3foo" is_defined: true symbol_type: FUNCTION - type_id: 0xb3a33493 + type_id: 0xb3a33493 # int(struct foo) full_name: "func" } interface { id: 0x84ea5130 - symbol_id: 0x68629c2b + symbol_id: 0x68629c2b # int func(struct foo) } diff --git a/test_cases/abigail_reader/scc/expected/same_c.abi_stg b/test_cases/abigail_reader/scc/expected/same_c.abi_stg index 491356d..6884b41 100644 --- a/test_cases/abigail_reader/scc/expected/same_c.abi_stg +++ b/test_cases/abigail_reader/scc/expected/same_c.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x2a409878 kind: POINTER - pointee_type_id: 0x8342877c + pointee_type_id: 0x8342877c # struct M } primitive { id: 0x6720d32f @@ -13,12 +13,12 @@ primitive { member { id: 0xb53d99d2 name: "head" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xeeb7e480 name: "tail" - type_id: 0x2a409878 + type_id: 0x2a409878 # struct M* offset: 64 } struct_union { @@ -27,24 +27,24 @@ struct_union { name: "M" definition { bytesize: 16 - member_id: 0xb53d99d2 - member_id: 0xeeb7e480 + member_id: 0xb53d99d2 # int head + member_id: 0xeeb7e480 # struct M* tail } } function { id: 0x9710c531 - return_type_id: 0x6720d32f - parameter_id: 0x2a409878 + return_type_id: 0x6720d32f # int + parameter_id: 0x2a409878 # struct M* } elf_symbol { id: 0x6713ecab name: "loop" is_defined: true symbol_type: FUNCTION - type_id: 0x9710c531 + type_id: 0x9710c531 # int(struct M*) full_name: "loop" } interface { id: 0x84ea5130 - symbol_id: 0x6713ecab + symbol_id: 0x6713ecab # int loop(struct M*) } diff --git a/test_cases/abigail_reader/scc/expected/simple_c.abi_stg b/test_cases/abigail_reader/scc/expected/simple_c.abi_stg index abca1c5..89288e4 100644 --- a/test_cases/abigail_reader/scc/expected/simple_c.abi_stg +++ b/test_cases/abigail_reader/scc/expected/simple_c.abi_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x32b38621 kind: POINTER - pointee_type_id: 0xe08efe1a + pointee_type_id: 0xe08efe1a # struct N } typedef { id: 0x5c0e9566 name: "foo" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -23,24 +23,24 @@ primitive { member { id: 0x50eb5162 name: "extra" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 128 } member { id: 0x35a562d1 name: "left" - type_id: 0x5c0e9566 + type_id: 0x5c0e9566 # foo offset: 64 } member { id: 0x11c1b359 name: "next" - type_id: 0x32b38621 + type_id: 0x32b38621 # struct N* } member { id: 0x0b2abf8a name: "right" - type_id: 0x5c0e9566 + type_id: 0x5c0e9566 # foo offset: 96 } struct_union { @@ -49,27 +49,27 @@ struct_union { name: "N" definition { bytesize: 24 - member_id: 0x11c1b359 - member_id: 0x35a562d1 - member_id: 0x0b2abf8a - member_id: 0x50eb5162 + member_id: 0x11c1b359 # struct N* next + member_id: 0x35a562d1 # foo left + member_id: 0x0b2abf8a # foo right + member_id: 0x50eb5162 # short extra } } function { id: 0xa56992b1 - return_type_id: 0x6720d32f - parameter_id: 0xe08efe1a - parameter_id: 0x32b38621 + return_type_id: 0x6720d32f # int + parameter_id: 0xe08efe1a # struct N + parameter_id: 0x32b38621 # struct N* } elf_symbol { id: 0xc018d523 name: "fun" is_defined: true symbol_type: FUNCTION - type_id: 0xa56992b1 + type_id: 0xa56992b1 # int(struct N, struct N*) full_name: "fun" } interface { id: 0x84ea5130 - symbol_id: 0xc018d523 + symbol_id: 0xc018d523 # int fun(struct N, struct N*) } diff --git a/test_cases/abigail_reader/static/expected/simple_cc.abi_stg b/test_cases/abigail_reader/static/expected/simple_cc.abi_stg index d532461..ffa844a 100644 --- a/test_cases/abigail_reader/static/expected/simple_cc.abi_stg +++ b/test_cases/abigail_reader/static/expected/simple_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,7 +8,7 @@ primitive { member { id: 0x9cebeb53 name: "bar" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0xf6f304f7 @@ -16,19 +16,19 @@ struct_union { name: "Foo" definition { bytesize: 4 - member_id: 0x9cebeb53 + member_id: 0x9cebeb53 # int bar } } function { id: 0xe5d22a85 - return_type_id: 0xf6f304f7 + return_type_id: 0xf6f304f7 # struct Foo } elf_symbol { id: 0x20a0c465 name: "_ZN3Foo2stE" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "Foo::st" } elf_symbol { @@ -36,11 +36,11 @@ elf_symbol { name: "_ZN3Foo7DefaultEv" is_defined: true symbol_type: FUNCTION - type_id: 0xe5d22a85 + type_id: 0xe5d22a85 # struct Foo() full_name: "Foo::Default" } interface { id: 0x84ea5130 - symbol_id: 0x20a0c465 - symbol_id: 0x3ccd5aea + symbol_id: 0x20a0c465 # int Foo::st + symbol_id: 0x3ccd5aea # struct Foo Foo::Default() } diff --git a/test_cases/abigail_reader/struct/expected/anonymous_c.abi_stg b/test_cases/abigail_reader/struct/expected/anonymous_c.abi_stg index d2af413..6bd7b58 100644 --- a/test_cases/abigail_reader/struct/expected/anonymous_c.abi_stg +++ b/test_cases/abigail_reader/struct/expected/anonymous_c.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x7d386fee name: "Foo" - referred_type_id: 0x154ec986 + referred_type_id: 0x154ec986 # struct { union { struct { unsigned int x; unsigned int y; }; unsigned long long z; }; } } primitive { id: 0x4585663f @@ -17,34 +17,34 @@ primitive { } member { id: 0x2fd000b1 - type_id: 0x306e72d7 + type_id: 0x306e72d7 # struct { unsigned int x; unsigned int y; } } member { id: 0x348a3575 - type_id: 0x5d06a5c7 + type_id: 0x5d06a5c7 # union { struct { unsigned int x; unsigned int y; }; unsigned long long z; } } member { id: 0xa0f7eeb0 name: "x" - type_id: 0x4585663f + type_id: 0x4585663f # unsigned int } member { id: 0xff3682d9 name: "y" - type_id: 0x4585663f + type_id: 0x4585663f # unsigned int offset: 32 } member { id: 0x21e0aad1 name: "z" - type_id: 0xd5df6730 + type_id: 0xd5df6730 # unsigned long long } struct_union { id: 0x154ec986 kind: STRUCT definition { bytesize: 8 - member_id: 0x348a3575 + member_id: 0x348a3575 # union { struct { unsigned int x; unsigned int y; }; unsigned long long z; } } } struct_union { @@ -52,8 +52,8 @@ struct_union { kind: STRUCT definition { bytesize: 8 - member_id: 0xa0f7eeb0 - member_id: 0xff3682d9 + member_id: 0xa0f7eeb0 # unsigned int x + member_id: 0xff3682d9 # unsigned int y } } struct_union { @@ -61,8 +61,8 @@ struct_union { kind: UNION definition { bytesize: 8 - member_id: 0x2fd000b1 - member_id: 0x21e0aad1 + member_id: 0x2fd000b1 # struct { unsigned int x; unsigned int y; } + member_id: 0x21e0aad1 # unsigned long long z } } elf_symbol { @@ -70,10 +70,10 @@ elf_symbol { name: "var" is_defined: true symbol_type: OBJECT - type_id: 0x7d386fee + type_id: 0x7d386fee # Foo full_name: "var" } interface { id: 0x84ea5130 - symbol_id: 0x3997c6eb + symbol_id: 0x3997c6eb # Foo var } diff --git a/test_cases/abigail_reader/struct/expected/bit_field_c.abi_stg b/test_cases/abigail_reader/struct/expected/bit_field_c.abi_stg index b206312..e710c8a 100644 --- a/test_cases/abigail_reader/struct/expected/bit_field_c.abi_stg +++ b/test_cases/abigail_reader/struct/expected/bit_field_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xb0312d5a name: "short" @@ -8,24 +8,24 @@ primitive { member { id: 0x6203902d name: "rest_of_the_struct" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short } member { id: 0xa0025445 name: "x" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 16 } member { id: 0xffc331b7 name: "y" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 21 } member { id: 0x218540ba name: "z" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 27 } struct_union { @@ -34,10 +34,10 @@ struct_union { name: "Foo" definition { bytesize: 4 - member_id: 0x6203902d - member_id: 0xa0025445 - member_id: 0xffc331b7 - member_id: 0x218540ba + member_id: 0x6203902d # short rest_of_the_struct + member_id: 0xa0025445 # short x + member_id: 0xffc331b7 # short y + member_id: 0x218540ba # short z } } elf_symbol { @@ -45,10 +45,10 @@ elf_symbol { name: "var" is_defined: true symbol_type: OBJECT - type_id: 0xf6f304f7 + type_id: 0xf6f304f7 # struct Foo full_name: "var" } interface { id: 0x84ea5130 - symbol_id: 0x3997c6eb + symbol_id: 0x3997c6eb # struct Foo var } diff --git a/test_cases/abigail_reader/struct/expected/declaration_only_c.abi_stg b/test_cases/abigail_reader/struct/expected/declaration_only_c.abi_stg index af1a122..e82b8bd 100644 --- a/test_cases/abigail_reader/struct/expected/declaration_only_c.abi_stg +++ b/test_cases/abigail_reader/struct/expected/declaration_only_c.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x34c1eb21 kind: POINTER - pointee_type_id: 0xf9474a19 + pointee_type_id: 0xf9474a19 # struct Foo } struct_union { id: 0xf9474a19 @@ -15,10 +15,10 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0x34c1eb21 + type_id: 0x34c1eb21 # struct Foo* full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # struct Foo* foo } diff --git a/test_cases/abigail_reader/struct/expected/nested_c.abi_stg b/test_cases/abigail_reader/struct/expected/nested_c.abi_stg index 75854ae..a784473 100644 --- a/test_cases/abigail_reader/struct/expected/nested_c.abi_stg +++ b/test_cases/abigail_reader/struct/expected/nested_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x12c83f93 kind: POINTER - pointee_type_id: 0x616018d1 + pointee_type_id: 0x616018d1 # struct nested } pointer_reference { id: 0x1b5b5f31 kind: POINTER - pointee_type_id: 0x472d9a5b + pointee_type_id: 0x472d9a5b # struct containing } pointer_reference { id: 0x32c82798 kind: POINTER - pointee_type_id: 0xe16078fd + pointee_type_id: 0xe16078fd # struct referring } primitive { id: 0xfc0e1dbd @@ -27,17 +27,17 @@ primitive { member { id: 0xc0117331 name: "inner" - type_id: 0x12c83f93 + type_id: 0x12c83f93 # struct nested* } member { id: 0xc062db16 name: "inner" - type_id: 0x616018d1 + type_id: 0x616018d1 # struct nested } member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x472d9a5b @@ -45,7 +45,7 @@ struct_union { name: "containing" definition { bytesize: 8 - member_id: 0xc062db16 + member_id: 0xc062db16 # struct nested inner } } struct_union { @@ -54,7 +54,7 @@ struct_union { name: "nested" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -63,35 +63,35 @@ struct_union { name: "referring" definition { bytesize: 8 - member_id: 0xc0117331 + member_id: 0xc0117331 # struct nested* inner } } function { id: 0x01533705 - return_type_id: 0x48b5725f - parameter_id: 0x472d9a5b + return_type_id: 0x48b5725f # void + parameter_id: 0x472d9a5b # struct containing } function { id: 0x164e865f - return_type_id: 0x48b5725f - parameter_id: 0x1b5b5f31 + return_type_id: 0x48b5725f # void + parameter_id: 0x1b5b5f31 # struct containing* } function { id: 0x1c2a5875 - return_type_id: 0x48b5725f - parameter_id: 0x32c82798 + return_type_id: 0x48b5725f # void + parameter_id: 0x32c82798 # struct referring* } function { id: 0x28c04fac - return_type_id: 0x48b5725f - parameter_id: 0xe16078fd + return_type_id: 0x48b5725f # void + parameter_id: 0xe16078fd # struct referring } elf_symbol { id: 0x97e8ca66 name: "register_ops6" is_defined: true symbol_type: FUNCTION - type_id: 0x01533705 + type_id: 0x01533705 # void(struct containing) full_name: "register_ops6" } elf_symbol { @@ -99,7 +99,7 @@ elf_symbol { name: "register_ops7" is_defined: true symbol_type: FUNCTION - type_id: 0x164e865f + type_id: 0x164e865f # void(struct containing*) full_name: "register_ops7" } elf_symbol { @@ -107,7 +107,7 @@ elf_symbol { name: "register_ops8" is_defined: true symbol_type: FUNCTION - type_id: 0x28c04fac + type_id: 0x28c04fac # void(struct referring) full_name: "register_ops8" } elf_symbol { @@ -115,13 +115,13 @@ elf_symbol { name: "register_ops9" is_defined: true symbol_type: FUNCTION - type_id: 0x1c2a5875 + type_id: 0x1c2a5875 # void(struct referring*) full_name: "register_ops9" } interface { id: 0x84ea5130 - symbol_id: 0x97e8ca66 - symbol_id: 0x68a86d39 - symbol_id: 0x1f6abcc7 - symbol_id: 0xdc2ac9cf + symbol_id: 0x97e8ca66 # void register_ops6(struct containing) + symbol_id: 0x68a86d39 # void register_ops7(struct containing*) + symbol_id: 0x1f6abcc7 # void register_ops8(struct referring) + symbol_id: 0xdc2ac9cf # void register_ops9(struct referring*) } diff --git a/test_cases/abigail_reader/struct/expected/nested_cc.abi_stg b/test_cases/abigail_reader/struct/expected/nested_cc.abi_stg index c433d04..ccc8787 100644 --- a/test_cases/abigail_reader/struct/expected/nested_cc.abi_stg +++ b/test_cases/abigail_reader/struct/expected/nested_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x12c83f93 kind: POINTER - pointee_type_id: 0x616018d1 + pointee_type_id: 0x616018d1 # struct nested } pointer_reference { id: 0x1b5b5f31 kind: POINTER - pointee_type_id: 0x472d9a5b + pointee_type_id: 0x472d9a5b # struct containing } pointer_reference { id: 0x32c82798 kind: POINTER - pointee_type_id: 0xe16078fd + pointee_type_id: 0xe16078fd # struct referring } primitive { id: 0xfc0e1dbd @@ -27,17 +27,17 @@ primitive { member { id: 0xc0117331 name: "inner" - type_id: 0x12c83f93 + type_id: 0x12c83f93 # struct nested* } member { id: 0xc062db16 name: "inner" - type_id: 0x616018d1 + type_id: 0x616018d1 # struct nested } member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x472d9a5b @@ -45,7 +45,7 @@ struct_union { name: "containing" definition { bytesize: 8 - member_id: 0xc062db16 + member_id: 0xc062db16 # struct nested inner } } struct_union { @@ -54,7 +54,7 @@ struct_union { name: "nested" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -63,35 +63,35 @@ struct_union { name: "referring" definition { bytesize: 8 - member_id: 0xc0117331 + member_id: 0xc0117331 # struct nested* inner } } function { id: 0x01533705 - return_type_id: 0x48b5725f - parameter_id: 0x472d9a5b + return_type_id: 0x48b5725f # void + parameter_id: 0x472d9a5b # struct containing } function { id: 0x164e865f - return_type_id: 0x48b5725f - parameter_id: 0x1b5b5f31 + return_type_id: 0x48b5725f # void + parameter_id: 0x1b5b5f31 # struct containing* } function { id: 0x1c2a5875 - return_type_id: 0x48b5725f - parameter_id: 0x32c82798 + return_type_id: 0x48b5725f # void + parameter_id: 0x32c82798 # struct referring* } function { id: 0x28c04fac - return_type_id: 0x48b5725f - parameter_id: 0xe16078fd + return_type_id: 0x48b5725f # void + parameter_id: 0xe16078fd # struct referring } elf_symbol { id: 0x347b0ec1 name: "_Z13register_ops610containing" is_defined: true symbol_type: FUNCTION - type_id: 0x01533705 + type_id: 0x01533705 # void(struct containing) full_name: "register_ops6" } elf_symbol { @@ -99,7 +99,7 @@ elf_symbol { name: "_Z13register_ops7P10containing" is_defined: true symbol_type: FUNCTION - type_id: 0x164e865f + type_id: 0x164e865f # void(struct containing*) full_name: "register_ops7" } elf_symbol { @@ -107,7 +107,7 @@ elf_symbol { name: "_Z13register_ops89referring" is_defined: true symbol_type: FUNCTION - type_id: 0x28c04fac + type_id: 0x28c04fac # void(struct referring) full_name: "register_ops8" } elf_symbol { @@ -115,13 +115,13 @@ elf_symbol { name: "_Z13register_ops9P9referring" is_defined: true symbol_type: FUNCTION - type_id: 0x1c2a5875 + type_id: 0x1c2a5875 # void(struct referring*) full_name: "register_ops9" } interface { id: 0x84ea5130 - symbol_id: 0x347b0ec1 - symbol_id: 0xcc14c364 - symbol_id: 0xe408ab24 - symbol_id: 0x9d450b2c + symbol_id: 0x347b0ec1 # void register_ops6(struct containing) + symbol_id: 0xcc14c364 # void register_ops7(struct containing*) + symbol_id: 0xe408ab24 # void register_ops8(struct referring) + symbol_id: 0x9d450b2c # void register_ops9(struct referring*) } diff --git a/test_cases/abigail_reader/struct/expected/struct_union_c.abi_stg b/test_cases/abigail_reader/struct/expected/struct_union_c.abi_stg index 469fc6c..c56212e 100644 --- a/test_cases/abigail_reader/struct/expected/struct_union_c.abi_stg +++ b/test_cases/abigail_reader/struct/expected/struct_union_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,7 +8,7 @@ primitive { member { id: 0xa0d54b05 name: "x" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0xae62fdac @@ -16,7 +16,7 @@ struct_union { name: "Struct" definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } struct_union { @@ -25,7 +25,7 @@ struct_union { name: "Union" definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } elf_symbol { @@ -33,7 +33,7 @@ elf_symbol { name: "bar" is_defined: true symbol_type: OBJECT - type_id: 0x58ad1075 + type_id: 0x58ad1075 # union Union full_name: "bar" } elf_symbol { @@ -41,11 +41,11 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0xae62fdac + type_id: 0xae62fdac # struct Struct full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 - symbol_id: 0x06f8338c + symbol_id: 0xa58ca0b6 # union Union bar + symbol_id: 0x06f8338c # struct Struct foo } diff --git a/test_cases/abigail_reader/symbol/expected/absolute_object_c.abi_stg b/test_cases/abigail_reader/symbol/expected/absolute_object_c.abi_stg index 5a73c00..0fe1bc8 100644 --- a/test_cases/abigail_reader/symbol/expected/absolute_object_c.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/absolute_object_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xfc0e1dbd name: "long" @@ -10,7 +10,7 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long full_name: "x" } elf_symbol { @@ -18,11 +18,11 @@ elf_symbol { name: "y" is_defined: true symbol_type: OBJECT - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long full_name: "y" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 - symbol_id: 0xb5c9c657 + symbol_id: 0x7709bd40 # long x + symbol_id: 0xb5c9c657 # long y } diff --git a/test_cases/abigail_reader/symbol/expected/alias_c.abi_stg b/test_cases/abigail_reader/symbol/expected/alias_c.abi_stg index 409cff4..d26d2b0 100644 --- a/test_cases/abigail_reader/symbol/expected/alias_c.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/alias_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -7,14 +7,14 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0xa7b0241d name: "a" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "a" } elf_symbol { @@ -22,7 +22,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "a" } elf_symbol { @@ -31,7 +31,7 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "a" } elf_symbol { @@ -39,7 +39,7 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "x" } elf_symbol { @@ -47,7 +47,7 @@ elf_symbol { name: "y" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "x" } elf_symbol { @@ -56,15 +56,15 @@ elf_symbol { is_defined: true symbol_type: OBJECT binding: WEAK - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x7709bd40 - symbol_id: 0xb5c9c657 - symbol_id: 0xf58aebbc + symbol_id: 0xa7b0241d # int a() + symbol_id: 0xe371117a # int a() + symbol_id: 0x2230fb28 # int a() + symbol_id: 0x7709bd40 # int x + symbol_id: 0xb5c9c657 # int x + symbol_id: 0xf58aebbc # int x } diff --git a/test_cases/abigail_reader/symbol/expected/ifunc_c.abi_stg b/test_cases/abigail_reader/symbol/expected/ifunc_c.abi_stg index 0fe02f8..83d4614 100644 --- a/test_cases/abigail_reader/symbol/expected/ifunc_c.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/ifunc_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface elf_symbol { id: 0xa49e03a0 name: "func" @@ -8,5 +8,5 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0xa49e03a0 + symbol_id: 0xa49e03a0 # func } diff --git a/test_cases/abigail_reader/symbol/expected/tls_c.abi_stg b/test_cases/abigail_reader/symbol/expected/tls_c.abi_stg index 44d057b..f17bc12 100644 --- a/test_cases/abigail_reader/symbol/expected/tls_c.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/tls_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -15,7 +15,7 @@ elf_symbol { name: "var1" is_defined: true symbol_type: TLS - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "var1" } elf_symbol { @@ -23,11 +23,11 @@ elf_symbol { name: "var2" is_defined: true symbol_type: TLS - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long full_name: "var2" } interface { id: 0x84ea5130 - symbol_id: 0x3c10a6b0 - symbol_id: 0x7652705b + symbol_id: 0x3c10a6b0 # int var1 + symbol_id: 0x7652705b # long var2 } diff --git a/test_cases/abigail_reader/symbol/expected/tls_cc.abi_stg b/test_cases/abigail_reader/symbol/expected/tls_cc.abi_stg index 050a2d0..fa9b2f6 100644 --- a/test_cases/abigail_reader/symbol/expected/tls_cc.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/tls_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -12,14 +12,14 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } elf_symbol { @@ -27,7 +27,7 @@ elf_symbol { name: "_ZN2ns3fooE" is_defined: true symbol_type: TLS - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short full_name: "ns::foo" } elf_symbol { @@ -35,12 +35,12 @@ elf_symbol { name: "foo" is_defined: true symbol_type: TLS - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 - symbol_id: 0xa4e142ef - symbol_id: 0x06f8338c + symbol_id: 0x92009dc1 # int bar() + symbol_id: 0xa4e142ef # short ns::foo + symbol_id: 0x06f8338c # int foo } diff --git a/test_cases/abigail_reader/symbol/expected/version_definition_c.abi_stg b/test_cases/abigail_reader/symbol/expected/version_definition_c.abi_stg index 2515cea..bccc3a5 100644 --- a/test_cases/abigail_reader/symbol/expected/version_definition_c.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/version_definition_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -11,18 +11,18 @@ primitive { } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x886f3c7a name: "test" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "test" } elf_symbol { @@ -34,7 +34,7 @@ elf_symbol { } is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "versioned_foo_v1" } elf_symbol { @@ -45,7 +45,7 @@ elf_symbol { } is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "versioned_foo_v2" } elf_symbol { @@ -56,7 +56,7 @@ elf_symbol { } is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "versioned_foo_v3" } elf_symbol { @@ -64,7 +64,7 @@ elf_symbol { name: "versioned_foo_v1" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "versioned_foo_v1" } elf_symbol { @@ -72,7 +72,7 @@ elf_symbol { name: "versioned_foo_v2" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "versioned_foo_v2" } elf_symbol { @@ -80,16 +80,16 @@ elf_symbol { name: "versioned_foo_v3" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "versioned_foo_v3" } interface { id: 0x84ea5130 - symbol_id: 0x886f3c7a - symbol_id: 0x48a2d940 - symbol_id: 0x48a265ef - symbol_id: 0x48a26aef - symbol_id: 0xc828cd97 - symbol_id: 0x77e76a1f - symbol_id: 0x36a79a97 + symbol_id: 0x886f3c7a # int test() + symbol_id: 0x48a2d940 # void versioned_foo_v1() + symbol_id: 0x48a265ef # void versioned_foo_v2() + symbol_id: 0x48a26aef # void versioned_foo_v3() + symbol_id: 0xc828cd97 # void versioned_foo_v1() + symbol_id: 0x77e76a1f # void versioned_foo_v2() + symbol_id: 0x36a79a97 # void versioned_foo_v3() } diff --git a/test_cases/abigail_reader/symbol/expected/version_need_c.abi_stg b/test_cases/abigail_reader/symbol/expected/version_need_c.abi_stg index bdeed29..635d0b9 100644 --- a/test_cases/abigail_reader/symbol/expected/version_need_c.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/version_need_c.abi_stg @@ -1,22 +1,22 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0x886f3c7a name: "test" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "test" } interface { id: 0x84ea5130 - symbol_id: 0x886f3c7a + symbol_id: 0x886f3c7a # void test() } diff --git a/test_cases/abigail_reader/symbol/expected/visibility_c.abi_stg b/test_cases/abigail_reader/symbol/expected/visibility_c.abi_stg index f122793..eec44c6 100644 --- a/test_cases/abigail_reader/symbol/expected/visibility_c.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/visibility_c.abi_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0xa7b0241d name: "a" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "a" } elf_symbol { @@ -22,11 +22,11 @@ elf_symbol { is_defined: true symbol_type: FUNCTION visibility: PROTECTED - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "b" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a + symbol_id: 0xa7b0241d # void a() + symbol_id: 0xe371117a # void b() } diff --git a/test_cases/abigail_reader/symbol/expected/visibility_cc.abi_stg b/test_cases/abigail_reader/symbol/expected/visibility_cc.abi_stg index a1d67e7..5b6960d 100644 --- a/test_cases/abigail_reader/symbol/expected/visibility_cc.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/visibility_cc.abi_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0x60468be1 name: "_Z1av" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "a" } elf_symbol { @@ -22,11 +22,11 @@ elf_symbol { is_defined: true symbol_type: FUNCTION visibility: PROTECTED - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "b" } interface { id: 0x84ea5130 - symbol_id: 0x60468be1 - symbol_id: 0xfe73b6f7 + symbol_id: 0x60468be1 # void a() + symbol_id: 0xfe73b6f7 # void b() } diff --git a/test_cases/abigail_reader/symbol/expected/weak_c.abi_stg b/test_cases/abigail_reader/symbol/expected/weak_c.abi_stg index 41d7867..5d8023a 100644 --- a/test_cases/abigail_reader/symbol/expected/weak_c.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/weak_c.abi_stg @@ -1,12 +1,12 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0x7709bd40 @@ -14,10 +14,10 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # void x() } diff --git a/test_cases/abigail_reader/symbol/expected/weak_cc.abi_stg b/test_cases/abigail_reader/symbol/expected/weak_cc.abi_stg index 8e222d7..6d62d79 100644 --- a/test_cases/abigail_reader/symbol/expected/weak_cc.abi_stg +++ b/test_cases/abigail_reader/symbol/expected/weak_cc.abi_stg @@ -1,12 +1,12 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0xf285345b @@ -14,10 +14,10 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0xf285345b + symbol_id: 0xf285345b # void x() } diff --git a/test_cases/abigail_reader/template/expected/template_class_cc.abi_stg b/test_cases/abigail_reader/template/expected/template_class_cc.abi_stg index 72e30b7..1738b9d 100644 --- a/test_cases/abigail_reader/template/expected/template_class_cc.abi_stg +++ b/test_cases/abigail_reader/template/expected/template_class_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,12 +8,12 @@ primitive { array { id: 0x9d362140 number_of_elements: 17 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } member { id: 0xe0b89aa0 name: "member" - type_id: 0x9d362140 + type_id: 0x9d362140 # int[17] } struct_union { id: 0x0515f337 @@ -21,7 +21,7 @@ struct_union { name: "wrapper<int, 17>" definition { bytesize: 68 - member_id: 0xe0b89aa0 + member_id: 0xe0b89aa0 # int member[17] } } elf_symbol { @@ -29,10 +29,10 @@ elf_symbol { name: "variable" is_defined: true symbol_type: OBJECT - type_id: 0x0515f337 + type_id: 0x0515f337 # struct wrapper<int, 17> full_name: "variable" } interface { id: 0x84ea5130 - symbol_id: 0x4529dee2 + symbol_id: 0x4529dee2 # struct wrapper<int, 17> variable } diff --git a/test_cases/abigail_reader/template/expected/template_function_cc.abi_stg b/test_cases/abigail_reader/template/expected/template_function_cc.abi_stg index 13a726b..9400f4b 100644 --- a/test_cases/abigail_reader/template/expected/template_function_cc.abi_stg +++ b/test_cases/abigail_reader/template/expected/template_function_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,7 +7,7 @@ special { pointer_reference { id: 0xde581bbb kind: LVALUE_REFERENCE - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -16,12 +16,12 @@ primitive { } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } function { id: 0x270e577d - return_type_id: 0x48b5725f - parameter_id: 0xde581bbb + return_type_id: 0x48b5725f # void + parameter_id: 0xde581bbb # int& } elf_symbol { id: 0x8a449676 @@ -29,7 +29,7 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x270e577d + type_id: 0x270e577d # void(int&) full_name: "func<int, 17>" } elf_symbol { @@ -37,11 +37,11 @@ elf_symbol { name: "_Z7triggerv" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "trigger" } interface { id: 0x84ea5130 - symbol_id: 0x8a449676 - symbol_id: 0x9fd01bb1 + symbol_id: 0x8a449676 # void func<int, 17>(int&) + symbol_id: 0x9fd01bb1 # void trigger() } diff --git a/test_cases/abigail_reader/template/expected/template_member_function_cc.abi_stg b/test_cases/abigail_reader/template/expected/template_member_function_cc.abi_stg index 36a2bfe..0851e95 100644 --- a/test_cases/abigail_reader/template/expected/template_member_function_cc.abi_stg +++ b/test_cases/abigail_reader/template/expected/template_member_function_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x3ad526c8 kind: POINTER - pointee_type_id: 0xc1147dbd + pointee_type_id: 0xc1147dbd # struct A } pointer_reference { id: 0xde581bbb kind: LVALUE_REFERENCE - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0xf7d5301f kind: LVALUE_REFERENCE - pointee_type_id: 0xc1147dbd + pointee_type_id: 0xc1147dbd # struct A } primitive { id: 0x6720d32f @@ -34,21 +34,21 @@ struct_union { } function { id: 0x1d54784f - return_type_id: 0x48b5725f - parameter_id: 0x3ad526c8 - parameter_id: 0xde581bbb + return_type_id: 0x48b5725f # void + parameter_id: 0x3ad526c8 # struct A* + parameter_id: 0xde581bbb # int& } function { id: 0x2d6d1d94 - return_type_id: 0x48b5725f - parameter_id: 0xf7d5301f + return_type_id: 0x48b5725f # void + parameter_id: 0xf7d5301f # struct A& } elf_symbol { id: 0x698c1373 name: "_Z7triggerR1A" is_defined: true symbol_type: FUNCTION - type_id: 0x2d6d1d94 + type_id: 0x2d6d1d94 # void(struct A&) full_name: "trigger" } elf_symbol { @@ -57,11 +57,11 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x1d54784f + type_id: 0x1d54784f # void(struct A*, int&) full_name: "A::func<int, 17>" } interface { id: 0x84ea5130 - symbol_id: 0x698c1373 - symbol_id: 0x30ccf441 + symbol_id: 0x698c1373 # void trigger(struct A&) + symbol_id: 0x30ccf441 # void A::func<int, 17>(struct A*, int&) } diff --git a/test_cases/abigail_reader/template/expected/template_typedef_cc.abi_stg b/test_cases/abigail_reader/template/expected/template_typedef_cc.abi_stg index ec955b1..3919887 100644 --- a/test_cases/abigail_reader/template/expected/template_typedef_cc.abi_stg +++ b/test_cases/abigail_reader/template/expected/template_typedef_cc.abi_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0xd9d16158 name: "A<bool, 17>" - referred_type_id: 0x9c55ba7e + referred_type_id: 0x9c55ba7e # bool[17] } typedef { id: 0xc2355d02 name: "A<int, 17>" - referred_type_id: 0x9d362140 + referred_type_id: 0x9d362140 # int[17] } primitive { id: 0x62aebfd4 @@ -23,19 +23,19 @@ primitive { array { id: 0x9c55ba7e number_of_elements: 17 - element_type_id: 0x62aebfd4 + element_type_id: 0x62aebfd4 # bool } array { id: 0x9d362140 number_of_elements: 17 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } elf_symbol { id: 0x7709bd40 name: "x" is_defined: true symbol_type: OBJECT - type_id: 0xc2355d02 + type_id: 0xc2355d02 # A<int, 17> full_name: "x" } elf_symbol { @@ -43,11 +43,11 @@ elf_symbol { name: "y" is_defined: true symbol_type: OBJECT - type_id: 0xd9d16158 + type_id: 0xd9d16158 # A<bool, 17> full_name: "y" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 - symbol_id: 0xb5c9c657 + symbol_id: 0x7709bd40 # A<int, 17> x + symbol_id: 0xb5c9c657 # A<bool, 17> y } diff --git a/test_cases/abigail_reader/template/expected/variadic_template_alias_cc.abi_stg b/test_cases/abigail_reader/template/expected/variadic_template_alias_cc.abi_stg index 90405da..7f469ff 100644 --- a/test_cases/abigail_reader/template/expected/variadic_template_alias_cc.abi_stg +++ b/test_cases/abigail_reader/template/expected/variadic_template_alias_cc.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0xda6f7726 name: "Jones<int, bool, char>" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -15,10 +15,10 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0xda6f7726 + type_id: 0xda6f7726 # Jones<int, bool, char> full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # Jones<int, bool, char> x } diff --git a/test_cases/abigail_reader/template/expected/variadic_template_class_cc.abi_stg b/test_cases/abigail_reader/template/expected/variadic_template_class_cc.abi_stg index 13eee26..e621f2d 100644 --- a/test_cases/abigail_reader/template/expected/variadic_template_class_cc.abi_stg +++ b/test_cases/abigail_reader/template/expected/variadic_template_class_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface struct_union { id: 0xcb563532 kind: STRUCT @@ -13,10 +13,10 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0xcb563532 + type_id: 0xcb563532 # struct Smith<int, bool, char> full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # struct Smith<int, bool, char> x } diff --git a/test_cases/abigail_reader/template/expected/variadic_template_function_cc.abi_stg b/test_cases/abigail_reader/template/expected/variadic_template_function_cc.abi_stg index 8128428..628ea63 100644 --- a/test_cases/abigail_reader/template/expected/variadic_template_function_cc.abi_stg +++ b/test_cases/abigail_reader/template/expected/variadic_template_function_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x62fb2bb2 kind: RVALUE_REFERENCE - pointee_type_id: 0x62aebfd4 + pointee_type_id: 0x62aebfd4 # bool } pointer_reference { id: 0x6398b08c kind: RVALUE_REFERENCE - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0x74435b18 kind: RVALUE_REFERENCE - pointee_type_id: 0x384f7d7c + pointee_type_id: 0x384f7d7c # char } primitive { id: 0x384f7d7c @@ -36,21 +36,21 @@ primitive { } function { id: 0x09e881c8 - return_type_id: 0x48b5725f - parameter_id: 0x6398b08c - parameter_id: 0x62fb2bb2 - parameter_id: 0x74435b18 + return_type_id: 0x48b5725f # void + parameter_id: 0x6398b08c # int&& + parameter_id: 0x62fb2bb2 # bool&& + parameter_id: 0x74435b18 # char&& } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0xe79339c6 name: "_Z1fv" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "f" } elf_symbol { @@ -59,11 +59,11 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x09e881c8 + type_id: 0x09e881c8 # void(int&&, bool&&, char&&) full_name: "func<int, bool, char>" } interface { id: 0x84ea5130 - symbol_id: 0xe79339c6 - symbol_id: 0xce316f1b + symbol_id: 0xe79339c6 # void f() + symbol_id: 0xce316f1b # void func<int, bool, char>(int&&, bool&&, char&&) } diff --git a/test_cases/abigail_reader/template/expected/variadic_template_variable_cc.abi_stg b/test_cases/abigail_reader/template/expected/variadic_template_variable_cc.abi_stg index 6cdd78c..c55c266 100644 --- a/test_cases/abigail_reader/template/expected/variadic_template_variable_cc.abi_stg +++ b/test_cases/abigail_reader/template/expected/variadic_template_variable_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x33756485 name: "unsigned long" @@ -10,10 +10,10 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0x33756485 + type_id: 0x33756485 # unsigned long full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # unsigned long x } diff --git a/test_cases/abigail_reader/typedef/expected/chain_c.abi_stg b/test_cases/abigail_reader/typedef/expected/chain_c.abi_stg index e664c7d..a764751 100644 --- a/test_cases/abigail_reader/typedef/expected/chain_c.abi_stg +++ b/test_cases/abigail_reader/typedef/expected/chain_c.abi_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x4c2182f3 name: "INT_1" - referred_type_id: 0x4585663f + referred_type_id: 0x4585663f # unsigned int } typedef { id: 0x8be225a3 name: "INT_2" - referred_type_id: 0x4c2182f3 + referred_type_id: 0x4c2182f3 # INT_1 } typedef { id: 0xcaa2df0c name: "INT_3" - referred_type_id: 0x8be225a3 + referred_type_id: 0x8be225a3 # INT_2 } primitive { id: 0x4585663f @@ -23,7 +23,7 @@ primitive { member { id: 0xa078c909 name: "x" - type_id: 0xcaa2df0c + type_id: 0xcaa2df0c # INT_3 } struct_union { id: 0xb88f5ef1 @@ -31,23 +31,23 @@ struct_union { name: "foo" definition { bytesize: 4 - member_id: 0xa078c909 + member_id: 0xa078c909 # INT_3 x } } function { id: 0xe0f8a947 - return_type_id: 0x4585663f - parameter_id: 0xb88f5ef1 + return_type_id: 0x4585663f # unsigned int + parameter_id: 0xb88f5ef1 # struct foo } elf_symbol { id: 0xa49e03a0 name: "func" is_defined: true symbol_type: FUNCTION - type_id: 0xe0f8a947 + type_id: 0xe0f8a947 # unsigned int(struct foo) full_name: "func" } interface { id: 0x84ea5130 - symbol_id: 0xa49e03a0 + symbol_id: 0xa49e03a0 # unsigned int func(struct foo) } diff --git a/test_cases/abigail_reader/typedef/expected/nullptr_cc.abi_stg b/test_cases/abigail_reader/typedef/expected/nullptr_cc.abi_stg index 3e32093..8e118a7 100644 --- a/test_cases/abigail_reader/typedef/expected/nullptr_cc.abi_stg +++ b/test_cases/abigail_reader/typedef/expected/nullptr_cc.abi_stg @@ -1,22 +1,22 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0x9a0c90e8 name: "_Z3fooDn" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x9a0c90e8 + symbol_id: 0x9a0c90e8 # void foo() } diff --git a/test_cases/abigail_reader/typedef/expected/scoped_composite_nested_struct_cc.abi_stg b/test_cases/abigail_reader/typedef/expected/scoped_composite_nested_struct_cc.abi_stg index aba62cb..c33cf8e 100644 --- a/test_cases/abigail_reader/typedef/expected/scoped_composite_nested_struct_cc.abi_stg +++ b/test_cases/abigail_reader/typedef/expected/scoped_composite_nested_struct_cc.abi_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0xfb6cf44f name: "Scope::UnnamedClass" - referred_type_id: 0x3bed8a5a + referred_type_id: 0x3bed8a5a # struct { struct Scope::<unnamed struct>::Nested nested; } } typedef { id: 0xcab74faf name: "Scope::UnnamedStruct" - referred_type_id: 0x3bed8a5a + referred_type_id: 0x3bed8a5a # struct { struct Scope::<unnamed struct>::Nested nested; } } typedef { id: 0xceeae534 name: "Scope::UnnamedUnion" - referred_type_id: 0x755cd280 + referred_type_id: 0x755cd280 # union { struct Scope::<unnamed union>::Nested nested; } } primitive { id: 0xfc0e1dbd @@ -23,24 +23,24 @@ primitive { member { id: 0x8e073a07 name: "nested" - type_id: 0x5b06e344 + type_id: 0x5b06e344 # struct Scope::<unnamed struct>::Nested } member { id: 0x8e983d07 name: "nested" - type_id: 0xc401e384 + type_id: 0xc401e384 # struct Scope::<unnamed union>::Nested } member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x3bed8a5a kind: STRUCT definition { bytesize: 8 - member_id: 0x8e073a07 + member_id: 0x8e073a07 # struct Scope::<unnamed struct>::Nested nested } } struct_union { @@ -48,7 +48,7 @@ struct_union { kind: UNION definition { bytesize: 8 - member_id: 0x8e983d07 + member_id: 0x8e983d07 # struct Scope::<unnamed union>::Nested nested } } struct_union { @@ -57,7 +57,7 @@ struct_union { name: "Scope::<unnamed struct>::Nested" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -66,7 +66,7 @@ struct_union { name: "Scope::<unnamed union>::Nested" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } elf_symbol { @@ -74,7 +74,7 @@ elf_symbol { name: "unnamed_class" is_defined: true symbol_type: OBJECT - type_id: 0xfb6cf44f + type_id: 0xfb6cf44f # Scope::UnnamedClass full_name: "unnamed_class" } elf_symbol { @@ -82,7 +82,7 @@ elf_symbol { name: "unnamed_struct" is_defined: true symbol_type: OBJECT - type_id: 0xcab74faf + type_id: 0xcab74faf # Scope::UnnamedStruct full_name: "unnamed_struct" } elf_symbol { @@ -90,12 +90,12 @@ elf_symbol { name: "unnamed_union" is_defined: true symbol_type: OBJECT - type_id: 0xceeae534 + type_id: 0xceeae534 # Scope::UnnamedUnion full_name: "unnamed_union" } interface { id: 0x84ea5130 - symbol_id: 0x07764df4 - symbol_id: 0x9f8f7d6d - symbol_id: 0x1b55b488 + symbol_id: 0x07764df4 # Scope::UnnamedClass unnamed_class + symbol_id: 0x9f8f7d6d # Scope::UnnamedStruct unnamed_struct + symbol_id: 0x1b55b488 # Scope::UnnamedUnion unnamed_union } diff --git a/test_cases/abigail_reader/typedef/expected/simple_c.abi_stg b/test_cases/abigail_reader/typedef/expected/simple_c.abi_stg index 4e8cb49..e45713e 100644 --- a/test_cases/abigail_reader/typedef/expected/simple_c.abi_stg +++ b/test_cases/abigail_reader/typedef/expected/simple_c.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x1e70e31d name: "large" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -18,7 +18,7 @@ primitive { member { id: 0xa0ac1b35 name: "x" - type_id: 0x1e70e31d + type_id: 0x1e70e31d # large } struct_union { id: 0xb88f5ef1 @@ -26,25 +26,25 @@ struct_union { name: "foo" definition { bytesize: 4 - member_id: 0xa0ac1b35 + member_id: 0xa0ac1b35 # large x } } function { id: 0x8903ec25 - return_type_id: 0xfc0e1dbd - parameter_id: 0xb88f5ef1 + return_type_id: 0xfc0e1dbd # long + parameter_id: 0xb88f5ef1 # struct foo } function { id: 0xa0bc035e - return_type_id: 0xfc0e1dbd - parameter_id: 0x1e70e31d + return_type_id: 0xfc0e1dbd # long + parameter_id: 0x1e70e31d # large } elf_symbol { id: 0x55bca565 name: "id1" is_defined: true symbol_type: FUNCTION - type_id: 0x8903ec25 + type_id: 0x8903ec25 # long(struct foo) full_name: "id1" } elf_symbol { @@ -52,11 +52,11 @@ elf_symbol { name: "id2" is_defined: true symbol_type: FUNCTION - type_id: 0xa0bc035e + type_id: 0xa0bc035e # long(large) full_name: "id2" } interface { id: 0x84ea5130 - symbol_id: 0x55bca565 - symbol_id: 0x947ccf1d + symbol_id: 0x55bca565 # long id1(struct foo) + symbol_id: 0x947ccf1d # long id2(large) } diff --git a/test_cases/abigail_reader/typedef/expected/simple_cc.abi_stg b/test_cases/abigail_reader/typedef/expected/simple_cc.abi_stg index 67a97cb..186173c 100644 --- a/test_cases/abigail_reader/typedef/expected/simple_cc.abi_stg +++ b/test_cases/abigail_reader/typedef/expected/simple_cc.abi_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x1e70e31d name: "large" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -18,7 +18,7 @@ primitive { member { id: 0xa0ac1b35 name: "x" - type_id: 0x1e70e31d + type_id: 0x1e70e31d # large } struct_union { id: 0xb88f5ef1 @@ -26,25 +26,25 @@ struct_union { name: "foo" definition { bytesize: 4 - member_id: 0xa0ac1b35 + member_id: 0xa0ac1b35 # large x } } function { id: 0x8903ec25 - return_type_id: 0xfc0e1dbd - parameter_id: 0xb88f5ef1 + return_type_id: 0xfc0e1dbd # long + parameter_id: 0xb88f5ef1 # struct foo } function { id: 0xa0bc035e - return_type_id: 0xfc0e1dbd - parameter_id: 0x1e70e31d + return_type_id: 0xfc0e1dbd # long + parameter_id: 0x1e70e31d # large } elf_symbol { id: 0x7ecd75c6 name: "_Z3id13foo" is_defined: true symbol_type: FUNCTION - type_id: 0x8903ec25 + type_id: 0x8903ec25 # long(struct foo) full_name: "id1" } elf_symbol { @@ -52,11 +52,11 @@ elf_symbol { name: "_Z3id2i" is_defined: true symbol_type: FUNCTION - type_id: 0xa0bc035e + type_id: 0xa0bc035e # long(large) full_name: "id2" } interface { id: 0x84ea5130 - symbol_id: 0x7ecd75c6 - symbol_id: 0x763ddaba + symbol_id: 0x7ecd75c6 # long id1(struct foo) + symbol_id: 0x763ddaba # long id2(large) } diff --git a/test_cases/abigail_reader/typedef/expected/using_and_typedef_cc.abi_stg b/test_cases/abigail_reader/typedef/expected/using_and_typedef_cc.abi_stg index afe8d63..320f727 100644 --- a/test_cases/abigail_reader/typedef/expected/using_and_typedef_cc.abi_stg +++ b/test_cases/abigail_reader/typedef/expected/using_and_typedef_cc.abi_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x1e70e31d name: "large" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } typedef { id: 0x8a4b42d3 name: "small" - referred_type_id: 0xb0312d5a + referred_type_id: 0xb0312d5a # short } primitive { id: 0x6720d32f @@ -22,18 +22,18 @@ primitive { } function { id: 0x444df63a - return_type_id: 0x8a4b42d3 + return_type_id: 0x8a4b42d3 # small } function { id: 0xa208cc61 - return_type_id: 0x1e70e31d + return_type_id: 0x1e70e31d # large } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0xa208cc61 + type_id: 0xa208cc61 # large() full_name: "bar" } elf_symbol { @@ -41,11 +41,11 @@ elf_symbol { name: "_Z3foov" is_defined: true symbol_type: FUNCTION - type_id: 0x444df63a + type_id: 0x444df63a # small() full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 - symbol_id: 0x10da60a3 + symbol_id: 0x92009dc1 # large bar() + symbol_id: 0x10da60a3 # small foo() } diff --git a/test_cases/abigail_reader/typedef/expected/using_in_function_cc.abi_stg b/test_cases/abigail_reader/typedef/expected/using_in_function_cc.abi_stg index 0a94e39..40cfa60 100644 --- a/test_cases/abigail_reader/typedef/expected/using_in_function_cc.abi_stg +++ b/test_cases/abigail_reader/typedef/expected/using_in_function_cc.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -7,17 +7,17 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 + symbol_id: 0x92009dc1 # int bar() } diff --git a/test_cases/abigail_reader/typedef/expected/void_typedef_c.abi_stg b/test_cases/abigail_reader/typedef/expected/void_typedef_c.abi_stg index 55d4d5f..8246c0f 100644 --- a/test_cases/abigail_reader/typedef/expected/void_typedef_c.abi_stg +++ b/test_cases/abigail_reader/typedef/expected/void_typedef_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,26 +7,26 @@ special { pointer_reference { id: 0x273ae441 kind: POINTER - pointee_type_id: 0xb6ab779b + pointee_type_id: 0xb6ab779b # nil } typedef { id: 0xb6ab779b name: "nil" - referred_type_id: 0x48b5725f + referred_type_id: 0x48b5725f # void } function { id: 0xd6101c84 - return_type_id: 0x273ae441 + return_type_id: 0x273ae441 # nil* } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0xd6101c84 + type_id: 0xd6101c84 # nil*() full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # nil* foo() } diff --git a/test_cases/abigail_reader/types/expected/char_c.abi_stg b/test_cases/abigail_reader/types/expected/char_c.abi_stg index 4d8dc8d..5cf2795 100644 --- a/test_cases/abigail_reader/types/expected/char_c.abi_stg +++ b/test_cases/abigail_reader/types/expected/char_c.abi_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x384f7d7c name: "char" @@ -17,25 +17,25 @@ primitive { } function { id: 0x0ccacff7 - return_type_id: 0x384f7d7c - parameter_id: 0x384f7d7c + return_type_id: 0x384f7d7c # char + parameter_id: 0x384f7d7c # char } function { id: 0x903bc575 - return_type_id: 0x5ab350f8 - parameter_id: 0x5ab350f8 + return_type_id: 0x5ab350f8 # signed char + parameter_id: 0x5ab350f8 # signed char } function { id: 0xdab9eed2 - return_type_id: 0x5d8155a5 - parameter_id: 0x5d8155a5 + return_type_id: 0x5d8155a5 # unsigned char + parameter_id: 0x5d8155a5 # unsigned char } elf_symbol { id: 0x7709bd40 name: "x" is_defined: true symbol_type: FUNCTION - type_id: 0x903bc575 + type_id: 0x903bc575 # signed char(signed char) full_name: "x" } elf_symbol { @@ -43,7 +43,7 @@ elf_symbol { name: "y" is_defined: true symbol_type: FUNCTION - type_id: 0x0ccacff7 + type_id: 0x0ccacff7 # char(char) full_name: "y" } elf_symbol { @@ -51,12 +51,12 @@ elf_symbol { name: "z" is_defined: true symbol_type: FUNCTION - type_id: 0xdab9eed2 + type_id: 0xdab9eed2 # unsigned char(unsigned char) full_name: "z" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 - symbol_id: 0xb5c9c657 - symbol_id: 0xf58aebbc + symbol_id: 0x7709bd40 # signed char x(signed char) + symbol_id: 0xb5c9c657 # char y(char) + symbol_id: 0xf58aebbc # unsigned char z(unsigned char) } diff --git a/test_cases/abigail_reader/types/expected/pointer_c.abi_stg b/test_cases/abigail_reader/types/expected/pointer_c.abi_stg index fc965b0..5505911 100644 --- a/test_cases/abigail_reader/types/expected/pointer_c.abi_stg +++ b/test_cases/abigail_reader/types/expected/pointer_c.abi_stg @@ -1,29 +1,29 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x03bcc221 kind: POINTER - pointee_type_id: 0x24b3ee1b + pointee_type_id: 0x24b3ee1b # struct foo* } pointer_reference { id: 0x0717146f kind: POINTER - pointee_type_id: 0x361cb720 + pointee_type_id: 0x361cb720 # const struct foo* } pointer_reference { id: 0x24b3ee1b kind: POINTER - pointee_type_id: 0xb88f5ef1 + pointee_type_id: 0xb88f5ef1 # struct foo } pointer_reference { id: 0x361cb720 kind: POINTER - pointee_type_id: 0xf2323a1e + pointee_type_id: 0xf2323a1e # const struct foo } qualified { id: 0xf2323a1e qualifier: CONST - qualified_type_id: 0xb88f5ef1 + qualified_type_id: 0xb88f5ef1 # struct foo } primitive { id: 0x6720d32f @@ -38,7 +38,7 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0xb88f5ef1 @@ -46,7 +46,7 @@ struct_union { name: "foo" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } elf_symbol { @@ -54,7 +54,7 @@ elf_symbol { name: "a" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "a" } elf_symbol { @@ -62,7 +62,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: OBJECT - type_id: 0xb88f5ef1 + type_id: 0xb88f5ef1 # struct foo full_name: "b" } elf_symbol { @@ -70,7 +70,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0x24b3ee1b + type_id: 0x24b3ee1b # struct foo* full_name: "c" } elf_symbol { @@ -78,7 +78,7 @@ elf_symbol { name: "e" is_defined: true symbol_type: OBJECT - type_id: 0x03bcc221 + type_id: 0x03bcc221 # struct foo** full_name: "e" } elf_symbol { @@ -86,7 +86,7 @@ elf_symbol { name: "g" is_defined: true symbol_type: OBJECT - type_id: 0xf2323a1e + type_id: 0xf2323a1e # const struct foo full_name: "g" } elf_symbol { @@ -94,7 +94,7 @@ elf_symbol { name: "h" is_defined: true symbol_type: OBJECT - type_id: 0x361cb720 + type_id: 0x361cb720 # const struct foo* full_name: "h" } elf_symbol { @@ -102,16 +102,16 @@ elf_symbol { name: "j" is_defined: true symbol_type: OBJECT - type_id: 0x0717146f + type_id: 0x0717146f # const struct foo** full_name: "j" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0xa2b65a7e - symbol_id: 0x213764e1 - symbol_id: 0x68f3ac2c - symbol_id: 0xe98c5fb8 + symbol_id: 0xa7b0241d # int a + symbol_id: 0xe371117a # struct foo b + symbol_id: 0x2230fb28 # struct foo* c + symbol_id: 0xa2b65a7e # struct foo** e + symbol_id: 0x213764e1 # const struct foo g + symbol_id: 0x68f3ac2c # const struct foo* h + symbol_id: 0xe98c5fb8 # const struct foo** j } diff --git a/test_cases/abigail_reader/types/expected/pointer_reference_cc.abi_stg b/test_cases/abigail_reader/types/expected/pointer_reference_cc.abi_stg index b14fb73..0ad155c 100644 --- a/test_cases/abigail_reader/types/expected/pointer_reference_cc.abi_stg +++ b/test_cases/abigail_reader/types/expected/pointer_reference_cc.abi_stg @@ -1,49 +1,49 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x03bcc221 kind: POINTER - pointee_type_id: 0x24b3ee1b + pointee_type_id: 0x24b3ee1b # struct foo* } pointer_reference { id: 0x0717146f kind: POINTER - pointee_type_id: 0x361cb720 + pointee_type_id: 0x361cb720 # const struct foo* } pointer_reference { id: 0x24b3ee1b kind: POINTER - pointee_type_id: 0xb88f5ef1 + pointee_type_id: 0xb88f5ef1 # struct foo } pointer_reference { id: 0x361cb720 kind: POINTER - pointee_type_id: 0xf2323a1e + pointee_type_id: 0xf2323a1e # const struct foo } pointer_reference { id: 0xca1702b8 kind: LVALUE_REFERENCE - pointee_type_id: 0x361cb720 + pointee_type_id: 0x361cb720 # const struct foo* } pointer_reference { id: 0xcebcd4f6 kind: LVALUE_REFERENCE - pointee_type_id: 0x24b3ee1b + pointee_type_id: 0x24b3ee1b # struct foo* } pointer_reference { id: 0xe9b3f8cc kind: LVALUE_REFERENCE - pointee_type_id: 0xb88f5ef1 + pointee_type_id: 0xb88f5ef1 # struct foo } pointer_reference { id: 0xfb1ca1f7 kind: LVALUE_REFERENCE - pointee_type_id: 0xf2323a1e + pointee_type_id: 0xf2323a1e # const struct foo } qualified { id: 0xf2323a1e qualifier: CONST - qualified_type_id: 0xb88f5ef1 + qualified_type_id: 0xb88f5ef1 # struct foo } primitive { id: 0x6720d32f @@ -58,7 +58,7 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0xb88f5ef1 @@ -66,7 +66,7 @@ struct_union { name: "foo" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } elf_symbol { @@ -74,7 +74,7 @@ elf_symbol { name: "a" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "a" } elf_symbol { @@ -82,7 +82,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: OBJECT - type_id: 0xb88f5ef1 + type_id: 0xb88f5ef1 # struct foo full_name: "b" } elf_symbol { @@ -90,7 +90,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0x24b3ee1b + type_id: 0x24b3ee1b # struct foo* full_name: "c" } elf_symbol { @@ -98,7 +98,7 @@ elf_symbol { name: "d" is_defined: true symbol_type: OBJECT - type_id: 0xe9b3f8cc + type_id: 0xe9b3f8cc # struct foo& full_name: "d" } elf_symbol { @@ -106,7 +106,7 @@ elf_symbol { name: "e" is_defined: true symbol_type: OBJECT - type_id: 0x03bcc221 + type_id: 0x03bcc221 # struct foo** full_name: "e" } elf_symbol { @@ -114,7 +114,7 @@ elf_symbol { name: "f" is_defined: true symbol_type: OBJECT - type_id: 0xcebcd4f6 + type_id: 0xcebcd4f6 # struct foo*& full_name: "f" } elf_symbol { @@ -122,7 +122,7 @@ elf_symbol { name: "h" is_defined: true symbol_type: OBJECT - type_id: 0x361cb720 + type_id: 0x361cb720 # const struct foo* full_name: "h" } elf_symbol { @@ -130,7 +130,7 @@ elf_symbol { name: "i" is_defined: true symbol_type: OBJECT - type_id: 0xfb1ca1f7 + type_id: 0xfb1ca1f7 # const struct foo& full_name: "i" } elf_symbol { @@ -138,7 +138,7 @@ elf_symbol { name: "j" is_defined: true symbol_type: OBJECT - type_id: 0x0717146f + type_id: 0x0717146f # const struct foo** full_name: "j" } elf_symbol { @@ -146,19 +146,19 @@ elf_symbol { name: "k" is_defined: true symbol_type: OBJECT - type_id: 0xca1702b8 + type_id: 0xca1702b8 # const struct foo*& full_name: "k" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x63f6f9b1 - symbol_id: 0xa2b65a7e - symbol_id: 0xe0778f95 - symbol_id: 0x68f3ac2c - symbol_id: 0xa9b30393 - symbol_id: 0xe98c5fb8 - symbol_id: 0x284c384a + symbol_id: 0xa7b0241d # int a + symbol_id: 0xe371117a # struct foo b + symbol_id: 0x2230fb28 # struct foo* c + symbol_id: 0x63f6f9b1 # struct foo& d + symbol_id: 0xa2b65a7e # struct foo** e + symbol_id: 0xe0778f95 # struct foo*& f + symbol_id: 0x68f3ac2c # const struct foo* h + symbol_id: 0xa9b30393 # const struct foo& i + symbol_id: 0xe98c5fb8 # const struct foo** j + symbol_id: 0x284c384a # const struct foo*& k } diff --git a/test_cases/info_tests/array/expected/multidimensional_c.btf_stg b/test_cases/info_tests/array/expected/multidimensional_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/array/expected/multidimensional_c.btf_stg +++ b/test_cases/info_tests/array/expected/multidimensional_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/array/expected/multidimensional_c.elf_stg b/test_cases/info_tests/array/expected/multidimensional_c.elf_stg index 3a2628f..9d5c480 100644 --- a/test_cases/info_tests/array/expected/multidimensional_c.elf_stg +++ b/test_cases/info_tests/array/expected/multidimensional_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -9,27 +9,27 @@ primitive { array { id: 0x0b0dc1ff number_of_elements: 3 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } array { id: 0x8e8e6365 number_of_elements: 4 - element_type_id: 0x0b0dc1ff + element_type_id: 0x0b0dc1ff # int[3] } array { id: 0x966a7e53 number_of_elements: 1 - element_type_id: 0x8e8e6365 + element_type_id: 0x8e8e6365 # int[4][3] } elf_symbol { id: 0x7709bd40 name: "x" is_defined: true symbol_type: OBJECT - type_id: 0x966a7e53 + type_id: 0x966a7e53 # int[1][4][3] full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # int x[1][4][3] } diff --git a/test_cases/info_tests/array/expected/multidimensional_cc.elf_stg b/test_cases/info_tests/array/expected/multidimensional_cc.elf_stg index 3a2628f..9d5c480 100644 --- a/test_cases/info_tests/array/expected/multidimensional_cc.elf_stg +++ b/test_cases/info_tests/array/expected/multidimensional_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -9,27 +9,27 @@ primitive { array { id: 0x0b0dc1ff number_of_elements: 3 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } array { id: 0x8e8e6365 number_of_elements: 4 - element_type_id: 0x0b0dc1ff + element_type_id: 0x0b0dc1ff # int[3] } array { id: 0x966a7e53 number_of_elements: 1 - element_type_id: 0x8e8e6365 + element_type_id: 0x8e8e6365 # int[4][3] } elf_symbol { id: 0x7709bd40 name: "x" is_defined: true symbol_type: OBJECT - type_id: 0x966a7e53 + type_id: 0x966a7e53 # int[1][4][3] full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # int x[1][4][3] } diff --git a/test_cases/info_tests/array/expected/simple_array_c.btf_stg b/test_cases/info_tests/array/expected/simple_array_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/array/expected/simple_array_c.btf_stg +++ b/test_cases/info_tests/array/expected/simple_array_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/array/expected/simple_array_c.elf_stg b/test_cases/info_tests/array/expected/simple_array_c.elf_stg index c032ead..5c069d9 100644 --- a/test_cases/info_tests/array/expected/simple_array_c.elf_stg +++ b/test_cases/info_tests/array/expected/simple_array_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x4585663f name: "unsigned int" @@ -9,17 +9,17 @@ primitive { array { id: 0x7dc8196c number_of_elements: 2 - element_type_id: 0x4585663f + element_type_id: 0x4585663f # unsigned int } elf_symbol { id: 0x30693519 name: "numbers" is_defined: true symbol_type: OBJECT - type_id: 0x7dc8196c + type_id: 0x7dc8196c # unsigned int[2] full_name: "numbers" } interface { id: 0x84ea5130 - symbol_id: 0x30693519 + symbol_id: 0x30693519 # unsigned int numbers[2] } diff --git a/test_cases/info_tests/array/expected/simple_array_cc.elf_stg b/test_cases/info_tests/array/expected/simple_array_cc.elf_stg index c032ead..5c069d9 100644 --- a/test_cases/info_tests/array/expected/simple_array_cc.elf_stg +++ b/test_cases/info_tests/array/expected/simple_array_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x4585663f name: "unsigned int" @@ -9,17 +9,17 @@ primitive { array { id: 0x7dc8196c number_of_elements: 2 - element_type_id: 0x4585663f + element_type_id: 0x4585663f # unsigned int } elf_symbol { id: 0x30693519 name: "numbers" is_defined: true symbol_type: OBJECT - type_id: 0x7dc8196c + type_id: 0x7dc8196c # unsigned int[2] full_name: "numbers" } interface { id: 0x84ea5130 - symbol_id: 0x30693519 + symbol_id: 0x30693519 # unsigned int numbers[2] } diff --git a/test_cases/info_tests/array/expected/unknown_size_c.btf_stg b/test_cases/info_tests/array/expected/unknown_size_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/array/expected/unknown_size_c.btf_stg +++ b/test_cases/info_tests/array/expected/unknown_size_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/array/expected/unknown_size_c.elf_stg b/test_cases/info_tests/array/expected/unknown_size_c.elf_stg index c6be81d..31b5ff8 100644 --- a/test_cases/info_tests/array/expected/unknown_size_c.elf_stg +++ b/test_cases/info_tests/array/expected/unknown_size_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x15053314 name: "double" @@ -14,17 +14,17 @@ primitive { } array { id: 0xc178c235 - element_type_id: 0x15053314 + element_type_id: 0x15053314 # double } member { id: 0x9cebeb53 name: "bar" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x964b7931 name: "baz" - type_id: 0xc178c235 + type_id: 0xc178c235 # double[0] offset: 64 } struct_union { @@ -33,8 +33,8 @@ struct_union { name: "foo" definition { bytesize: 8 - member_id: 0x9cebeb53 - member_id: 0x964b7931 + member_id: 0x9cebeb53 # int bar + member_id: 0x964b7931 # double baz[0] } } elf_symbol { @@ -42,10 +42,10 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0xb88f5ef1 + type_id: 0xb88f5ef1 # struct foo full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # struct foo x } diff --git a/test_cases/info_tests/array/expected/unknown_size_extern_c.btf_stg b/test_cases/info_tests/array/expected/unknown_size_extern_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/array/expected/unknown_size_extern_c.btf_stg +++ b/test_cases/info_tests/array/expected/unknown_size_extern_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/array/expected/unknown_size_extern_c.elf_stg b/test_cases/info_tests/array/expected/unknown_size_extern_c.elf_stg index adb762d..97be351 100644 --- a/test_cases/info_tests/array/expected/unknown_size_extern_c.elf_stg +++ b/test_cases/info_tests/array/expected/unknown_size_extern_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -9,17 +9,17 @@ primitive { array { id: 0xac01d241 number_of_elements: 1 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0xac01d241 + type_id: 0xac01d241 # int[1] full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # int foo[1] } diff --git a/test_cases/info_tests/array/expected/variable_length_c.btf_stg b/test_cases/info_tests/array/expected/variable_length_c.btf_stg index 9c060ae..a9f6bde 100644 --- a/test_cases/info_tests/array/expected/variable_length_c.btf_stg +++ b/test_cases/info_tests/array/expected/variable_length_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,16 +8,16 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0xa58ca0b6 name: "bar" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 + symbol_id: 0xa58ca0b6 # int bar() } diff --git a/test_cases/info_tests/array/expected/variable_length_c.elf_stg b/test_cases/info_tests/array/expected/variable_length_c.elf_stg index 9929dfc..80c4c20 100644 --- a/test_cases/info_tests/array/expected/variable_length_c.elf_stg +++ b/test_cases/info_tests/array/expected/variable_length_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,17 +8,17 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0xa58ca0b6 name: "bar" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 + symbol_id: 0xa58ca0b6 # int bar() } diff --git a/test_cases/info_tests/composite/expected/abstract_base_class_cc.elf_stg b/test_cases/info_tests/composite/expected/abstract_base_class_cc.elf_stg index b1beee3..d2b839f 100644 --- a/test_cases/info_tests/composite/expected/abstract_base_class_cc.elf_stg +++ b/test_cases/info_tests/composite/expected/abstract_base_class_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,27 +7,27 @@ special { pointer_reference { id: 0x01ec39fc kind: POINTER - pointee_type_id: 0x2df0016c + pointee_type_id: 0x2df0016c # int(*)() } pointer_reference { id: 0x0b5e55a4 kind: POINTER - pointee_type_id: 0x0739b00c + pointee_type_id: 0x0739b00c # struct X } pointer_reference { id: 0x134ef871 kind: POINTER - pointee_type_id: 0x677b0759 + pointee_type_id: 0x677b0759 # struct Y } pointer_reference { id: 0x2df0016c kind: POINTER - pointee_type_id: 0x9d80e32f + pointee_type_id: 0x9d80e32f # int() } pointer_reference { id: 0xc65e4373 kind: LVALUE_REFERENCE - pointee_type_id: 0x0739b00c + pointee_type_id: 0x0739b00c # struct X } primitive { id: 0x6720d32f @@ -37,39 +37,39 @@ primitive { } base_class { id: 0x166ca3db - type_id: 0x0739b00c + type_id: 0x0739b00c # struct X inheritance: NON_VIRTUAL } method { id: 0x4dd47407 mangled_name: "_ZN1X1fEv" name: "f" - type_id: 0x9f577646 + type_id: 0x9f577646 # int(struct X*) } method { id: 0xb8b6ef68 mangled_name: "_ZN1X1gEv" name: "g" vtable_offset: 1 - type_id: 0x9f577646 + type_id: 0x9f577646 # int(struct X*) } method { id: 0x63c715c4 mangled_name: "_ZN1Y1fEv" name: "f" - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) } method { id: 0xe8e61433 mangled_name: "_ZN1Y1gEv" name: "g" vtable_offset: 1 - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) } member { id: 0x687cadfe name: "_vptr$X" - type_id: 0x01ec39fc + type_id: 0x01ec39fc # int(**)() } struct_union { id: 0x0739b00c @@ -77,9 +77,9 @@ struct_union { name: "X" definition { bytesize: 8 - method_id: 0x4dd47407 - method_id: 0xb8b6ef68 - member_id: 0x687cadfe + method_id: 0x4dd47407 # int f(struct X*) + method_id: 0xb8b6ef68 # int g(struct X*) + member_id: 0x687cadfe # int(** _vptr$X)() } } struct_union { @@ -88,46 +88,46 @@ struct_union { name: "Y" definition { bytesize: 8 - base_class_id: 0x166ca3db - method_id: 0x63c715c4 - method_id: 0xe8e61433 + base_class_id: 0x166ca3db # struct X + method_id: 0x63c715c4 # int f(struct Y*) + method_id: 0xe8e61433 # int g(struct Y*) } } function { id: 0x124fc4fa - return_type_id: 0x48b5725f - parameter_id: 0x0b5e55a4 + return_type_id: 0x48b5725f # void + parameter_id: 0x0b5e55a4 # struct X* } function { id: 0x144bef8f - return_type_id: 0x48b5725f - parameter_id: 0x134ef871 + return_type_id: 0x48b5725f # void + parameter_id: 0x134ef871 # struct Y* } function { id: 0x99535d33 - return_type_id: 0x6720d32f - parameter_id: 0x134ef871 + return_type_id: 0x6720d32f # int + parameter_id: 0x134ef871 # struct Y* } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } function { id: 0x9f577646 - return_type_id: 0x6720d32f - parameter_id: 0x0b5e55a4 + return_type_id: 0x6720d32f # int + parameter_id: 0x0b5e55a4 # struct X* } function { id: 0xac1773f3 - return_type_id: 0x6720d32f - parameter_id: 0xc65e4373 + return_type_id: 0x6720d32f # int + parameter_id: 0xc65e4373 # struct X& } elf_symbol { id: 0x10da60a3 name: "_Z3foov" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "foo" } elf_symbol { @@ -135,7 +135,7 @@ elf_symbol { name: "_Z3funR1X" is_defined: true symbol_type: FUNCTION - type_id: 0xac1773f3 + type_id: 0xac1773f3 # int(struct X&) full_name: "fun" } elf_symbol { @@ -144,7 +144,7 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x124fc4fa + type_id: 0x124fc4fa # void(struct X*) full_name: "X::X" } elf_symbol { @@ -152,7 +152,7 @@ elf_symbol { name: "_ZN1Y1fEv" is_defined: true symbol_type: FUNCTION - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) full_name: "Y::f" } elf_symbol { @@ -160,7 +160,7 @@ elf_symbol { name: "_ZN1Y1gEv" is_defined: true symbol_type: FUNCTION - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) full_name: "Y::g" } elf_symbol { @@ -169,7 +169,7 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x144bef8f + type_id: 0x144bef8f # void(struct Y*) full_name: "Y::Y" } elf_symbol { @@ -213,16 +213,16 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0x10da60a3 - symbol_id: 0xbc33871c - symbol_id: 0x0bbcf1df - symbol_id: 0x71a2fb93 - symbol_id: 0x938b5d81 - symbol_id: 0x8f2ed63c - symbol_id: 0x231a46da - symbol_id: 0x62dbf9a8 - symbol_id: 0xa9b67458 - symbol_id: 0x68f7d82f - symbol_id: 0x8c3333ff - symbol_id: 0x4df3aa88 + symbol_id: 0x10da60a3 # int foo() + symbol_id: 0xbc33871c # int fun(struct X&) + symbol_id: 0x0bbcf1df # void X::X(struct X*) + symbol_id: 0x71a2fb93 # int Y::f(struct Y*) + symbol_id: 0x938b5d81 # int Y::g(struct Y*) + symbol_id: 0x8f2ed63c # void Y::Y(struct Y*) + symbol_id: 0x231a46da # _ZTI1X + symbol_id: 0x62dbf9a8 # _ZTI1Y + symbol_id: 0xa9b67458 # _ZTS1X + symbol_id: 0x68f7d82f # _ZTS1Y + symbol_id: 0x8c3333ff # _ZTV1X + symbol_id: 0x4df3aa88 # _ZTV1Y } diff --git a/test_cases/info_tests/composite/expected/anonymous_cc.elf_stg b/test_cases/info_tests/composite/expected/anonymous_cc.elf_stg index 0c5fac9..cf924b2 100644 --- a/test_cases/info_tests/composite/expected/anonymous_cc.elf_stg +++ b/test_cases/info_tests/composite/expected/anonymous_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x4585663f name: "unsigned int" @@ -15,37 +15,37 @@ primitive { member { id: 0xcd3a8d16 name: "anon_class" - type_id: 0x307fdda9 + type_id: 0x307fdda9 # struct { long x; } } member { id: 0x66d27b29 name: "anon_enum" - type_id: 0x7bdf7a79 + type_id: 0x7bdf7a79 # enum { X = 2, } offset: 192 } member { id: 0x08cb6e25 name: "anon_struct" - type_id: 0x307fdda9 + type_id: 0x307fdda9 # struct { long x; } offset: 64 } member { id: 0x7deb8c98 name: "anon_union" - type_id: 0x7ee944b3 + type_id: 0x7ee944b3 # union { long x; } offset: 128 } member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x307fdda9 kind: STRUCT definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -53,7 +53,7 @@ struct_union { kind: UNION definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -62,16 +62,16 @@ struct_union { name: "Foo" definition { bytesize: 32 - member_id: 0xcd3a8d16 - member_id: 0x08cb6e25 - member_id: 0x7deb8c98 - member_id: 0x66d27b29 + member_id: 0xcd3a8d16 # struct { long x; } anon_class + member_id: 0x08cb6e25 # struct { long x; } anon_struct + member_id: 0x7deb8c98 # union { long x; } anon_union + member_id: 0x66d27b29 # enum { X = 2, } anon_enum } } enumeration { id: 0x7bdf7a79 definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "X" value: 2 @@ -83,10 +83,10 @@ elf_symbol { name: "var" is_defined: true symbol_type: OBJECT - type_id: 0xf6f304f7 + type_id: 0xf6f304f7 # struct Foo full_name: "var" } interface { id: 0x84ea5130 - symbol_id: 0x3997c6eb + symbol_id: 0x3997c6eb # struct Foo var } diff --git a/test_cases/info_tests/composite/expected/anonymous_member_c.btf_stg b/test_cases/info_tests/composite/expected/anonymous_member_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/composite/expected/anonymous_member_c.btf_stg +++ b/test_cases/info_tests/composite/expected/anonymous_member_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/composite/expected/anonymous_member_c.elf_stg b/test_cases/info_tests/composite/expected/anonymous_member_c.elf_stg index 721e033..4b9b6d8 100644 --- a/test_cases/info_tests/composite/expected/anonymous_member_c.elf_stg +++ b/test_cases/info_tests/composite/expected/anonymous_member_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,52 +8,52 @@ primitive { } member { id: 0x26e14ed5 - type_id: 0x14ab7fa8 + type_id: 0x14ab7fa8 # struct { int two; } offset: 32 } member { id: 0x2738f5df - type_id: 0x13cda76e + type_id: 0x13cda76e # struct { int one; } } member { id: 0x29b68d56 - type_id: 0x29f46346 + type_id: 0x29f46346 # struct { int eight; } offset: 96 } member { id: 0x2aee20bc - type_id: 0x2496e164 + type_id: 0x2496e164 # struct { int four; } offset: 64 } member { id: 0xc6609e76 name: "eight" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xf3ea96ff name: "four" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x2e878ed7 name: "one" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x331cedce name: "two" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0x11abcb4e kind: STRUCT definition { bytesize: 16 - member_id: 0x2738f5df - member_id: 0x26e14ed5 - member_id: 0x2aee20bc - member_id: 0x29b68d56 + member_id: 0x2738f5df # struct { int one; } + member_id: 0x26e14ed5 # struct { int two; } + member_id: 0x2aee20bc # struct { int four; } + member_id: 0x29b68d56 # struct { int eight; } } } struct_union { @@ -61,7 +61,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0x2e878ed7 + member_id: 0x2e878ed7 # int one } } struct_union { @@ -69,7 +69,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0x331cedce + member_id: 0x331cedce # int two } } struct_union { @@ -77,7 +77,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0xf3ea96ff + member_id: 0xf3ea96ff # int four } } struct_union { @@ -85,7 +85,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0xc6609e76 + member_id: 0xc6609e76 # int eight } } elf_symbol { @@ -93,10 +93,10 @@ elf_symbol { name: "v" is_defined: true symbol_type: OBJECT - type_id: 0x11abcb4e + type_id: 0x11abcb4e # struct { struct { int one; }; struct { int two; }; struct { int four; }; struct { int eight; }; } full_name: "v" } interface { id: 0x84ea5130 - symbol_id: 0xf48dba91 + symbol_id: 0xf48dba91 # struct { struct { int one; }; struct { int two; }; struct { int four; }; struct { int eight; }; } v } diff --git a/test_cases/info_tests/composite/expected/anonymous_member_chain_c.btf_stg b/test_cases/info_tests/composite/expected/anonymous_member_chain_c.btf_stg index 8de3d65..478e4f5 100644 --- a/test_cases/info_tests/composite/expected/anonymous_member_chain_c.btf_stg +++ b/test_cases/info_tests/composite/expected/anonymous_member_chain_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x384f7d7c name: "char" @@ -14,32 +14,32 @@ primitive { } member { id: 0x2a24396d - type_id: 0x27be95a5 + type_id: 0x27be95a5 # struct { char y; } } member { id: 0x2fddd982 - type_id: 0x3059161a + type_id: 0x3059161a # struct { int x; } } member { id: 0x348a54af - type_id: 0x5d0722af + type_id: 0x5d0722af # union { struct { int x; }; struct { char y; }; } } member { id: 0xa0d54b05 name: "x" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xff4b45f9 name: "y" - type_id: 0x384f7d7c + type_id: 0x384f7d7c # char } struct_union { id: 0x27be95a5 kind: STRUCT definition { bytesize: 1 - member_id: 0xff4b45f9 + member_id: 0xff4b45f9 # char y } } struct_union { @@ -47,7 +47,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } struct_union { @@ -55,8 +55,8 @@ struct_union { kind: UNION definition { bytesize: 4 - member_id: 0x2fddd982 - member_id: 0x2a24396d + member_id: 0x2fddd982 # struct { int x; } + member_id: 0x2a24396d # struct { char y; } } } struct_union { @@ -65,21 +65,21 @@ struct_union { name: "A" definition { bytesize: 4 - member_id: 0x348a54af + member_id: 0x348a54af # union { struct { int x; }; struct { char y; }; } } } function { id: 0x4f13c399 - return_type_id: 0xc1147dbd + return_type_id: 0xc1147dbd # struct A } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0x4f13c399 + type_id: 0x4f13c399 # struct A() } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # struct A foo() } diff --git a/test_cases/info_tests/composite/expected/anonymous_member_chain_c.elf_stg b/test_cases/info_tests/composite/expected/anonymous_member_chain_c.elf_stg index 720a67f..469fe6c 100644 --- a/test_cases/info_tests/composite/expected/anonymous_member_chain_c.elf_stg +++ b/test_cases/info_tests/composite/expected/anonymous_member_chain_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x384f7d7c name: "char" @@ -14,32 +14,32 @@ primitive { } member { id: 0x2a24396d - type_id: 0x27be95a5 + type_id: 0x27be95a5 # struct { char y; } } member { id: 0x2fddd982 - type_id: 0x3059161a + type_id: 0x3059161a # struct { int x; } } member { id: 0x348a54af - type_id: 0x5d0722af + type_id: 0x5d0722af # union { struct { int x; }; struct { char y; }; } } member { id: 0xa0d54b05 name: "x" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xff4b45f9 name: "y" - type_id: 0x384f7d7c + type_id: 0x384f7d7c # char } struct_union { id: 0x27be95a5 kind: STRUCT definition { bytesize: 1 - member_id: 0xff4b45f9 + member_id: 0xff4b45f9 # char y } } struct_union { @@ -47,7 +47,7 @@ struct_union { kind: STRUCT definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } struct_union { @@ -55,8 +55,8 @@ struct_union { kind: UNION definition { bytesize: 4 - member_id: 0x2fddd982 - member_id: 0x2a24396d + member_id: 0x2fddd982 # struct { int x; } + member_id: 0x2a24396d # struct { char y; } } } struct_union { @@ -65,22 +65,22 @@ struct_union { name: "A" definition { bytesize: 4 - member_id: 0x348a54af + member_id: 0x348a54af # union { struct { int x; }; struct { char y; }; } } } function { id: 0x4f13c399 - return_type_id: 0xc1147dbd + return_type_id: 0xc1147dbd # struct A } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0x4f13c399 + type_id: 0x4f13c399 # struct A() full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # struct A foo() } diff --git a/test_cases/info_tests/composite/expected/base_class_order_cc.elf_stg b/test_cases/info_tests/composite/expected/base_class_order_cc.elf_stg index 810dee0..54feacb 100644 --- a/test_cases/info_tests/composite/expected/base_class_order_cc.elf_stg +++ b/test_cases/info_tests/composite/expected/base_class_order_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,58 +8,58 @@ primitive { } base_class { id: 0x1fbc7d3f - type_id: 0x207acb9f + type_id: 0x207acb9f # struct B offset: 32 inheritance: NON_VIRTUAL } base_class { id: 0x1fbc7d40 - type_id: 0x207acb9f + type_id: 0x207acb9f # struct B inheritance: NON_VIRTUAL } base_class { id: 0x27aeadc1 - type_id: 0xc0318865 + type_id: 0xc0318865 # struct C inheritance: NON_VIRTUAL } base_class { id: 0x27aeadc2 - type_id: 0xc0318865 + type_id: 0xc0318865 # struct C offset: 64 inheritance: NON_VIRTUAL } base_class { id: 0x27e7d0b7 - type_id: 0xc1147dbd + type_id: 0xc1147dbd # struct A offset: 32 inheritance: NON_VIRTUAL } member { id: 0x8dbf34b3 name: "m" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 96 } member { id: 0x8dbf39d1 name: "m" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 64 } member { id: 0xa0d54b05 name: "x" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xff142a57 name: "y" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x21525565 name: "z" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0xc1147dbd @@ -67,7 +67,7 @@ struct_union { name: "A" definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } struct_union { @@ -76,9 +76,9 @@ struct_union { name: "AddRemove" definition { bytesize: 12 - base_class_id: 0x27aeadc1 - base_class_id: 0x1fbc7d3f - member_id: 0x8dbf39d1 + base_class_id: 0x27aeadc1 # struct C + base_class_id: 0x1fbc7d3f # struct B + member_id: 0x8dbf39d1 # int m } } struct_union { @@ -87,7 +87,7 @@ struct_union { name: "B" definition { bytesize: 4 - member_id: 0xff142a57 + member_id: 0xff142a57 # int y } } struct_union { @@ -96,7 +96,7 @@ struct_union { name: "C" definition { bytesize: 4 - member_id: 0x21525565 + member_id: 0x21525565 # int z } } struct_union { @@ -105,10 +105,10 @@ struct_union { name: "DiffOrder" definition { bytesize: 16 - base_class_id: 0x1fbc7d40 - base_class_id: 0x27e7d0b7 - base_class_id: 0x27aeadc2 - member_id: 0x8dbf34b3 + base_class_id: 0x1fbc7d40 # struct B + base_class_id: 0x27e7d0b7 # struct A + base_class_id: 0x27aeadc2 # struct C + member_id: 0x8dbf34b3 # int m } } elf_symbol { @@ -116,7 +116,7 @@ elf_symbol { name: "add_remove" is_defined: true symbol_type: OBJECT - type_id: 0x69557e8a + type_id: 0x69557e8a # struct AddRemove full_name: "add_remove" } elf_symbol { @@ -124,11 +124,11 @@ elf_symbol { name: "diff_order" is_defined: true symbol_type: OBJECT - type_id: 0x4e854f8f + type_id: 0x4e854f8f # struct DiffOrder full_name: "diff_order" } interface { id: 0x84ea5130 - symbol_id: 0x4a0401b7 - symbol_id: 0x18b35aa3 + symbol_id: 0x4a0401b7 # struct AddRemove add_remove + symbol_id: 0x18b35aa3 # struct DiffOrder diff_order } diff --git a/test_cases/info_tests/composite/expected/base_class_size_cc.elf_stg b/test_cases/info_tests/composite/expected/base_class_size_cc.elf_stg index 198bf9d..081b100 100644 --- a/test_cases/info_tests/composite/expected/base_class_size_cc.elf_stg +++ b/test_cases/info_tests/composite/expected/base_class_size_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x4585663f name: "unsigned int" @@ -20,34 +20,34 @@ primitive { } base_class { id: 0x1fbc7d3f - type_id: 0x207acb9f + type_id: 0x207acb9f # struct B inheritance: NON_VIRTUAL } base_class { id: 0x27e7d0b7 - type_id: 0xc1147dbd + type_id: 0xc1147dbd # struct A inheritance: NON_VIRTUAL } member { id: 0xa0f7eeb0 name: "x" - type_id: 0x4585663f + type_id: 0x4585663f # unsigned int } member { id: 0xff8f0499 name: "y" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } member { id: 0x21525184 name: "z" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 64 } member { id: 0x2152585e name: "z" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 32 } struct_union { @@ -56,7 +56,7 @@ struct_union { name: "A" definition { bytesize: 4 - member_id: 0xa0f7eeb0 + member_id: 0xa0f7eeb0 # unsigned int x } } struct_union { @@ -65,7 +65,7 @@ struct_union { name: "B" definition { bytesize: 8 - member_id: 0xff8f0499 + member_id: 0xff8f0499 # long y } } struct_union { @@ -74,8 +74,8 @@ struct_union { name: "DiffSize" definition { bytesize: 16 - base_class_id: 0x1fbc7d3f - member_id: 0x21525184 + base_class_id: 0x1fbc7d3f # struct B + member_id: 0x21525184 # int z } } struct_union { @@ -84,8 +84,8 @@ struct_union { name: "SameSize" definition { bytesize: 8 - base_class_id: 0x27e7d0b7 - member_id: 0x2152585e + base_class_id: 0x27e7d0b7 # struct A + member_id: 0x2152585e # int z } } elf_symbol { @@ -93,7 +93,7 @@ elf_symbol { name: "diff_size" is_defined: true symbol_type: OBJECT - type_id: 0x5e576161 + type_id: 0x5e576161 # struct DiffSize full_name: "diff_size" } elf_symbol { @@ -101,11 +101,11 @@ elf_symbol { name: "same_size" is_defined: true symbol_type: OBJECT - type_id: 0xb538a8b6 + type_id: 0xb538a8b6 # struct SameSize full_name: "same_size" } interface { id: 0x84ea5130 - symbol_id: 0x7eb2aa05 - symbol_id: 0x43763562 + symbol_id: 0x7eb2aa05 # struct DiffSize diff_size + symbol_id: 0x43763562 # struct SameSize same_size } diff --git a/test_cases/info_tests/composite/expected/forward_c.btf_stg b/test_cases/info_tests/composite/expected/forward_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/composite/expected/forward_c.btf_stg +++ b/test_cases/info_tests/composite/expected/forward_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/composite/expected/forward_c.elf_stg b/test_cases/info_tests/composite/expected/forward_c.elf_stg index 0488423..e3165a6 100644 --- a/test_cases/info_tests/composite/expected/forward_c.elf_stg +++ b/test_cases/info_tests/composite/expected/forward_c.elf_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x1945b139 kind: POINTER - pointee_type_id: 0x4f562278 + pointee_type_id: 0x4f562278 # struct S } pointer_reference { id: 0x2467b5d6 kind: POINTER - pointee_type_id: 0xbbde31c7 + pointee_type_id: 0xbbde31c7 # enum E } pointer_reference { id: 0x26fa5112 kind: POINTER - pointee_type_id: 0xb1a9a2d5 + pointee_type_id: 0xb1a9a2d5 # union U } struct_union { id: 0x4f562278 @@ -34,7 +34,7 @@ elf_symbol { name: "v0" is_defined: true symbol_type: OBJECT - type_id: 0x2467b5d6 + type_id: 0x2467b5d6 # enum E* full_name: "v0" } elf_symbol { @@ -42,7 +42,7 @@ elf_symbol { name: "v1" is_defined: true symbol_type: OBJECT - type_id: 0x1945b139 + type_id: 0x1945b139 # struct S* full_name: "v1" } elf_symbol { @@ -50,12 +50,12 @@ elf_symbol { name: "v2" is_defined: true symbol_type: OBJECT - type_id: 0x26fa5112 + type_id: 0x26fa5112 # union U* full_name: "v2" } interface { id: 0x84ea5130 - symbol_id: 0xead90f5f - symbol_id: 0xab18a5e8 - symbol_id: 0x975e59cf + symbol_id: 0xead90f5f # enum E* v0 + symbol_id: 0xab18a5e8 # struct S* v1 + symbol_id: 0x975e59cf # union U* v2 } diff --git a/test_cases/info_tests/composite/expected/kind_cc.elf_stg b/test_cases/info_tests/composite/expected/kind_cc.elf_stg index e68b7eb..aa5e21b 100644 --- a/test_cases/info_tests/composite/expected/kind_cc.elf_stg +++ b/test_cases/info_tests/composite/expected/kind_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xfc0e1dbd name: "long" @@ -9,17 +9,17 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } member { id: 0xff8f0499 name: "y" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } member { id: 0x21c97bab name: "z" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x80b903a7 @@ -27,7 +27,7 @@ struct_union { name: "Class" definition { bytesize: 8 - member_id: 0x21c97bab + member_id: 0x21c97bab # long z } } struct_union { @@ -36,7 +36,7 @@ struct_union { name: "Struct" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -45,7 +45,7 @@ struct_union { name: "Union" definition { bytesize: 8 - member_id: 0xff8f0499 + member_id: 0xff8f0499 # long y } } elf_symbol { @@ -53,7 +53,7 @@ elf_symbol { name: "foo_class" is_defined: true symbol_type: OBJECT - type_id: 0x80b903a7 + type_id: 0x80b903a7 # struct Class full_name: "foo_class" } elf_symbol { @@ -61,7 +61,7 @@ elf_symbol { name: "foo_struct" is_defined: true symbol_type: OBJECT - type_id: 0xae62fdac + type_id: 0xae62fdac # struct Struct full_name: "foo_struct" } elf_symbol { @@ -69,12 +69,12 @@ elf_symbol { name: "foo_union" is_defined: true symbol_type: OBJECT - type_id: 0x58ad1075 + type_id: 0x58ad1075 # union Union full_name: "foo_union" } interface { id: 0x84ea5130 - symbol_id: 0x663a751a - symbol_id: 0x8361f42b - symbol_id: 0xc77e6f56 + symbol_id: 0x663a751a # struct Class foo_class + symbol_id: 0x8361f42b # struct Struct foo_struct + symbol_id: 0xc77e6f56 # union Union foo_union } diff --git a/test_cases/info_tests/composite/expected/virtual_inheritance_cc.elf_stg b/test_cases/info_tests/composite/expected/virtual_inheritance_cc.elf_stg index 102b04a..ae284b4 100644 --- a/test_cases/info_tests/composite/expected/virtual_inheritance_cc.elf_stg +++ b/test_cases/info_tests/composite/expected/virtual_inheritance_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x01ec39fc kind: POINTER - pointee_type_id: 0x2df0016c + pointee_type_id: 0x2df0016c # int(*)() } pointer_reference { id: 0x2df0016c kind: POINTER - pointee_type_id: 0x9d80e32f + pointee_type_id: 0x9d80e32f # int() } pointer_reference { id: 0x37376ce6 kind: POINTER - pointee_type_id: 0xf69d5505 + pointee_type_id: 0xf69d5505 # struct NonToVirtual } primitive { id: 0x6720d32f @@ -27,36 +27,36 @@ primitive { } base_class { id: 0x1fbc7d3f - type_id: 0x207acb9f + type_id: 0x207acb9f # struct B offset: 8 inheritance: NON_VIRTUAL } base_class { id: 0x27e7d0b7 - type_id: 0xc1147dbd + type_id: 0xc1147dbd # struct A inheritance: NON_VIRTUAL } base_class { id: 0x35d2bca3 - type_id: 0x89c1cdee + type_id: 0x89c1cdee # struct Base inheritance: NON_VIRTUAL } base_class { id: 0xc09b23a0 - type_id: 0x207acb9f + type_id: 0x207acb9f # struct B offset: 256 inheritance: VIRTUAL } base_class { id: 0xf8c08e28 - type_id: 0xc1147dbd + type_id: 0xc1147dbd # struct A offset: 192 inheritance: VIRTUAL } member { id: 0x79277fbd name: "_vptr$NonToVirtual" - type_id: 0x01ec39fc + type_id: 0x01ec39fc # int(**)() } struct_union { id: 0xc1147dbd @@ -64,7 +64,7 @@ struct_union { name: "A" definition { bytesize: 1 - base_class_id: 0x35d2bca3 + base_class_id: 0x35d2bca3 # struct Base } } struct_union { @@ -73,7 +73,7 @@ struct_union { name: "B" definition { bytesize: 1 - base_class_id: 0x35d2bca3 + base_class_id: 0x35d2bca3 # struct Base } } struct_union { @@ -90,9 +90,9 @@ struct_union { name: "NonToVirtual" definition { bytesize: 16 - base_class_id: 0xf8c08e28 - base_class_id: 0xc09b23a0 - member_id: 0x79277fbd + base_class_id: 0xf8c08e28 # struct A + base_class_id: 0xc09b23a0 # struct B + member_id: 0x79277fbd # int(** _vptr$NonToVirtual)() } } struct_union { @@ -101,18 +101,18 @@ struct_union { name: "VirtualToNon" definition { bytesize: 2 - base_class_id: 0x27e7d0b7 - base_class_id: 0x1fbc7d3f + base_class_id: 0x27e7d0b7 # struct A + base_class_id: 0x1fbc7d3f # struct B } } function { id: 0x1d558aaa - return_type_id: 0x48b5725f - parameter_id: 0x37376ce6 + return_type_id: 0x48b5725f # void + parameter_id: 0x37376ce6 # struct NonToVirtual* } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x2ee62e36 @@ -120,7 +120,7 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x1d558aaa + type_id: 0x1d558aaa # void(struct NonToVirtual*) full_name: "NonToVirtual::NonToVirtual" } elf_symbol { @@ -198,7 +198,7 @@ elf_symbol { name: "non_to_virtual" is_defined: true symbol_type: OBJECT - type_id: 0xf69d5505 + type_id: 0xf69d5505 # struct NonToVirtual full_name: "non_to_virtual" } elf_symbol { @@ -206,22 +206,22 @@ elf_symbol { name: "virtual_to_non" is_defined: true symbol_type: OBJECT - type_id: 0x61cd3569 + type_id: 0x61cd3569 # struct VirtualToNon full_name: "virtual_to_non" } interface { id: 0x84ea5130 - symbol_id: 0x2ee62e36 - symbol_id: 0x61d9eaff - symbol_id: 0x6cd6c36e - symbol_id: 0xa299f851 - symbol_id: 0x24d58148 - symbol_id: 0x4beeefa7 - symbol_id: 0x4681bdd1 - symbol_id: 0x19ce5ac1 - symbol_id: 0xbc82394c - symbol_id: 0xd4bd55f3 - symbol_id: 0xdebc2088 - symbol_id: 0x486f617d - symbol_id: 0x2d368ead + symbol_id: 0x2ee62e36 # void NonToVirtual::NonToVirtual(struct NonToVirtual*) + symbol_id: 0x61d9eaff # _ZTI12NonToVirtual + symbol_id: 0x6cd6c36e # _ZTI1A + symbol_id: 0xa299f851 # _ZTI1B + symbol_id: 0x24d58148 # _ZTI4Base + symbol_id: 0x4beeefa7 # _ZTS12NonToVirtual + symbol_id: 0x4681bdd1 # _ZTS1A + symbol_id: 0x19ce5ac1 # _ZTS1B + symbol_id: 0xbc82394c # _ZTS4Base + symbol_id: 0xd4bd55f3 # _ZTT12NonToVirtual + symbol_id: 0xdebc2088 # _ZTV12NonToVirtual + symbol_id: 0x486f617d # struct NonToVirtual non_to_virtual + symbol_id: 0x2d368ead # struct VirtualToNon virtual_to_non } diff --git a/test_cases/info_tests/composite/expected/virtual_only_base_class_cc.elf_stg b/test_cases/info_tests/composite/expected/virtual_only_base_class_cc.elf_stg index a1f67b9..84be254 100644 --- a/test_cases/info_tests/composite/expected/virtual_only_base_class_cc.elf_stg +++ b/test_cases/info_tests/composite/expected/virtual_only_base_class_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,27 +7,27 @@ special { pointer_reference { id: 0x01ec39fc kind: POINTER - pointee_type_id: 0x2df0016c + pointee_type_id: 0x2df0016c # int(*)() } pointer_reference { id: 0x0b5e55a4 kind: POINTER - pointee_type_id: 0x0739b00c + pointee_type_id: 0x0739b00c # struct X } pointer_reference { id: 0x134ef871 kind: POINTER - pointee_type_id: 0x677b0759 + pointee_type_id: 0x677b0759 # struct Y } pointer_reference { id: 0x2df0016c kind: POINTER - pointee_type_id: 0x9d80e32f + pointee_type_id: 0x9d80e32f # int() } pointer_reference { id: 0xc65e4373 kind: LVALUE_REFERENCE - pointee_type_id: 0x0739b00c + pointee_type_id: 0x0739b00c # struct X } primitive { id: 0x6720d32f @@ -37,39 +37,39 @@ primitive { } base_class { id: 0x166ca3db - type_id: 0x0739b00c + type_id: 0x0739b00c # struct X inheritance: NON_VIRTUAL } method { id: 0x4dd47407 mangled_name: "_ZN1X1fEv" name: "f" - type_id: 0x9f577646 + type_id: 0x9f577646 # int(struct X*) } method { id: 0xb8b6ef68 mangled_name: "_ZN1X1gEv" name: "g" vtable_offset: 1 - type_id: 0x9f577646 + type_id: 0x9f577646 # int(struct X*) } method { id: 0x63c715c4 mangled_name: "_ZN1Y1fEv" name: "f" - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) } method { id: 0xe8e61433 mangled_name: "_ZN1Y1gEv" name: "g" vtable_offset: 1 - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) } member { id: 0x687cadfe name: "_vptr$X" - type_id: 0x01ec39fc + type_id: 0x01ec39fc # int(**)() } struct_union { id: 0x0739b00c @@ -77,9 +77,9 @@ struct_union { name: "X" definition { bytesize: 8 - method_id: 0x4dd47407 - method_id: 0xb8b6ef68 - member_id: 0x687cadfe + method_id: 0x4dd47407 # int f(struct X*) + method_id: 0xb8b6ef68 # int g(struct X*) + member_id: 0x687cadfe # int(** _vptr$X)() } } struct_union { @@ -88,46 +88,46 @@ struct_union { name: "Y" definition { bytesize: 8 - base_class_id: 0x166ca3db - method_id: 0x63c715c4 - method_id: 0xe8e61433 + base_class_id: 0x166ca3db # struct X + method_id: 0x63c715c4 # int f(struct Y*) + method_id: 0xe8e61433 # int g(struct Y*) } } function { id: 0x124fc4fa - return_type_id: 0x48b5725f - parameter_id: 0x0b5e55a4 + return_type_id: 0x48b5725f # void + parameter_id: 0x0b5e55a4 # struct X* } function { id: 0x144bef8f - return_type_id: 0x48b5725f - parameter_id: 0x134ef871 + return_type_id: 0x48b5725f # void + parameter_id: 0x134ef871 # struct Y* } function { id: 0x99535d33 - return_type_id: 0x6720d32f - parameter_id: 0x134ef871 + return_type_id: 0x6720d32f # int + parameter_id: 0x134ef871 # struct Y* } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } function { id: 0x9f577646 - return_type_id: 0x6720d32f - parameter_id: 0x0b5e55a4 + return_type_id: 0x6720d32f # int + parameter_id: 0x0b5e55a4 # struct X* } function { id: 0xac1773f3 - return_type_id: 0x6720d32f - parameter_id: 0xc65e4373 + return_type_id: 0x6720d32f # int + parameter_id: 0xc65e4373 # struct X& } elf_symbol { id: 0x10da60a3 name: "_Z3foov" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "foo" } elf_symbol { @@ -135,7 +135,7 @@ elf_symbol { name: "_Z3funR1X" is_defined: true symbol_type: FUNCTION - type_id: 0xac1773f3 + type_id: 0xac1773f3 # int(struct X&) full_name: "fun" } elf_symbol { @@ -144,7 +144,7 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x124fc4fa + type_id: 0x124fc4fa # void(struct X*) full_name: "X::X" } elf_symbol { @@ -152,7 +152,7 @@ elf_symbol { name: "_ZN1Y1fEv" is_defined: true symbol_type: FUNCTION - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) full_name: "Y::f" } elf_symbol { @@ -160,7 +160,7 @@ elf_symbol { name: "_ZN1Y1gEv" is_defined: true symbol_type: FUNCTION - type_id: 0x99535d33 + type_id: 0x99535d33 # int(struct Y*) full_name: "Y::g" } elf_symbol { @@ -169,7 +169,7 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x144bef8f + type_id: 0x144bef8f # void(struct Y*) full_name: "Y::Y" } elf_symbol { @@ -192,13 +192,13 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0x10da60a3 - symbol_id: 0xbc33871c - symbol_id: 0x0bbcf1df - symbol_id: 0x71a2fb93 - symbol_id: 0x938b5d81 - symbol_id: 0x8f2ed63c - symbol_id: 0x62dbf9a8 - symbol_id: 0x68f7d82f - symbol_id: 0x4df3aa88 + symbol_id: 0x10da60a3 # int foo() + symbol_id: 0xbc33871c # int fun(struct X&) + symbol_id: 0x0bbcf1df # void X::X(struct X*) + symbol_id: 0x71a2fb93 # int Y::f(struct Y*) + symbol_id: 0x938b5d81 # int Y::g(struct Y*) + symbol_id: 0x8f2ed63c # void Y::Y(struct Y*) + symbol_id: 0x62dbf9a8 # _ZTI1Y + symbol_id: 0x68f7d82f # _ZTS1Y + symbol_id: 0x4df3aa88 # _ZTV1Y } diff --git a/test_cases/info_tests/enum/expected/anonymous_c.btf_stg b/test_cases/info_tests/enum/expected/anonymous_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/enum/expected/anonymous_c.btf_stg +++ b/test_cases/info_tests/enum/expected/anonymous_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/enum/expected/anonymous_c.elf_stg b/test_cases/info_tests/enum/expected/anonymous_c.elf_stg index e3d8d80..b3df528 100644 --- a/test_cases/info_tests/enum/expected/anonymous_c.elf_stg +++ b/test_cases/info_tests/enum/expected/anonymous_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x4585663f name: "unsigned int" @@ -9,7 +9,7 @@ primitive { enumeration { id: 0x52d563df definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "FOO_ZERO" } @@ -32,10 +32,10 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0x52d563df + type_id: 0x52d563df # enum { FOO_ZERO = 0, FOO_ONE = 1, FOO_TWO = 2, FOO_THREE = 3, } full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # enum { FOO_ZERO = 0, FOO_ONE = 1, FOO_TWO = 2, FOO_THREE = 3, } foo } diff --git a/test_cases/info_tests/enum/expected/declaration_only_c.btf_stg b/test_cases/info_tests/enum/expected/declaration_only_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/enum/expected/declaration_only_c.btf_stg +++ b/test_cases/info_tests/enum/expected/declaration_only_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/enum/expected/declaration_only_c.elf_stg b/test_cases/info_tests/enum/expected/declaration_only_c.elf_stg index 01560cf..c3cfed3 100644 --- a/test_cases/info_tests/enum/expected/declaration_only_c.elf_stg +++ b/test_cases/info_tests/enum/expected/declaration_only_c.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x256d8564 kind: POINTER - pointee_type_id: 0xbff6f30c + pointee_type_id: 0xbff6f30c # enum Foo } enumeration { id: 0xbff6f30c @@ -14,10 +14,10 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0x256d8564 + type_id: 0x256d8564 # enum Foo* full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # enum Foo* foo } diff --git a/test_cases/info_tests/enum/expected/fixed_underlying_type_cc.elf_stg b/test_cases/info_tests/enum/expected/fixed_underlying_type_cc.elf_stg index e6e4073..778a7a9 100644 --- a/test_cases/info_tests/enum/expected/fixed_underlying_type_cc.elf_stg +++ b/test_cases/info_tests/enum/expected/fixed_underlying_type_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x33756485 name: "unsigned long" @@ -22,7 +22,7 @@ enumeration { id: 0xd3d36586 name: "A" definition { - underlying_type_id: 0x5d8155a5 + underlying_type_id: 0x5d8155a5 # unsigned char enumerator { name: "Ae" } @@ -32,7 +32,7 @@ enumeration { id: 0x909102c3 name: "B" definition { - underlying_type_id: 0x33756485 + underlying_type_id: 0x33756485 # unsigned long enumerator { name: "Be" } @@ -40,19 +40,19 @@ enumeration { } function { id: 0xf86de391 - return_type_id: 0x4585663f - parameter_id: 0xd3d36586 - parameter_id: 0x909102c3 + return_type_id: 0x4585663f # unsigned int + parameter_id: 0xd3d36586 # enum A + parameter_id: 0x909102c3 # enum B } elf_symbol { id: 0x1b84c9d2 name: "_Z3fun1A1B" is_defined: true symbol_type: FUNCTION - type_id: 0xf86de391 + type_id: 0xf86de391 # unsigned int(enum A, enum B) full_name: "fun" } interface { id: 0x84ea5130 - symbol_id: 0x1b84c9d2 + symbol_id: 0x1b84c9d2 # unsigned int fun(enum A, enum B) } diff --git a/test_cases/info_tests/enum/expected/limits_c.btf_stg b/test_cases/info_tests/enum/expected/limits_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/enum/expected/limits_c.btf_stg +++ b/test_cases/info_tests/enum/expected/limits_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/enum/expected/limits_c.elf_stg b/test_cases/info_tests/enum/expected/limits_c.elf_stg index 1a94da3..8ee5108 100644 --- a/test_cases/info_tests/enum/expected/limits_c.elf_stg +++ b/test_cases/info_tests/enum/expected/limits_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x33756485 name: "unsigned long" @@ -28,7 +28,7 @@ enumeration { id: 0xd3d36586 name: "A" definition { - underlying_type_id: 0x6720d32f + underlying_type_id: 0x6720d32f # int enumerator { name: "Ae" value: -2147483648 @@ -39,7 +39,7 @@ enumeration { id: 0x909102c3 name: "B" definition { - underlying_type_id: 0x6720d32f + underlying_type_id: 0x6720d32f # int enumerator { name: "Be" value: -1 @@ -50,7 +50,7 @@ enumeration { id: 0x515c78f9 name: "C" definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "Ce" value: 2147483647 @@ -61,7 +61,7 @@ enumeration { id: 0x181e741d name: "D" definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "De" value: 2147483648 @@ -72,7 +72,7 @@ enumeration { id: 0xd8dfd34f name: "E" definition { - underlying_type_id: 0xfc0e1dbd + underlying_type_id: 0xfc0e1dbd # long enumerator { name: "Ee" value: -9223372036854775808 @@ -83,7 +83,7 @@ enumeration { id: 0x9b93ce42 name: "F" definition { - underlying_type_id: 0x33756485 + underlying_type_id: 0x33756485 # unsigned long enumerator { name: "Fe" value: 9223372036854775807 @@ -94,7 +94,7 @@ enumeration { id: 0x5a53132a name: "G" definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "Ge" value: 16777216 @@ -105,7 +105,7 @@ enumeration { id: 0x3717ab70 name: "H" definition { - underlying_type_id: 0x33756485 + underlying_type_id: 0x33756485 # unsigned long enumerator { name: "He" value: 281474976710656 @@ -116,7 +116,7 @@ enumeration { id: 0xe9d74c38 name: "I" definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "Ie" value: 4294967295 @@ -127,7 +127,7 @@ enumeration { id: 0xaa901a01 name: "J" definition { - underlying_type_id: 0x33756485 + underlying_type_id: 0x33756485 # unsigned long enumerator { name: "Je" value: -1 @@ -139,7 +139,7 @@ elf_symbol { name: "G" is_defined: true symbol_type: OBJECT - type_id: 0x5a53132a + type_id: 0x5a53132a # enum G full_name: "G" } elf_symbol { @@ -147,7 +147,7 @@ elf_symbol { name: "a" is_defined: true symbol_type: OBJECT - type_id: 0xd3d36586 + type_id: 0xd3d36586 # enum A full_name: "a" } elf_symbol { @@ -155,7 +155,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: OBJECT - type_id: 0x909102c3 + type_id: 0x909102c3 # enum B full_name: "b" } elf_symbol { @@ -163,7 +163,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0x515c78f9 + type_id: 0x515c78f9 # enum C full_name: "c" } elf_symbol { @@ -171,7 +171,7 @@ elf_symbol { name: "d" is_defined: true symbol_type: OBJECT - type_id: 0x181e741d + type_id: 0x181e741d # enum D full_name: "d" } elf_symbol { @@ -179,7 +179,7 @@ elf_symbol { name: "e" is_defined: true symbol_type: OBJECT - type_id: 0xd8dfd34f + type_id: 0xd8dfd34f # enum E full_name: "e" } elf_symbol { @@ -187,7 +187,7 @@ elf_symbol { name: "f" is_defined: true symbol_type: OBJECT - type_id: 0x9b93ce42 + type_id: 0x9b93ce42 # enum F full_name: "f" } elf_symbol { @@ -195,7 +195,7 @@ elf_symbol { name: "h" is_defined: true symbol_type: OBJECT - type_id: 0x3717ab70 + type_id: 0x3717ab70 # enum H full_name: "h" } elf_symbol { @@ -203,7 +203,7 @@ elf_symbol { name: "i" is_defined: true symbol_type: OBJECT - type_id: 0xe9d74c38 + type_id: 0xe9d74c38 # enum I full_name: "i" } elf_symbol { @@ -211,19 +211,19 @@ elf_symbol { name: "j" is_defined: true symbol_type: OBJECT - type_id: 0xaa901a01 + type_id: 0xaa901a01 # enum J full_name: "j" } interface { id: 0x84ea5130 - symbol_id: 0x79256de9 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x63f6f9b1 - symbol_id: 0xa2b65a7e - symbol_id: 0xe0778f95 - symbol_id: 0x68f3ac2c - symbol_id: 0xa9b30393 - symbol_id: 0xe98c5fb8 + symbol_id: 0x79256de9 # enum G G + symbol_id: 0xa7b0241d # enum A a + symbol_id: 0xe371117a # enum B b + symbol_id: 0x2230fb28 # enum C c + symbol_id: 0x63f6f9b1 # enum D d + symbol_id: 0xa2b65a7e # enum E e + symbol_id: 0xe0778f95 # enum F f + symbol_id: 0x68f3ac2c # enum H h + symbol_id: 0xa9b30393 # enum I i + symbol_id: 0xe98c5fb8 # enum J j } diff --git a/test_cases/info_tests/enum/expected/simple_c.btf_stg b/test_cases/info_tests/enum/expected/simple_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/enum/expected/simple_c.btf_stg +++ b/test_cases/info_tests/enum/expected/simple_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/enum/expected/simple_c.elf_stg b/test_cases/info_tests/enum/expected/simple_c.elf_stg index b15e26c..278b0aa 100644 --- a/test_cases/info_tests/enum/expected/simple_c.elf_stg +++ b/test_cases/info_tests/enum/expected/simple_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x4585663f name: "unsigned int" @@ -10,7 +10,7 @@ enumeration { id: 0x226ff690 name: "Foo" definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "FOO_ZERO" } @@ -33,10 +33,10 @@ elf_symbol { name: "bar" is_defined: true symbol_type: OBJECT - type_id: 0x226ff690 + type_id: 0x226ff690 # enum Foo full_name: "bar" } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 + symbol_id: 0xa58ca0b6 # enum Foo bar } diff --git a/test_cases/info_tests/function/expected/array_parameter_c.btf_stg b/test_cases/info_tests/function/expected/array_parameter_c.btf_stg index 47d03bd..d5702b9 100644 --- a/test_cases/info_tests/function/expected/array_parameter_c.btf_stg +++ b/test_cases/info_tests/function/expected/array_parameter_c.btf_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x0483e6f8 kind: POINTER - pointee_type_id: 0x384f7d7c + pointee_type_id: 0x384f7d7c # char } pointer_reference { id: 0x0fd17562 kind: POINTER - pointee_type_id: 0x15053314 + pointee_type_id: 0x15053314 # double } pointer_reference { id: 0x3593bec8 kind: POINTER - pointee_type_id: 0xfc0e1dbd + pointee_type_id: 0xfc0e1dbd # long } primitive { id: 0x15053314 @@ -41,62 +41,62 @@ primitive { } function { id: 0x0fbdff1a - return_type_id: 0x384f7d7c - parameter_id: 0x3593bec8 + return_type_id: 0x384f7d7c # char + parameter_id: 0x3593bec8 # long* } function { id: 0x12af7c46 - return_type_id: 0x384f7d7c - parameter_id: 0x4585663f - parameter_id: 0x4585663f - parameter_id: 0x0483e6f8 + return_type_id: 0x384f7d7c # char + parameter_id: 0x4585663f # unsigned int + parameter_id: 0x4585663f # unsigned int + parameter_id: 0x0483e6f8 # char* } function { id: 0x13870cf2 - return_type_id: 0x384f7d7c - parameter_id: 0x4585663f - parameter_id: 0x0fd17562 + return_type_id: 0x384f7d7c # char + parameter_id: 0x4585663f # unsigned int + parameter_id: 0x0fd17562 # double* } elf_symbol { id: 0xa58ca0b6 name: "bar" is_defined: true symbol_type: FUNCTION - type_id: 0x0fbdff1a + type_id: 0x0fbdff1a # char(long*) } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0x0fbdff1a + type_id: 0x0fbdff1a # char(long*) } elf_symbol { id: 0x4602d7e1 name: "quux" is_defined: true symbol_type: FUNCTION - type_id: 0x13870cf2 + type_id: 0x13870cf2 # char(unsigned int, double*) } elf_symbol { id: 0x376a8db4 name: "spong" is_defined: true symbol_type: FUNCTION - type_id: 0x13870cf2 + type_id: 0x13870cf2 # char(unsigned int, double*) } elf_symbol { id: 0x3579f91c name: "wibble" is_defined: true symbol_type: FUNCTION - type_id: 0x12af7c46 + type_id: 0x12af7c46 # char(unsigned int, unsigned int, char*) } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 - symbol_id: 0x06f8338c - symbol_id: 0x4602d7e1 - symbol_id: 0x376a8db4 - symbol_id: 0x3579f91c + symbol_id: 0xa58ca0b6 # char bar(long*) + symbol_id: 0x06f8338c # char foo(long*) + symbol_id: 0x4602d7e1 # char quux(unsigned int, double*) + symbol_id: 0x376a8db4 # char spong(unsigned int, double*) + symbol_id: 0x3579f91c # char wibble(unsigned int, unsigned int, char*) } diff --git a/test_cases/info_tests/function/expected/array_parameter_c.elf_stg b/test_cases/info_tests/function/expected/array_parameter_c.elf_stg index f2d57b3..70dfc95 100644 --- a/test_cases/info_tests/function/expected/array_parameter_c.elf_stg +++ b/test_cases/info_tests/function/expected/array_parameter_c.elf_stg @@ -1,24 +1,24 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x0483e6f8 kind: POINTER - pointee_type_id: 0x384f7d7c + pointee_type_id: 0x384f7d7c # char } pointer_reference { id: 0x0fd17562 kind: POINTER - pointee_type_id: 0x15053314 + pointee_type_id: 0x15053314 # double } pointer_reference { id: 0x3593bec8 kind: POINTER - pointee_type_id: 0xfc0e1dbd + pointee_type_id: 0xfc0e1dbd # long } qualified { id: 0xd0ccb483 qualifier: CONST - qualified_type_id: 0x33756485 + qualified_type_id: 0x33756485 # unsigned long } primitive { id: 0x15053314 @@ -52,28 +52,28 @@ primitive { } function { id: 0x0fbdff1a - return_type_id: 0x384f7d7c - parameter_id: 0x3593bec8 + return_type_id: 0x384f7d7c # char + parameter_id: 0x3593bec8 # long* } function { id: 0x12af7c46 - return_type_id: 0x384f7d7c - parameter_id: 0x4585663f - parameter_id: 0x4585663f - parameter_id: 0x0483e6f8 + return_type_id: 0x384f7d7c # char + parameter_id: 0x4585663f # unsigned int + parameter_id: 0x4585663f # unsigned int + parameter_id: 0x0483e6f8 # char* } function { id: 0x13870cf2 - return_type_id: 0x384f7d7c - parameter_id: 0x4585663f - parameter_id: 0x0fd17562 + return_type_id: 0x384f7d7c # char + parameter_id: 0x4585663f # unsigned int + parameter_id: 0x0fd17562 # double* } elf_symbol { id: 0xa58ca0b6 name: "bar" is_defined: true symbol_type: FUNCTION - type_id: 0x0fbdff1a + type_id: 0x0fbdff1a # char(long*) full_name: "bar" } elf_symbol { @@ -81,7 +81,7 @@ elf_symbol { name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0x0fbdff1a + type_id: 0x0fbdff1a # char(long*) full_name: "foo" } elf_symbol { @@ -89,7 +89,7 @@ elf_symbol { name: "l" is_defined: true symbol_type: OBJECT - type_id: 0xd0ccb483 + type_id: 0xd0ccb483 # const unsigned long full_name: "l" } elf_symbol { @@ -97,7 +97,7 @@ elf_symbol { name: "quux" is_defined: true symbol_type: FUNCTION - type_id: 0x13870cf2 + type_id: 0x13870cf2 # char(unsigned int, double*) full_name: "quux" } elf_symbol { @@ -105,7 +105,7 @@ elf_symbol { name: "spong" is_defined: true symbol_type: FUNCTION - type_id: 0x13870cf2 + type_id: 0x13870cf2 # char(unsigned int, double*) full_name: "spong" } elf_symbol { @@ -113,15 +113,15 @@ elf_symbol { name: "wibble" is_defined: true symbol_type: FUNCTION - type_id: 0x12af7c46 + type_id: 0x12af7c46 # char(unsigned int, unsigned int, char*) full_name: "wibble" } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 - symbol_id: 0x06f8338c - symbol_id: 0x6df237e3 - symbol_id: 0x4602d7e1 - symbol_id: 0x376a8db4 - symbol_id: 0x3579f91c + symbol_id: 0xa58ca0b6 # char bar(long*) + symbol_id: 0x06f8338c # char foo(long*) + symbol_id: 0x6df237e3 # const unsigned long l + symbol_id: 0x4602d7e1 # char quux(unsigned int, double*) + symbol_id: 0x376a8db4 # char spong(unsigned int, double*) + symbol_id: 0x3579f91c # char wibble(unsigned int, unsigned int, char*) } diff --git a/test_cases/info_tests/function/expected/methods_cc.elf_stg b/test_cases/info_tests/function/expected/methods_cc.elf_stg index 08645bf..a901fdf 100644 --- a/test_cases/info_tests/function/expected/methods_cc.elf_stg +++ b/test_cases/info_tests/function/expected/methods_cc.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x07c134ac kind: POINTER - pointee_type_id: 0x3544342c + pointee_type_id: 0x3544342c # struct Func } primitive { id: 0x6720d32f @@ -20,7 +20,7 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x3544342c @@ -28,37 +28,37 @@ struct_union { name: "Func" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } function { id: 0x9c70ae04 - return_type_id: 0x6720d32f - parameter_id: 0x07c134ac + return_type_id: 0x6720d32f # int + parameter_id: 0x07c134ac # struct Func* } function { id: 0x9dec2d48 - return_type_id: 0x6720d32f - parameter_id: 0x07c134ac - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x07c134ac # struct Func* + parameter_id: 0x6720d32f # int } function { id: 0x9f809672 - return_type_id: 0x6720d32f - parameter_id: 0x07c134ac - parameter_id: 0xfc0e1dbd + return_type_id: 0x6720d32f # int + parameter_id: 0x07c134ac # struct Func* + parameter_id: 0xfc0e1dbd # long } function { id: 0xa6d076b2 - return_type_id: 0xfc0e1dbd - parameter_id: 0x07c134ac + return_type_id: 0xfc0e1dbd # long + parameter_id: 0x07c134ac # struct Func* } elf_symbol { id: 0x905e5cdc name: "_ZN4Func10remove_parEv" is_defined: true symbol_type: FUNCTION - type_id: 0x9c70ae04 + type_id: 0x9c70ae04 # int(struct Func*) full_name: "Func::remove_par" } elf_symbol { @@ -66,7 +66,7 @@ elf_symbol { name: "_ZN4Func10rename_newEv" is_defined: true symbol_type: FUNCTION - type_id: 0x9c70ae04 + type_id: 0x9c70ae04 # int(struct Func*) full_name: "Func::rename_new" } elf_symbol { @@ -74,7 +74,7 @@ elf_symbol { name: "_ZN4Func15change_par_nameEi" is_defined: true symbol_type: FUNCTION - type_id: 0x9dec2d48 + type_id: 0x9dec2d48 # int(struct Func*, int) full_name: "Func::change_par_name" } elf_symbol { @@ -82,7 +82,7 @@ elf_symbol { name: "_ZN4Func15change_par_typeEl" is_defined: true symbol_type: FUNCTION - type_id: 0x9f809672 + type_id: 0x9f809672 # int(struct Func*, long) full_name: "Func::change_par_type" } elf_symbol { @@ -90,7 +90,7 @@ elf_symbol { name: "_ZN4Func18change_return_typeEv" is_defined: true symbol_type: FUNCTION - type_id: 0xa6d076b2 + type_id: 0xa6d076b2 # long(struct Func*) full_name: "Func::change_return_type" } elf_symbol { @@ -98,7 +98,7 @@ elf_symbol { name: "_ZN4Func7add_parEi" is_defined: true symbol_type: FUNCTION - type_id: 0x9dec2d48 + type_id: 0x9dec2d48 # int(struct Func*, int) full_name: "Func::add_par" } elf_symbol { @@ -106,16 +106,16 @@ elf_symbol { name: "var" is_defined: true symbol_type: OBJECT - type_id: 0x3544342c + type_id: 0x3544342c # struct Func full_name: "var" } interface { id: 0x84ea5130 - symbol_id: 0x905e5cdc - symbol_id: 0xb2a4b8f4 - symbol_id: 0x3f2e69f4 - symbol_id: 0xae78d7be - symbol_id: 0x6168ec15 - symbol_id: 0x5f3f90d1 - symbol_id: 0x3997c6eb + symbol_id: 0x905e5cdc # int Func::remove_par(struct Func*) + symbol_id: 0xb2a4b8f4 # int Func::rename_new(struct Func*) + symbol_id: 0x3f2e69f4 # int Func::change_par_name(struct Func*, int) + symbol_id: 0xae78d7be # int Func::change_par_type(struct Func*, long) + symbol_id: 0x6168ec15 # long Func::change_return_type(struct Func*) + symbol_id: 0x5f3f90d1 # int Func::add_par(struct Func*, int) + symbol_id: 0x3997c6eb # struct Func var } diff --git a/test_cases/info_tests/function/expected/parameters_c.btf_stg b/test_cases/info_tests/function/expected/parameters_c.btf_stg index e229765..2f2a118 100644 --- a/test_cases/info_tests/function/expected/parameters_c.btf_stg +++ b/test_cases/info_tests/function/expected/parameters_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,121 +8,121 @@ primitive { } function { id: 0x85cc001f - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85cd9c9c - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85d454a8 - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } elf_symbol { id: 0x8bf70937 name: "f01" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) } elf_symbol { id: 0xcab4baef name: "f02" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) } elf_symbol { id: 0x09745218 name: "f03" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) } elf_symbol { id: 0xb2312b1c name: "f04" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) } elf_symbol { id: 0x76f6b896 name: "f05" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) } elf_symbol { id: 0x37b65de0 name: "f06" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) } elf_symbol { id: 0xf477c0b7 name: "f07" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) } elf_symbol { id: 0x4aca4031 name: "f08" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) } elf_symbol { id: 0x858be3e5 name: "f09" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) } elf_symbol { id: 0x288f47a4 name: "f10" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) } elf_symbol { id: 0xe9cfbccb name: "f11" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) } elf_symbol { id: 0xaf0c113b name: "f12" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) } interface { id: 0x84ea5130 - symbol_id: 0x8bf70937 - symbol_id: 0xcab4baef - symbol_id: 0x09745218 - symbol_id: 0xb2312b1c - symbol_id: 0x76f6b896 - symbol_id: 0x37b65de0 - symbol_id: 0xf477c0b7 - symbol_id: 0x4aca4031 - symbol_id: 0x858be3e5 - symbol_id: 0x288f47a4 - symbol_id: 0xe9cfbccb - symbol_id: 0xaf0c113b + symbol_id: 0x8bf70937 # int f01(int, int) + symbol_id: 0xcab4baef # int f02(int, int) + symbol_id: 0x09745218 # int f03(int, int) + symbol_id: 0xb2312b1c # int f04(int, int, int) + symbol_id: 0x76f6b896 # int f05(int, int, int) + symbol_id: 0x37b65de0 # int f06(int, int, int) + symbol_id: 0xf477c0b7 # int f07(int, int, int) + symbol_id: 0x4aca4031 # int f08(int, int, int) + symbol_id: 0x858be3e5 # int f09(int, int, int, int) + symbol_id: 0x288f47a4 # int f10(int, int, int, int) + symbol_id: 0xe9cfbccb # int f11(int, int, int, int) + symbol_id: 0xaf0c113b # int f12(int, int, int, int) } diff --git a/test_cases/info_tests/function/expected/parameters_c.elf_stg b/test_cases/info_tests/function/expected/parameters_c.elf_stg index b2c07e8..714a3af 100644 --- a/test_cases/info_tests/function/expected/parameters_c.elf_stg +++ b/test_cases/info_tests/function/expected/parameters_c.elf_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x2be339a0 kind: POINTER - pointee_type_id: 0x85cc001f + pointee_type_id: 0x85cc001f # int(int, int, int, int) } pointer_reference { id: 0x2be35e80 kind: POINTER - pointee_type_id: 0x85cd9c9c + pointee_type_id: 0x85cd9c9c # int(int, int, int) } pointer_reference { id: 0x2be52c8d kind: POINTER - pointee_type_id: 0x85d454a8 + pointee_type_id: 0x85d454a8 # int(int, int) } primitive { id: 0x6720d32f @@ -24,72 +24,72 @@ primitive { member { id: 0xab194353 name: "f01" - type_id: 0x2be52c8d + type_id: 0x2be52c8d # int(*)(int, int) } member { id: 0xe7582706 name: "f02" - type_id: 0x2be52c8d + type_id: 0x2be52c8d # int(*)(int, int) offset: 64 } member { id: 0x269f96e1 name: "f03" - type_id: 0x2be52c8d + type_id: 0x2be52c8d # int(*)(int, int) offset: 128 } member { id: 0x6edf7381 name: "f04" - type_id: 0x2be35e80 + type_id: 0x2be35e80 # int(*)(int, int, int) offset: 192 } member { id: 0xae1e0655 name: "f05" - type_id: 0x2be35e80 + type_id: 0x2be35e80 # int(*)(int, int, int) offset: 256 } member { id: 0xec5d8fef name: "f06" - type_id: 0x2be35e80 + type_id: 0x2be35e80 # int(*)(int, int, int) offset: 320 } member { id: 0x2d9d2928 name: "f07" - type_id: 0x2be35e80 + type_id: 0x2be35e80 # int(*)(int, int, int) offset: 384 } member { id: 0x7fd98f4c name: "f08" - type_id: 0x2be35e80 + type_id: 0x2be35e80 # int(*)(int, int, int) offset: 448 } member { id: 0xbd1a65d0 name: "f09" - type_id: 0x2be339a0 + type_id: 0x2be339a0 # int(*)(int, int, int, int) offset: 512 } member { id: 0x15949fa0 name: "f10" - type_id: 0x2be339a0 + type_id: 0x2be339a0 # int(*)(int, int, int, int) offset: 576 } member { id: 0xd553c44f name: "f11" - type_id: 0x2be339a0 + type_id: 0x2be339a0 # int(*)(int, int, int, int) offset: 640 } member { id: 0x94135c5f name: "f12" - type_id: 0x2be339a0 + type_id: 0x2be339a0 # int(*)(int, int, int, int) offset: 704 } struct_union { @@ -98,47 +98,47 @@ struct_union { name: "S" definition { bytesize: 96 - member_id: 0xab194353 - member_id: 0xe7582706 - member_id: 0x269f96e1 - member_id: 0x6edf7381 - member_id: 0xae1e0655 - member_id: 0xec5d8fef - member_id: 0x2d9d2928 - member_id: 0x7fd98f4c - member_id: 0xbd1a65d0 - member_id: 0x15949fa0 - member_id: 0xd553c44f - member_id: 0x94135c5f + member_id: 0xab194353 # int(* f01)(int, int) + member_id: 0xe7582706 # int(* f02)(int, int) + member_id: 0x269f96e1 # int(* f03)(int, int) + member_id: 0x6edf7381 # int(* f04)(int, int, int) + member_id: 0xae1e0655 # int(* f05)(int, int, int) + member_id: 0xec5d8fef # int(* f06)(int, int, int) + member_id: 0x2d9d2928 # int(* f07)(int, int, int) + member_id: 0x7fd98f4c # int(* f08)(int, int, int) + member_id: 0xbd1a65d0 # int(* f09)(int, int, int, int) + member_id: 0x15949fa0 # int(* f10)(int, int, int, int) + member_id: 0xd553c44f # int(* f11)(int, int, int, int) + member_id: 0x94135c5f # int(* f12)(int, int, int, int) } } function { id: 0x85cc001f - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85cd9c9c - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85d454a8 - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } elf_symbol { id: 0x8bf70937 name: "f01" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f01" } elf_symbol { @@ -146,7 +146,7 @@ elf_symbol { name: "f02" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f02" } elf_symbol { @@ -154,7 +154,7 @@ elf_symbol { name: "f03" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f03" } elf_symbol { @@ -162,7 +162,7 @@ elf_symbol { name: "f04" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f04" } elf_symbol { @@ -170,7 +170,7 @@ elf_symbol { name: "f05" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f05" } elf_symbol { @@ -178,7 +178,7 @@ elf_symbol { name: "f06" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f06" } elf_symbol { @@ -186,7 +186,7 @@ elf_symbol { name: "f07" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f07" } elf_symbol { @@ -194,7 +194,7 @@ elf_symbol { name: "f08" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f08" } elf_symbol { @@ -202,7 +202,7 @@ elf_symbol { name: "f09" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f09" } elf_symbol { @@ -210,7 +210,7 @@ elf_symbol { name: "f10" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f10" } elf_symbol { @@ -218,7 +218,7 @@ elf_symbol { name: "f11" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f11" } elf_symbol { @@ -226,7 +226,7 @@ elf_symbol { name: "f12" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f12" } elf_symbol { @@ -234,22 +234,22 @@ elf_symbol { name: "s" is_defined: true symbol_type: OBJECT - type_id: 0xf57dfbfc + type_id: 0xf57dfbfc # struct S full_name: "s" } interface { id: 0x84ea5130 - symbol_id: 0x8bf70937 - symbol_id: 0xcab4baef - symbol_id: 0x09745218 - symbol_id: 0xb2312b1c - symbol_id: 0x76f6b896 - symbol_id: 0x37b65de0 - symbol_id: 0xf477c0b7 - symbol_id: 0x4aca4031 - symbol_id: 0x858be3e5 - symbol_id: 0x288f47a4 - symbol_id: 0xe9cfbccb - symbol_id: 0xaf0c113b - symbol_id: 0x3e4f6c44 + symbol_id: 0x8bf70937 # int f01(int, int) + symbol_id: 0xcab4baef # int f02(int, int) + symbol_id: 0x09745218 # int f03(int, int) + symbol_id: 0xb2312b1c # int f04(int, int, int) + symbol_id: 0x76f6b896 # int f05(int, int, int) + symbol_id: 0x37b65de0 # int f06(int, int, int) + symbol_id: 0xf477c0b7 # int f07(int, int, int) + symbol_id: 0x4aca4031 # int f08(int, int, int) + symbol_id: 0x858be3e5 # int f09(int, int, int, int) + symbol_id: 0x288f47a4 # int f10(int, int, int, int) + symbol_id: 0xe9cfbccb # int f11(int, int, int, int) + symbol_id: 0xaf0c113b # int f12(int, int, int, int) + symbol_id: 0x3e4f6c44 # struct S s } diff --git a/test_cases/info_tests/function/expected/parameters_cc.elf_stg b/test_cases/info_tests/function/expected/parameters_cc.elf_stg index 4a6b01e..30cb634 100644 --- a/test_cases/info_tests/function/expected/parameters_cc.elf_stg +++ b/test_cases/info_tests/function/expected/parameters_cc.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x37cf4758 kind: POINTER - pointee_type_id: 0xf57dfbfc + pointee_type_id: 0xf57dfbfc # struct S } primitive { id: 0x6720d32f @@ -21,55 +21,55 @@ struct_union { } function { id: 0x85cc001f - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85cd9c9c - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85d454a8 - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x91f67981 - return_type_id: 0x6720d32f - parameter_id: 0x37cf4758 - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x37cf4758 # struct S* + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x91f7e502 - return_type_id: 0x6720d32f - parameter_id: 0x37cf4758 - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x37cf4758 # struct S* + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x91f7fcca - return_type_id: 0x6720d32f - parameter_id: 0x37cf4758 - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x37cf4758 # struct S* + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } elf_symbol { id: 0x04cd8675 name: "_Z3f01ii" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f01" } elf_symbol { @@ -77,7 +77,7 @@ elf_symbol { name: "_Z3f02ii" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f02" } elf_symbol { @@ -85,7 +85,7 @@ elf_symbol { name: "_Z3f03ii" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "f03" } elf_symbol { @@ -93,7 +93,7 @@ elf_symbol { name: "_Z3f04iii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f04" } elf_symbol { @@ -101,7 +101,7 @@ elf_symbol { name: "_Z3f05iii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f05" } elf_symbol { @@ -109,7 +109,7 @@ elf_symbol { name: "_Z3f06iii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f06" } elf_symbol { @@ -117,7 +117,7 @@ elf_symbol { name: "_Z3f07iii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f07" } elf_symbol { @@ -125,7 +125,7 @@ elf_symbol { name: "_Z3f08iii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cd9c9c + type_id: 0x85cd9c9c # int(int, int, int) full_name: "f08" } elf_symbol { @@ -133,7 +133,7 @@ elf_symbol { name: "_Z3f09iiii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f09" } elf_symbol { @@ -141,7 +141,7 @@ elf_symbol { name: "_Z3f10iiii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f10" } elf_symbol { @@ -149,7 +149,7 @@ elf_symbol { name: "_Z3f11iiii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f11" } elf_symbol { @@ -157,7 +157,7 @@ elf_symbol { name: "_Z3f12iiii" is_defined: true symbol_type: FUNCTION - type_id: 0x85cc001f + type_id: 0x85cc001f # int(int, int, int, int) full_name: "f12" } elf_symbol { @@ -165,7 +165,7 @@ elf_symbol { name: "_ZN1S3f01Eii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f67981 + type_id: 0x91f67981 # int(struct S*, int, int) full_name: "S::f01" } elf_symbol { @@ -173,7 +173,7 @@ elf_symbol { name: "_ZN1S3f02Eii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f67981 + type_id: 0x91f67981 # int(struct S*, int, int) full_name: "S::f02" } elf_symbol { @@ -181,7 +181,7 @@ elf_symbol { name: "_ZN1S3f03Eii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f67981 + type_id: 0x91f67981 # int(struct S*, int, int) full_name: "S::f03" } elf_symbol { @@ -189,7 +189,7 @@ elf_symbol { name: "_ZN1S3f04Eiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7e502 + type_id: 0x91f7e502 # int(struct S*, int, int, int) full_name: "S::f04" } elf_symbol { @@ -197,7 +197,7 @@ elf_symbol { name: "_ZN1S3f05Eiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7e502 + type_id: 0x91f7e502 # int(struct S*, int, int, int) full_name: "S::f05" } elf_symbol { @@ -205,7 +205,7 @@ elf_symbol { name: "_ZN1S3f06Eiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7e502 + type_id: 0x91f7e502 # int(struct S*, int, int, int) full_name: "S::f06" } elf_symbol { @@ -213,7 +213,7 @@ elf_symbol { name: "_ZN1S3f07Eiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7e502 + type_id: 0x91f7e502 # int(struct S*, int, int, int) full_name: "S::f07" } elf_symbol { @@ -221,7 +221,7 @@ elf_symbol { name: "_ZN1S3f08Eiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7e502 + type_id: 0x91f7e502 # int(struct S*, int, int, int) full_name: "S::f08" } elf_symbol { @@ -229,7 +229,7 @@ elf_symbol { name: "_ZN1S3f09Eiiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7fcca + type_id: 0x91f7fcca # int(struct S*, int, int, int, int) full_name: "S::f09" } elf_symbol { @@ -237,7 +237,7 @@ elf_symbol { name: "_ZN1S3f10Eiiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7fcca + type_id: 0x91f7fcca # int(struct S*, int, int, int, int) full_name: "S::f10" } elf_symbol { @@ -245,7 +245,7 @@ elf_symbol { name: "_ZN1S3f11Eiiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7fcca + type_id: 0x91f7fcca # int(struct S*, int, int, int, int) full_name: "S::f11" } elf_symbol { @@ -253,7 +253,7 @@ elf_symbol { name: "_ZN1S3f12Eiiii" is_defined: true symbol_type: FUNCTION - type_id: 0x91f7fcca + type_id: 0x91f7fcca # int(struct S*, int, int, int, int) full_name: "S::f12" } elf_symbol { @@ -261,34 +261,34 @@ elf_symbol { name: "s" is_defined: true symbol_type: OBJECT - type_id: 0xf57dfbfc + type_id: 0xf57dfbfc # struct S full_name: "s" } interface { id: 0x84ea5130 - symbol_id: 0x04cd8675 - symbol_id: 0xd8e7287e - symbol_id: 0x62b93d25 - symbol_id: 0x6d85d90a - symbol_id: 0x3e906889 - symbol_id: 0xdf3dae94 - symbol_id: 0x8242169f - symbol_id: 0xa02977d3 - symbol_id: 0xacc46d56 - symbol_id: 0x19eecc21 - symbol_id: 0xcaac68ac - symbol_id: 0x9dac9678 - symbol_id: 0xb6104462 - symbol_id: 0xe096747f - symbol_id: 0xe75212ee - symbol_id: 0x3f66b497 - symbol_id: 0xba6389ba - symbol_id: 0x9bfbfd6f - symbol_id: 0x7e444f5b - symbol_id: 0x1cea5f3c - symbol_id: 0xf68e705e - symbol_id: 0xb296d732 - symbol_id: 0x12addaa8 - symbol_id: 0xb0e58223 - symbol_id: 0x3e4f6c44 + symbol_id: 0x04cd8675 # int f01(int, int) + symbol_id: 0xd8e7287e # int f02(int, int) + symbol_id: 0x62b93d25 # int f03(int, int) + symbol_id: 0x6d85d90a # int f04(int, int, int) + symbol_id: 0x3e906889 # int f05(int, int, int) + symbol_id: 0xdf3dae94 # int f06(int, int, int) + symbol_id: 0x8242169f # int f07(int, int, int) + symbol_id: 0xa02977d3 # int f08(int, int, int) + symbol_id: 0xacc46d56 # int f09(int, int, int, int) + symbol_id: 0x19eecc21 # int f10(int, int, int, int) + symbol_id: 0xcaac68ac # int f11(int, int, int, int) + symbol_id: 0x9dac9678 # int f12(int, int, int, int) + symbol_id: 0xb6104462 # int S::f01(struct S*, int, int) + symbol_id: 0xe096747f # int S::f02(struct S*, int, int) + symbol_id: 0xe75212ee # int S::f03(struct S*, int, int) + symbol_id: 0x3f66b497 # int S::f04(struct S*, int, int, int) + symbol_id: 0xba6389ba # int S::f05(struct S*, int, int, int) + symbol_id: 0x9bfbfd6f # int S::f06(struct S*, int, int, int) + symbol_id: 0x7e444f5b # int S::f07(struct S*, int, int, int) + symbol_id: 0x1cea5f3c # int S::f08(struct S*, int, int, int) + symbol_id: 0xf68e705e # int S::f09(struct S*, int, int, int, int) + symbol_id: 0xb296d732 # int S::f10(struct S*, int, int, int, int) + symbol_id: 0x12addaa8 # int S::f11(struct S*, int, int, int, int) + symbol_id: 0xb0e58223 # int S::f12(struct S*, int, int, int, int) + symbol_id: 0x3e4f6c44 # struct S s } diff --git a/test_cases/info_tests/function/expected/static_method_cc.elf_stg b/test_cases/info_tests/function/expected/static_method_cc.elf_stg index 1090a42..5038609 100644 --- a/test_cases/info_tests/function/expected/static_method_cc.elf_stg +++ b/test_cases/info_tests/function/expected/static_method_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -9,7 +9,7 @@ primitive { member { id: 0x8dbf3d30 name: "m" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0xf6f304f7 @@ -17,19 +17,19 @@ struct_union { name: "Foo" definition { bytesize: 4 - member_id: 0x8dbf3d30 + member_id: 0x8dbf3d30 # int m } } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0xdb2df0ad name: "_ZN3Foo3barE" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "Foo::bar" } elf_symbol { @@ -37,7 +37,7 @@ elf_symbol { name: "_ZN3Foo3bazEv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "Foo::baz" } elf_symbol { @@ -45,12 +45,12 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0xf6f304f7 + type_id: 0xf6f304f7 # struct Foo full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0xdb2df0ad - symbol_id: 0x39ee62e8 - symbol_id: 0x06f8338c + symbol_id: 0xdb2df0ad # int Foo::bar + symbol_id: 0x39ee62e8 # int Foo::baz() + symbol_id: 0x06f8338c # struct Foo foo } diff --git a/test_cases/info_tests/function/expected/variadic_parameter_cc.elf_stg b/test_cases/info_tests/function/expected/variadic_parameter_cc.elf_stg index 38d48d4..926bf39 100644 --- a/test_cases/info_tests/function/expected/variadic_parameter_cc.elf_stg +++ b/test_cases/info_tests/function/expected/variadic_parameter_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0xa52a0930 kind: VARIADIC @@ -12,34 +12,34 @@ primitive { } function { id: 0x85d454a8 - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int } function { id: 0x85fd1e2a - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0xa52a0930 + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0xa52a0930 # ... } function { id: 0x86dc7fc0 - return_type_id: 0x6720d32f - parameter_id: 0x6720d32f - parameter_id: 0xa52a0930 + return_type_id: 0x6720d32f # int + parameter_id: 0x6720d32f # int + parameter_id: 0xa52a0930 # ... } function { id: 0xb4ca6163 - return_type_id: 0x6720d32f - parameter_id: 0xa52a0930 + return_type_id: 0x6720d32f # int + parameter_id: 0xa52a0930 # ... } elf_symbol { id: 0xcac6ee98 name: "_Z4foo1iiz" is_defined: true symbol_type: FUNCTION - type_id: 0x85fd1e2a + type_id: 0x85fd1e2a # int(int, int, ...) full_name: "foo1" } elf_symbol { @@ -47,7 +47,7 @@ elf_symbol { name: "_Z4foo2iz" is_defined: true symbol_type: FUNCTION - type_id: 0x86dc7fc0 + type_id: 0x86dc7fc0 # int(int, ...) full_name: "foo2" } elf_symbol { @@ -55,7 +55,7 @@ elf_symbol { name: "_Z4foo3ii" is_defined: true symbol_type: FUNCTION - type_id: 0x85d454a8 + type_id: 0x85d454a8 # int(int, int) full_name: "foo3" } elf_symbol { @@ -63,13 +63,13 @@ elf_symbol { name: "_Z4foo4z" is_defined: true symbol_type: FUNCTION - type_id: 0xb4ca6163 + type_id: 0xb4ca6163 # int(...) full_name: "foo4" } interface { id: 0x84ea5130 - symbol_id: 0xcac6ee98 - symbol_id: 0xa5cf8676 - symbol_id: 0x2522c6f3 - symbol_id: 0x16a736d0 + symbol_id: 0xcac6ee98 # int foo1(int, int, ...) + symbol_id: 0xa5cf8676 # int foo2(int, ...) + symbol_id: 0x2522c6f3 # int foo3(int, int) + symbol_id: 0x16a736d0 # int foo4(...) } diff --git a/test_cases/info_tests/function/expected/virtual_method_cc.elf_stg b/test_cases/info_tests/function/expected/virtual_method_cc.elf_stg index 879c6a3..cbc7e61 100644 --- a/test_cases/info_tests/function/expected/virtual_method_cc.elf_stg +++ b/test_cases/info_tests/function/expected/virtual_method_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x01ec39fc kind: POINTER - pointee_type_id: 0x2df0016c + pointee_type_id: 0x2df0016c # int(*)() } pointer_reference { id: 0x2df0016c kind: POINTER - pointee_type_id: 0x9d80e32f + pointee_type_id: 0x9d80e32f # int() } pointer_reference { id: 0x372cf89a kind: POINTER - pointee_type_id: 0xf6f304f7 + pointee_type_id: 0xf6f304f7 # struct Foo } primitive { id: 0x6720d32f @@ -29,19 +29,19 @@ method { id: 0x91a60460 mangled_name: "_ZN3Foo3barEv" name: "bar" - type_id: 0x1d536fb5 + type_id: 0x1d536fb5 # void(struct Foo*) } method { id: 0x3bae9a68 mangled_name: "_ZN3Foo3bazEv" name: "baz" vtable_offset: 1 - type_id: 0x1d536fb5 + type_id: 0x1d536fb5 # void(struct Foo*) } member { id: 0xc9e943fb name: "_vptr$Foo" - type_id: 0x01ec39fc + type_id: 0x01ec39fc # int(**)() } struct_union { id: 0xf6f304f7 @@ -49,26 +49,26 @@ struct_union { name: "Foo" definition { bytesize: 8 - method_id: 0x91a60460 - method_id: 0x3bae9a68 - member_id: 0xc9e943fb + method_id: 0x91a60460 # void bar(struct Foo*) + method_id: 0x3bae9a68 # void baz(struct Foo*) + member_id: 0xc9e943fb # int(** _vptr$Foo)() } } function { id: 0x1d536fb5 - return_type_id: 0x48b5725f - parameter_id: 0x372cf89a + return_type_id: 0x48b5725f # void + parameter_id: 0x372cf89a # struct Foo* } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x043f549e name: "_ZN3Foo3barEv" is_defined: true symbol_type: FUNCTION - type_id: 0x1d536fb5 + type_id: 0x1d536fb5 # void(struct Foo*) full_name: "Foo::bar" } elf_symbol { @@ -76,7 +76,7 @@ elf_symbol { name: "_ZN3Foo3bazEv" is_defined: true symbol_type: FUNCTION - type_id: 0x1d536fb5 + type_id: 0x1d536fb5 # void(struct Foo*) full_name: "Foo::baz" } elf_symbol { @@ -102,15 +102,15 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0xf6f304f7 + type_id: 0xf6f304f7 # struct Foo full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x043f549e - symbol_id: 0x39ee62e8 - symbol_id: 0x263987d0 - symbol_id: 0x264c5a0d - symbol_id: 0x9e36cb56 - symbol_id: 0x06f8338c + symbol_id: 0x043f549e # void Foo::bar(struct Foo*) + symbol_id: 0x39ee62e8 # void Foo::baz(struct Foo*) + symbol_id: 0x263987d0 # _ZTI3Foo + symbol_id: 0x264c5a0d # _ZTS3Foo + symbol_id: 0x9e36cb56 # _ZTV3Foo + symbol_id: 0x06f8338c # struct Foo foo } diff --git a/test_cases/info_tests/member/expected/member_types_cc.elf_stg b/test_cases/info_tests/member/expected/member_types_cc.elf_stg index 34f6154..071ca7c 100644 --- a/test_cases/info_tests/member/expected/member_types_cc.elf_stg +++ b/test_cases/info_tests/member/expected/member_types_cc.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x4cf6e5b0 name: "Scope::TypedefDecl" - referred_type_id: 0xfc0e1dbd + referred_type_id: 0xfc0e1dbd # long } primitive { id: 0x4585663f @@ -20,7 +20,7 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0xcaaeb4e7 @@ -28,7 +28,7 @@ struct_union { name: "Scope::ClassDecl" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -37,7 +37,7 @@ struct_union { name: "Scope::StructDecl" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -46,14 +46,14 @@ struct_union { name: "Scope::UnionDecl" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } enumeration { id: 0x83c8a573 name: "Scope::EnumDecl" definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "X" value: 2 @@ -65,7 +65,7 @@ elf_symbol { name: "class_decl" is_defined: true symbol_type: OBJECT - type_id: 0xcaaeb4e7 + type_id: 0xcaaeb4e7 # struct Scope::ClassDecl full_name: "class_decl" } elf_symbol { @@ -73,7 +73,7 @@ elf_symbol { name: "enum_decl" is_defined: true symbol_type: OBJECT - type_id: 0x83c8a573 + type_id: 0x83c8a573 # enum Scope::EnumDecl full_name: "enum_decl" } elf_symbol { @@ -81,7 +81,7 @@ elf_symbol { name: "struct_decl" is_defined: true symbol_type: OBJECT - type_id: 0x7c169231 + type_id: 0x7c169231 # struct Scope::StructDecl full_name: "struct_decl" } elf_symbol { @@ -89,7 +89,7 @@ elf_symbol { name: "typedef_decl" is_defined: true symbol_type: OBJECT - type_id: 0x4cf6e5b0 + type_id: 0x4cf6e5b0 # Scope::TypedefDecl full_name: "typedef_decl" } elf_symbol { @@ -97,14 +97,14 @@ elf_symbol { name: "union_decl" is_defined: true symbol_type: OBJECT - type_id: 0xb493105f + type_id: 0xb493105f # union Scope::UnionDecl full_name: "union_decl" } interface { id: 0x84ea5130 - symbol_id: 0x477e22e9 - symbol_id: 0xd58568f2 - symbol_id: 0x2e5e5d2a - symbol_id: 0xb9b8f74f - symbol_id: 0xc1804b63 + symbol_id: 0x477e22e9 # struct Scope::ClassDecl class_decl + symbol_id: 0xd58568f2 # enum Scope::EnumDecl enum_decl + symbol_id: 0x2e5e5d2a # struct Scope::StructDecl struct_decl + symbol_id: 0xb9b8f74f # Scope::TypedefDecl typedef_decl + symbol_id: 0xc1804b63 # union Scope::UnionDecl union_decl } diff --git a/test_cases/info_tests/member/expected/pointer_to_member_cc.elf_stg b/test_cases/info_tests/member/expected/pointer_to_member_cc.elf_stg index 6d9e1d4..69b8c76 100644 --- a/test_cases/info_tests/member/expected/pointer_to_member_cc.elf_stg +++ b/test_cases/info_tests/member/expected/pointer_to_member_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,102 +7,102 @@ special { pointer_reference { id: 0x0b5e55a4 kind: POINTER - pointee_type_id: 0x0739b00c + pointee_type_id: 0x0739b00c # struct X } pointer_reference { id: 0x13580d6c kind: POINTER - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0x1945b139 kind: POINTER - pointee_type_id: 0x4f562278 + pointee_type_id: 0x4f562278 # struct S } pointer_reference { id: 0x2df0016c kind: POINTER - pointee_type_id: 0x9d80e32f + pointee_type_id: 0x9d80e32f # int() } pointer_reference { id: 0x2f8903cb kind: POINTER - pointee_type_id: 0x9464e9b2 + pointee_type_id: 0x9464e9b2 # int struct S::*() } pointer_reference { id: 0x3f6521e6 kind: POINTER - pointee_type_id: 0xd7d46104 + pointee_type_id: 0xd7d46104 # int struct S::* } pointer_to_member { id: 0x25925b84 containing_type_id: 0x8f5f455e - pointee_type_id: 0x384f7d7c + pointee_type_id: 0x384f7d7c # char } pointer_to_member { id: 0x50f283da containing_type_id: 0x329a7805 - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_to_member { id: 0x7867bbed containing_type_id: 0x0739b00c - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_to_member { id: 0x7867c9c8 containing_type_id: 0x0739b00c - pointee_type_id: 0x15053314 + pointee_type_id: 0x15053314 # double } pointer_to_member { id: 0x7867cf1e containing_type_id: 0x0739b00c - pointee_type_id: 0x13d347b6 + pointee_type_id: 0x13d347b6 # void(struct X*, int) } pointer_to_member { id: 0x7bd84cb2 containing_type_id: 0xfa4f7de5 - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_to_member { id: 0xd7d4157c containing_type_id: 0x4f562278 - pointee_type_id: 0x13580d6c + pointee_type_id: 0x13580d6c # int* } pointer_to_member { id: 0xd7d42bd4 containing_type_id: 0x4f562278 - pointee_type_id: 0x2df0016c + pointee_type_id: 0x2df0016c # int(*)() } pointer_to_member { id: 0xd7d46104 containing_type_id: 0x4f562278 - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_to_member { id: 0xd7d47722 containing_type_id: 0x4f562278 - pointee_type_id: 0x7106acfa + pointee_type_id: 0x7106acfa # int[7] } pointer_to_member { id: 0xd7d49df5 containing_type_id: 0x4f562278 - pointee_type_id: 0x9bd18f61 + pointee_type_id: 0x9bd18f61 # int(struct S*) } pointer_to_member { id: 0xd7d4c3fd containing_type_id: 0x4f562278 - pointee_type_id: 0xc5d9d969 + pointee_type_id: 0xc5d9d969 # const int } qualified { id: 0xa1e34272 qualifier: VOLATILE - qualified_type_id: 0xd7d4c3fd + qualified_type_id: 0xd7d4c3fd # const int struct S::* } qualified { id: 0xc5d9d969 qualifier: CONST - qualified_type_id: 0x6720d32f + qualified_type_id: 0x6720d32f # int } primitive { id: 0x15053314 @@ -125,34 +125,34 @@ primitive { array { id: 0x5d3b8070 number_of_elements: 7 - element_type_id: 0xd7d46104 + element_type_id: 0xd7d46104 # int struct S::* } array { id: 0x7106acfa number_of_elements: 7 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } member { id: 0x80bcb4cd name: "a" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xabd8f37a name: "t" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xec187cbe name: "u" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0x329a7805 kind: STRUCT definition { bytesize: 4 - member_id: 0xabd8f37a + member_id: 0xabd8f37a # int t } } struct_union { @@ -166,7 +166,7 @@ struct_union { name: "U" definition { bytesize: 4 - member_id: 0xec187cbe + member_id: 0xec187cbe # int u } } struct_union { @@ -175,7 +175,7 @@ struct_union { name: "X" definition { bytesize: 4 - member_id: 0x80bcb4cd + member_id: 0x80bcb4cd # int a } } struct_union { @@ -185,38 +185,38 @@ struct_union { } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } function { id: 0x13d347b6 - return_type_id: 0x48b5725f - parameter_id: 0x0b5e55a4 - parameter_id: 0x6720d32f + return_type_id: 0x48b5725f # void + parameter_id: 0x0b5e55a4 # struct X* + parameter_id: 0x6720d32f # int } function { id: 0x9464e9b2 - return_type_id: 0xd7d46104 + return_type_id: 0xd7d46104 # int struct S::* } function { id: 0x9bd18f61 - return_type_id: 0x6720d32f - parameter_id: 0x1945b139 + return_type_id: 0x6720d32f # int + parameter_id: 0x1945b139 # struct S* } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } function { id: 0xa875fb6e - return_type_id: 0x6720d32f - parameter_id: 0xd7d46104 + return_type_id: 0x6720d32f # int + parameter_id: 0xd7d46104 # int struct S::* } elf_symbol { id: 0xba0e5cd0 name: "_Z2s2v" is_defined: true symbol_type: FUNCTION - type_id: 0x9464e9b2 + type_id: 0x9464e9b2 # int struct S::*() full_name: "s2" } elf_symbol { @@ -224,7 +224,7 @@ elf_symbol { name: "_Z3s10M1Si" is_defined: true symbol_type: FUNCTION - type_id: 0xa875fb6e + type_id: 0xa875fb6e # int(int struct S::*) full_name: "s10" } elf_symbol { @@ -232,7 +232,7 @@ elf_symbol { name: "_Z7pmz_funv" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "pmz_fun" } elf_symbol { @@ -240,7 +240,7 @@ elf_symbol { name: "pmc" is_defined: true symbol_type: OBJECT - type_id: 0x25925b84 + type_id: 0x25925b84 # char struct Y::* full_name: "pmc" } elf_symbol { @@ -248,7 +248,7 @@ elf_symbol { name: "pmcu" is_defined: true symbol_type: OBJECT - type_id: 0x7bd84cb2 + type_id: 0x7bd84cb2 # int union U::* full_name: "pmcu" } elf_symbol { @@ -256,7 +256,7 @@ elf_symbol { name: "pmd" is_defined: true symbol_type: OBJECT - type_id: 0x7867c9c8 + type_id: 0x7867c9c8 # double struct X::* full_name: "pmd" } elf_symbol { @@ -264,7 +264,7 @@ elf_symbol { name: "pmf" is_defined: true symbol_type: OBJECT - type_id: 0x7867cf1e + type_id: 0x7867cf1e # void(struct X::*)(struct X*, int) full_name: "pmf" } elf_symbol { @@ -272,7 +272,7 @@ elf_symbol { name: "pmi" is_defined: true symbol_type: OBJECT - type_id: 0x7867bbed + type_id: 0x7867bbed # int struct X::* full_name: "pmi" } elf_symbol { @@ -280,7 +280,7 @@ elf_symbol { name: "pmu" is_defined: true symbol_type: OBJECT - type_id: 0x7bd84cb2 + type_id: 0x7bd84cb2 # int union U::* full_name: "pmu" } elf_symbol { @@ -288,7 +288,7 @@ elf_symbol { name: "pmy" is_defined: true symbol_type: OBJECT - type_id: 0x50f283da + type_id: 0x50f283da # int struct { int t; }::* full_name: "pmy" } elf_symbol { @@ -296,7 +296,7 @@ elf_symbol { name: "s0" is_defined: true symbol_type: OBJECT - type_id: 0xd7d46104 + type_id: 0xd7d46104 # int struct S::* full_name: "s0" } elf_symbol { @@ -304,7 +304,7 @@ elf_symbol { name: "s1" is_defined: true symbol_type: OBJECT - type_id: 0x3f6521e6 + type_id: 0x3f6521e6 # int struct S::** full_name: "s1" } elf_symbol { @@ -312,7 +312,7 @@ elf_symbol { name: "s3" is_defined: true symbol_type: OBJECT - type_id: 0x2f8903cb + type_id: 0x2f8903cb # int struct S::*(*)() full_name: "s3" } elf_symbol { @@ -320,7 +320,7 @@ elf_symbol { name: "s4" is_defined: true symbol_type: OBJECT - type_id: 0x5d3b8070 + type_id: 0x5d3b8070 # int struct S::*[7] full_name: "s4" } elf_symbol { @@ -328,7 +328,7 @@ elf_symbol { name: "s5" is_defined: true symbol_type: OBJECT - type_id: 0xd7d4157c + type_id: 0xd7d4157c # int* struct S::* full_name: "s5" } elf_symbol { @@ -336,7 +336,7 @@ elf_symbol { name: "s6" is_defined: true symbol_type: OBJECT - type_id: 0xd7d42bd4 + type_id: 0xd7d42bd4 # int(* struct S::*)() full_name: "s6" } elf_symbol { @@ -344,7 +344,7 @@ elf_symbol { name: "s7" is_defined: true symbol_type: OBJECT - type_id: 0xd7d49df5 + type_id: 0xd7d49df5 # int(struct S::*)(struct S*) full_name: "s7" } elf_symbol { @@ -352,7 +352,7 @@ elf_symbol { name: "s8" is_defined: true symbol_type: OBJECT - type_id: 0xd7d47722 + type_id: 0xd7d47722 # int(struct S::*)[7] full_name: "s8" } elf_symbol { @@ -360,28 +360,28 @@ elf_symbol { name: "s9" is_defined: true symbol_type: OBJECT - type_id: 0xa1e34272 + type_id: 0xa1e34272 # const int struct S::* volatile full_name: "s9" } interface { id: 0x84ea5130 - symbol_id: 0xba0e5cd0 - symbol_id: 0x94e5eb64 - symbol_id: 0x13e4cc52 - symbol_id: 0x648621f2 - symbol_id: 0xff819903 - symbol_id: 0x2ec71519 - symbol_id: 0xa0583676 - symbol_id: 0xfd020c80 - symbol_id: 0xf60097d9 - symbol_id: 0xc90bc4a4 - symbol_id: 0xdaa14405 - symbol_id: 0x1660e091 - symbol_id: 0x9be13bad - symbol_id: 0xd5a33a44 - symbol_id: 0x136353fe - symbol_id: 0x57200721 - symbol_id: 0x94e3994e - symbol_id: 0xd0a5df97 - symbol_id: 0x3065441f + symbol_id: 0xba0e5cd0 # int struct S::* s2() + symbol_id: 0x94e5eb64 # int s10(int struct S::*) + symbol_id: 0x13e4cc52 # void pmz_fun() + symbol_id: 0x648621f2 # char struct Y::* pmc + symbol_id: 0xff819903 # int union U::* pmcu + symbol_id: 0x2ec71519 # double struct X::* pmd + symbol_id: 0xa0583676 # void(struct X::* pmf)(struct X*, int) + symbol_id: 0xfd020c80 # int struct X::* pmi + symbol_id: 0xf60097d9 # int union U::* pmu + symbol_id: 0xc90bc4a4 # int struct { int t; }::* pmy + symbol_id: 0xdaa14405 # int struct S::* s0 + symbol_id: 0x1660e091 # int struct S::** s1 + symbol_id: 0x9be13bad # int struct S::*(* s3)() + symbol_id: 0xd5a33a44 # int struct S::* s4[7] + symbol_id: 0x136353fe # int* struct S::* s5 + symbol_id: 0x57200721 # int(* struct S::* s6)() + symbol_id: 0x94e3994e # int(struct S::* s7)(struct S*) + symbol_id: 0xd0a5df97 # int(struct S::* s8)[7] + symbol_id: 0x3065441f # const int struct S::* volatile s9 } diff --git a/test_cases/info_tests/misc/expected/enum_c.btf_stg b/test_cases/info_tests/misc/expected/enum_c.btf_stg index b99e4aa..154ae8e 100644 --- a/test_cases/info_tests/misc/expected/enum_c.btf_stg +++ b/test_cases/info_tests/misc/expected/enum_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x2b903cc5 name: "enum-underlying-unsigned-32" @@ -10,7 +10,7 @@ enumeration { id: 0x226ff690 name: "Foo" definition { - underlying_type_id: 0x2b903cc5 + underlying_type_id: 0x2b903cc5 # enum-underlying-unsigned-32 enumerator { name: "FOO_ONE" value: 1 @@ -31,17 +31,17 @@ enumeration { } function { id: 0x97c8da2d - return_type_id: 0x226ff690 - parameter_id: 0x226ff690 + return_type_id: 0x226ff690 # enum Foo + parameter_id: 0x226ff690 # enum Foo } elf_symbol { id: 0xdfa4312b name: "getEnum" is_defined: true symbol_type: FUNCTION - type_id: 0x97c8da2d + type_id: 0x97c8da2d # enum Foo(enum Foo) } interface { id: 0x84ea5130 - symbol_id: 0xdfa4312b + symbol_id: 0xdfa4312b # enum Foo getEnum(enum Foo) } diff --git a/test_cases/info_tests/misc/expected/enum_c.elf_stg b/test_cases/info_tests/misc/expected/enum_c.elf_stg index 2a88210..68d45bb 100644 --- a/test_cases/info_tests/misc/expected/enum_c.elf_stg +++ b/test_cases/info_tests/misc/expected/enum_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x4585663f name: "unsigned int" @@ -10,7 +10,7 @@ enumeration { id: 0x226ff690 name: "Foo" definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "FOO_ONE" value: 1 @@ -31,18 +31,18 @@ enumeration { } function { id: 0x97c8da2d - return_type_id: 0x226ff690 - parameter_id: 0x226ff690 + return_type_id: 0x226ff690 # enum Foo + parameter_id: 0x226ff690 # enum Foo } elf_symbol { id: 0xdfa4312b name: "getEnum" is_defined: true symbol_type: FUNCTION - type_id: 0x97c8da2d + type_id: 0x97c8da2d # enum Foo(enum Foo) full_name: "getEnum" } interface { id: 0x84ea5130 - symbol_id: 0xdfa4312b + symbol_id: 0xdfa4312b # enum Foo getEnum(enum Foo) } diff --git a/test_cases/info_tests/misc/expected/enum_cc.elf_stg b/test_cases/info_tests/misc/expected/enum_cc.elf_stg index 2d10a9c..bc9f079 100644 --- a/test_cases/info_tests/misc/expected/enum_cc.elf_stg +++ b/test_cases/info_tests/misc/expected/enum_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,12 +7,12 @@ special { pointer_reference { id: 0xf3bba530 kind: LVALUE_REFERENCE - pointee_type_id: 0xd0ae2902 + pointee_type_id: 0xd0ae2902 # const enum Colour } qualified { id: 0xd0ae2902 qualifier: CONST - qualified_type_id: 0x32ff1281 + qualified_type_id: 0x32ff1281 # enum Colour } primitive { id: 0x5d8155a5 @@ -24,7 +24,7 @@ enumeration { id: 0x32ff1281 name: "Colour" definition { - underlying_type_id: 0x5d8155a5 + underlying_type_id: 0x5d8155a5 # unsigned char enumerator { name: "red" } @@ -40,18 +40,18 @@ enumeration { } function { id: 0x2c76b8df - return_type_id: 0x48b5725f - parameter_id: 0xf3bba530 + return_type_id: 0x48b5725f # void + parameter_id: 0xf3bba530 # const enum Colour& } elf_symbol { id: 0x80272d52 name: "_Z3fooRK6Colour" is_defined: true symbol_type: FUNCTION - type_id: 0x2c76b8df + type_id: 0x2c76b8df # void(const enum Colour&) full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x80272d52 + symbol_id: 0x80272d52 # void foo(const enum Colour&) } diff --git a/test_cases/info_tests/misc/expected/enum_const_c.btf_stg b/test_cases/info_tests/misc/expected/enum_const_c.btf_stg index 55a5544..61d2072 100644 --- a/test_cases/info_tests/misc/expected/enum_const_c.btf_stg +++ b/test_cases/info_tests/misc/expected/enum_const_c.btf_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x7d386fee name: "Foo" - referred_type_id: 0x226ff690 + referred_type_id: 0x226ff690 # enum Foo } qualified { id: 0xc35ff659 qualifier: CONST - qualified_type_id: 0x7d386fee + qualified_type_id: 0x7d386fee # Foo } primitive { id: 0x2b903cc5 @@ -20,7 +20,7 @@ enumeration { id: 0x226ff690 name: "Foo" definition { - underlying_type_id: 0x2b903cc5 + underlying_type_id: 0x2b903cc5 # enum-underlying-unsigned-32 enumerator { name: "FOO_ONE" value: 1 @@ -37,17 +37,17 @@ enumeration { } function { id: 0xcbe2d488 - return_type_id: 0x7d386fee - parameter_id: 0xc35ff659 + return_type_id: 0x7d386fee # Foo + parameter_id: 0xc35ff659 # const Foo } elf_symbol { id: 0xdfa4312b name: "getEnum" is_defined: true symbol_type: FUNCTION - type_id: 0xcbe2d488 + type_id: 0xcbe2d488 # Foo(const Foo) } interface { id: 0x84ea5130 - symbol_id: 0xdfa4312b + symbol_id: 0xdfa4312b # Foo getEnum(const Foo) } diff --git a/test_cases/info_tests/misc/expected/enum_const_c.elf_stg b/test_cases/info_tests/misc/expected/enum_const_c.elf_stg index 5c88da0..156de30 100644 --- a/test_cases/info_tests/misc/expected/enum_const_c.elf_stg +++ b/test_cases/info_tests/misc/expected/enum_const_c.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x7d386fee name: "Foo" - referred_type_id: 0x226ff690 + referred_type_id: 0x226ff690 # enum Foo } primitive { id: 0x4585663f @@ -15,7 +15,7 @@ enumeration { id: 0x226ff690 name: "Foo" definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "FOO_ONE" value: 1 @@ -32,18 +32,18 @@ enumeration { } function { id: 0xe47b32e5 - return_type_id: 0x7d386fee - parameter_id: 0x7d386fee + return_type_id: 0x7d386fee # Foo + parameter_id: 0x7d386fee # Foo } elf_symbol { id: 0xdfa4312b name: "getEnum" is_defined: true symbol_type: FUNCTION - type_id: 0xe47b32e5 + type_id: 0xe47b32e5 # Foo(Foo) full_name: "getEnum" } interface { id: 0x84ea5130 - symbol_id: 0xdfa4312b + symbol_id: 0xdfa4312b # Foo getEnum(Foo) } diff --git a/test_cases/info_tests/namespace/expected/nested_anonymous_types_cc.elf_stg b/test_cases/info_tests/namespace/expected/nested_anonymous_types_cc.elf_stg index 539f001..5f76213 100644 --- a/test_cases/info_tests/namespace/expected/nested_anonymous_types_cc.elf_stg +++ b/test_cases/info_tests/namespace/expected/nested_anonymous_types_cc.elf_stg @@ -1,24 +1,24 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0xc7d29913 name: "Scope::AnonClass" - referred_type_id: 0x307fdda9 + referred_type_id: 0x307fdda9 # struct { long x; } } typedef { id: 0x9d6a1225 name: "Scope::AnonEnum" - referred_type_id: 0x7bdf7a79 + referred_type_id: 0x7bdf7a79 # enum { X = 2, } } typedef { id: 0xa7b0b85b name: "Scope::AnonStruct" - referred_type_id: 0x307fdda9 + referred_type_id: 0x307fdda9 # struct { long x; } } typedef { id: 0x0ffeca80 name: "Scope::AnonUnion" - referred_type_id: 0x7ee944b3 + referred_type_id: 0x7ee944b3 # union { long x; } } primitive { id: 0x4585663f @@ -35,14 +35,14 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x307fdda9 kind: STRUCT definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -50,13 +50,13 @@ struct_union { kind: UNION definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } enumeration { id: 0x7bdf7a79 definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int enumerator { name: "X" value: 2 @@ -68,7 +68,7 @@ elf_symbol { name: "anon_class" is_defined: true symbol_type: OBJECT - type_id: 0xc7d29913 + type_id: 0xc7d29913 # Scope::AnonClass full_name: "anon_class" } elf_symbol { @@ -76,7 +76,7 @@ elf_symbol { name: "anon_enum" is_defined: true symbol_type: OBJECT - type_id: 0x9d6a1225 + type_id: 0x9d6a1225 # Scope::AnonEnum full_name: "anon_enum" } elf_symbol { @@ -84,7 +84,7 @@ elf_symbol { name: "anon_struct" is_defined: true symbol_type: OBJECT - type_id: 0xa7b0b85b + type_id: 0xa7b0b85b # Scope::AnonStruct full_name: "anon_struct" } elf_symbol { @@ -92,13 +92,13 @@ elf_symbol { name: "anon_union" is_defined: true symbol_type: OBJECT - type_id: 0x0ffeca80 + type_id: 0x0ffeca80 # Scope::AnonUnion full_name: "anon_union" } interface { id: 0x84ea5130 - symbol_id: 0x27c36e84 - symbol_id: 0xbf616178 - symbol_id: 0x13b082fd - symbol_id: 0x5465a5f8 + symbol_id: 0x27c36e84 # Scope::AnonClass anon_class + symbol_id: 0xbf616178 # Scope::AnonEnum anon_enum + symbol_id: 0x13b082fd # Scope::AnonStruct anon_struct + symbol_id: 0x5465a5f8 # Scope::AnonUnion anon_union } diff --git a/test_cases/info_tests/namespace/expected/nested_cc.elf_stg b/test_cases/info_tests/namespace/expected/nested_cc.elf_stg index 92b841b..4b593e2 100644 --- a/test_cases/info_tests/namespace/expected/nested_cc.elf_stg +++ b/test_cases/info_tests/namespace/expected/nested_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xfc0e1dbd name: "long" @@ -9,7 +9,7 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0xe765e7d3 @@ -17,7 +17,7 @@ struct_union { name: "foo::str" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -26,7 +26,7 @@ struct_union { name: "n1::n2::n3::str" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } elf_symbol { @@ -34,7 +34,7 @@ elf_symbol { name: "_ZN2n12n22n35var_nE" is_defined: true symbol_type: OBJECT - type_id: 0xe4ac9186 + type_id: 0xe4ac9186 # struct n1::n2::n3::str full_name: "n1::n2::n3::var_n" } elf_symbol { @@ -42,7 +42,7 @@ elf_symbol { name: "_ZN2n12n22n37var_fooE" is_defined: true symbol_type: OBJECT - type_id: 0xe765e7d3 + type_id: 0xe765e7d3 # struct foo::str full_name: "n1::n2::n3::var_foo" } elf_symbol { @@ -50,7 +50,7 @@ elf_symbol { name: "_ZN2n12n27var_fooE" is_defined: true symbol_type: OBJECT - type_id: 0xe765e7d3 + type_id: 0xe765e7d3 # struct foo::str full_name: "n1::n2::var_foo" } elf_symbol { @@ -58,7 +58,7 @@ elf_symbol { name: "_ZN2n17var_fooE" is_defined: true symbol_type: OBJECT - type_id: 0xe765e7d3 + type_id: 0xe765e7d3 # struct foo::str full_name: "n1::var_foo" } elf_symbol { @@ -66,7 +66,7 @@ elf_symbol { name: "_ZN3foo7var_fooE" is_defined: true symbol_type: OBJECT - type_id: 0xe765e7d3 + type_id: 0xe765e7d3 # struct foo::str full_name: "foo::var_foo" } elf_symbol { @@ -74,7 +74,7 @@ elf_symbol { name: "var_foo" is_defined: true symbol_type: OBJECT - type_id: 0xe765e7d3 + type_id: 0xe765e7d3 # struct foo::str full_name: "var_foo" } elf_symbol { @@ -82,16 +82,16 @@ elf_symbol { name: "var_n" is_defined: true symbol_type: OBJECT - type_id: 0xe4ac9186 + type_id: 0xe4ac9186 # struct n1::n2::n3::str full_name: "var_n" } interface { id: 0x84ea5130 - symbol_id: 0x36450b1b - symbol_id: 0x3de752de - symbol_id: 0xa7d38296 - symbol_id: 0x17ba9f4f - symbol_id: 0xe093a53a - symbol_id: 0x685e3a30 - symbol_id: 0x9bc7e018 + symbol_id: 0x36450b1b # struct n1::n2::n3::str n1::n2::n3::var_n + symbol_id: 0x3de752de # struct foo::str n1::n2::n3::var_foo + symbol_id: 0xa7d38296 # struct foo::str n1::n2::var_foo + symbol_id: 0x17ba9f4f # struct foo::str n1::var_foo + symbol_id: 0xe093a53a # struct foo::str foo::var_foo + symbol_id: 0x685e3a30 # struct foo::str var_foo + symbol_id: 0x9bc7e018 # struct n1::n2::n3::str var_n } diff --git a/test_cases/info_tests/namespace/expected/simple_cc.elf_stg b/test_cases/info_tests/namespace/expected/simple_cc.elf_stg index bfc9d49..cda834a 100644 --- a/test_cases/info_tests/namespace/expected/simple_cc.elf_stg +++ b/test_cases/info_tests/namespace/expected/simple_cc.elf_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0xbc115339 name: "foo::type_definition" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } qualified { id: 0xc5d9d969 qualifier: CONST - qualified_type_id: 0x6720d32f + qualified_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -19,12 +19,12 @@ primitive { array { id: 0xf0341a7a number_of_elements: 5 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } member { id: 0xa0d54b05 name: "x" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0x3ba6625d @@ -32,7 +32,7 @@ struct_union { name: "foo::S" definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } struct_union { @@ -41,14 +41,14 @@ struct_union { name: "foo::U" definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } enumeration { id: 0x249cfa0e name: "foo::E" definition { - underlying_type_id: 0x6720d32f + underlying_type_id: 0x6720d32f # int enumerator { name: "X" } @@ -60,14 +60,14 @@ enumeration { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x582117f7 name: "_ZN3foo2x1E" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "foo::x1" } elf_symbol { @@ -75,7 +75,7 @@ elf_symbol { name: "_ZN3foo2x2E" is_defined: true symbol_type: OBJECT - type_id: 0xf0341a7a + type_id: 0xf0341a7a # int[5] full_name: "foo::x2" } elf_symbol { @@ -83,7 +83,7 @@ elf_symbol { name: "_ZN3foo2x3E" is_defined: true symbol_type: OBJECT - type_id: 0xc5d9d969 + type_id: 0xc5d9d969 # const int full_name: "foo::x3" } elf_symbol { @@ -91,7 +91,7 @@ elf_symbol { name: "_ZN3foo2x4E" is_defined: true symbol_type: OBJECT - type_id: 0xbc115339 + type_id: 0xbc115339 # foo::type_definition full_name: "foo::x4" } elf_symbol { @@ -99,7 +99,7 @@ elf_symbol { name: "_ZN3foo2x5Ev" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "foo::x5" } elf_symbol { @@ -107,7 +107,7 @@ elf_symbol { name: "_ZN3foo2x6E" is_defined: true symbol_type: OBJECT - type_id: 0x3ba6625d + type_id: 0x3ba6625d # struct foo::S full_name: "foo::x6" } elf_symbol { @@ -115,7 +115,7 @@ elf_symbol { name: "_ZN3foo2x7E" is_defined: true symbol_type: OBJECT - type_id: 0xf05bf1c2 + type_id: 0xf05bf1c2 # union foo::U full_name: "foo::x7" } elf_symbol { @@ -123,17 +123,17 @@ elf_symbol { name: "_ZN3foo2x8E" is_defined: true symbol_type: OBJECT - type_id: 0x249cfa0e + type_id: 0x249cfa0e # enum foo::E full_name: "foo::x8" } interface { id: 0x84ea5130 - symbol_id: 0x582117f7 - symbol_id: 0x717ce2f2 - symbol_id: 0x4a892240 - symbol_id: 0x4ec44cf8 - symbol_id: 0x4d2c388b - symbol_id: 0x4e82b74d - symbol_id: 0x60294099 - symbol_id: 0x59b8d44f + symbol_id: 0x582117f7 # int foo::x1 + symbol_id: 0x717ce2f2 # int foo::x2[5] + symbol_id: 0x4a892240 # const int foo::x3 + symbol_id: 0x4ec44cf8 # foo::type_definition foo::x4 + symbol_id: 0x4d2c388b # int foo::x5() + symbol_id: 0x4e82b74d # struct foo::S foo::x6 + symbol_id: 0x60294099 # union foo::U foo::x7 + symbol_id: 0x59b8d44f # enum foo::E foo::x8 } diff --git a/test_cases/info_tests/namespace/expected/using_namespace_in_function_cc.elf_stg b/test_cases/info_tests/namespace/expected/using_namespace_in_function_cc.elf_stg index a81d3ef..6007bf3 100644 --- a/test_cases/info_tests/namespace/expected/using_namespace_in_function_cc.elf_stg +++ b/test_cases/info_tests/namespace/expected/using_namespace_in_function_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,17 +8,17 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 + symbol_id: 0x92009dc1 # int bar() } diff --git a/test_cases/info_tests/primitive/expected/all_c99_types_c.btf_stg b/test_cases/info_tests/primitive/expected/all_c99_types_c.btf_stg index e5e3225..24bf1e1 100644 --- a/test_cases/info_tests/primitive/expected/all_c99_types_c.btf_stg +++ b/test_cases/info_tests/primitive/expected/all_c99_types_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -97,180 +97,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 { @@ -279,51 +279,51 @@ 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) } interface { id: 0x84ea5130 - symbol_id: 0xc018d523 + symbol_id: 0xc018d523 # void fun(struct Z) } diff --git a/test_cases/info_tests/primitive/expected/all_c99_types_c.elf_stg b/test_cases/info_tests/primitive/expected/all_c99_types_c.elf_stg index d0ad99f..f127936 100644 --- a/test_cases/info_tests/primitive/expected/all_c99_types_c.elf_stg +++ b/test_cases/info_tests/primitive/expected/all_c99_types_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -97,180 +97,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 { @@ -279,49 +279,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 { @@ -329,11 +329,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 } diff --git a/test_cases/info_tests/primitive/expected/long_c.btf_stg b/test_cases/info_tests/primitive/expected/long_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/primitive/expected/long_c.btf_stg +++ b/test_cases/info_tests/primitive/expected/long_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/primitive/expected/long_c.elf_stg b/test_cases/info_tests/primitive/expected/long_c.elf_stg index 6a02bd6..786c370 100644 --- a/test_cases/info_tests/primitive/expected/long_c.elf_stg +++ b/test_cases/info_tests/primitive/expected/long_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xfc0e1dbd name: "long" @@ -9,66 +9,66 @@ primitive { member { id: 0xdad40c3c name: "il" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 128 } member { id: 0x1934e8aa name: "ils" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 512 } member { id: 0x6ab2f0c1 name: "isl" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 320 } member { id: 0xc5e5bb0a name: "l" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } member { id: 0x19f06659 name: "li" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 64 } member { id: 0xc4e47a0b name: "lis" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 576 } member { id: 0xa876c9e9 name: "ls" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 256 } member { id: 0x78182039 name: "lsi" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 640 } member { id: 0x12cd1cc1 name: "sil" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 384 } member { id: 0xc3afc5a8 name: "sl" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 192 } member { id: 0xf959dfd3 name: "sli" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long offset: 448 } struct_union { @@ -77,17 +77,17 @@ struct_union { name: "L" definition { bytesize: 88 - member_id: 0xc5e5bb0a - member_id: 0x19f06659 - member_id: 0xdad40c3c - member_id: 0xc3afc5a8 - member_id: 0xa876c9e9 - member_id: 0x6ab2f0c1 - member_id: 0x12cd1cc1 - member_id: 0xf959dfd3 - member_id: 0x1934e8aa - member_id: 0xc4e47a0b - member_id: 0x78182039 + member_id: 0xc5e5bb0a # long l + member_id: 0x19f06659 # long li + member_id: 0xdad40c3c # long il + member_id: 0xc3afc5a8 # long sl + member_id: 0xa876c9e9 # long ls + member_id: 0x6ab2f0c1 # long isl + member_id: 0x12cd1cc1 # long sil + member_id: 0xf959dfd3 # long sli + member_id: 0x1934e8aa # long ils + member_id: 0xc4e47a0b # long lis + member_id: 0x78182039 # long lsi } } elf_symbol { @@ -95,10 +95,10 @@ elf_symbol { name: "l" is_defined: true symbol_type: OBJECT - type_id: 0x61496952 + type_id: 0x61496952 # struct L full_name: "l" } interface { id: 0x84ea5130 - symbol_id: 0x6df237e3 + symbol_id: 0x6df237e3 # struct L l } diff --git a/test_cases/info_tests/qualified/expected/const_long_c.btf_stg b/test_cases/info_tests/qualified/expected/const_long_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/qualified/expected/const_long_c.btf_stg +++ b/test_cases/info_tests/qualified/expected/const_long_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/qualified/expected/const_long_c.elf_stg b/test_cases/info_tests/qualified/expected/const_long_c.elf_stg index 1135d0b..ef7cb23 100644 --- a/test_cases/info_tests/qualified/expected/const_long_c.elf_stg +++ b/test_cases/info_tests/qualified/expected/const_long_c.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface qualified { id: 0xe3126acd qualifier: CONST - qualified_type_id: 0xfc0e1dbd + qualified_type_id: 0xfc0e1dbd # long } primitive { id: 0xfc0e1dbd @@ -14,228 +14,228 @@ primitive { member { id: 0x0a01f4af name: "cil" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 320 } member { id: 0xedaeeb40 name: "cils" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1664 } member { id: 0x999e7913 name: "cisl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 896 } member { id: 0xc962410a name: "cl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long } member { id: 0x66b6a49d name: "cli" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 128 } member { id: 0x3ec28fbb name: "clis" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1920 } member { id: 0xc5fc75d0 name: "cls" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 704 } member { id: 0x8893f180 name: "clsi" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2176 } member { id: 0xdf7dc4fb name: "csil" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1152 } member { id: 0x35f6068c name: "csl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 512 } member { id: 0x15047367 name: "csli" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1408 } member { id: 0x4b41dd07 name: "icl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 384 } member { id: 0x4a9f67b8 name: "icls" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1728 } member { id: 0xc426445d name: "icsl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 960 } member { id: 0x35215f8e name: "ilc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 448 } member { id: 0x0f947358 name: "ilcs" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1792 } member { id: 0x01907246 name: "ilsc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1856 } member { id: 0x49da99b9 name: "iscl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1024 } member { id: 0x90c3741b name: "islc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1088 } member { id: 0x946ca9b8 name: "lc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 64 } member { id: 0x63bc1552 name: "lci" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 192 } member { id: 0xb4a02dd3 name: "lcis" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1984 } member { id: 0xcb36c2fb name: "lcs" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 768 } member { id: 0xf8f76ae6 name: "lcsi" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2240 } member { id: 0xc8cc0629 name: "lic" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 256 } member { id: 0x53c916c0 name: "lics" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2048 } member { id: 0x798a5330 name: "lisc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2112 } member { id: 0xf0837e5f name: "lsc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 832 } member { id: 0xe637ee4e name: "lsci" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2304 } member { id: 0x67e974e2 name: "lsic" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 2368 } member { id: 0x4da63353 name: "scil" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1216 } member { id: 0x0dafd156 name: "scl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 576 } member { id: 0x938d2db4 name: "scli" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1472 } member { id: 0xa4f141c8 name: "sicl" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1280 } member { id: 0x58e0f4ff name: "silc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1344 } member { id: 0x7dc4253c name: "slc" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 640 } member { id: 0x3d2863c0 name: "slci" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1536 } member { id: 0x3d727335 name: "slic" - type_id: 0xe3126acd + type_id: 0xe3126acd # const long offset: 1600 } struct_union { @@ -244,44 +244,44 @@ struct_union { name: "CL" definition { bytesize: 304 - member_id: 0xc962410a - member_id: 0x946ca9b8 - member_id: 0x66b6a49d - member_id: 0x63bc1552 - member_id: 0xc8cc0629 - member_id: 0x0a01f4af - member_id: 0x4b41dd07 - member_id: 0x35215f8e - member_id: 0x35f6068c - member_id: 0x0dafd156 - member_id: 0x7dc4253c - member_id: 0xc5fc75d0 - member_id: 0xcb36c2fb - member_id: 0xf0837e5f - member_id: 0x999e7913 - member_id: 0xc426445d - member_id: 0x49da99b9 - member_id: 0x90c3741b - member_id: 0xdf7dc4fb - member_id: 0x4da63353 - member_id: 0xa4f141c8 - member_id: 0x58e0f4ff - member_id: 0x15047367 - member_id: 0x938d2db4 - member_id: 0x3d2863c0 - member_id: 0x3d727335 - member_id: 0xedaeeb40 - member_id: 0x4a9f67b8 - member_id: 0x0f947358 - member_id: 0x01907246 - member_id: 0x3ec28fbb - member_id: 0xb4a02dd3 - member_id: 0x53c916c0 - member_id: 0x798a5330 - member_id: 0x8893f180 - member_id: 0xf8f76ae6 - member_id: 0xe637ee4e - member_id: 0x67e974e2 + member_id: 0xc962410a # const long cl + member_id: 0x946ca9b8 # const long lc + member_id: 0x66b6a49d # const long cli + member_id: 0x63bc1552 # const long lci + member_id: 0xc8cc0629 # const long lic + member_id: 0x0a01f4af # const long cil + member_id: 0x4b41dd07 # const long icl + member_id: 0x35215f8e # const long ilc + member_id: 0x35f6068c # const long csl + member_id: 0x0dafd156 # const long scl + member_id: 0x7dc4253c # const long slc + member_id: 0xc5fc75d0 # const long cls + member_id: 0xcb36c2fb # const long lcs + member_id: 0xf0837e5f # const long lsc + member_id: 0x999e7913 # const long cisl + member_id: 0xc426445d # const long icsl + member_id: 0x49da99b9 # const long iscl + member_id: 0x90c3741b # const long islc + member_id: 0xdf7dc4fb # const long csil + member_id: 0x4da63353 # const long scil + member_id: 0xa4f141c8 # const long sicl + member_id: 0x58e0f4ff # const long silc + member_id: 0x15047367 # const long csli + member_id: 0x938d2db4 # const long scli + member_id: 0x3d2863c0 # const long slci + member_id: 0x3d727335 # const long slic + member_id: 0xedaeeb40 # const long cils + member_id: 0x4a9f67b8 # const long icls + member_id: 0x0f947358 # const long ilcs + member_id: 0x01907246 # const long ilsc + member_id: 0x3ec28fbb # const long clis + member_id: 0xb4a02dd3 # const long lcis + member_id: 0x53c916c0 # const long lics + member_id: 0x798a5330 # const long lisc + member_id: 0x8893f180 # const long clsi + member_id: 0xf8f76ae6 # const long lcsi + member_id: 0xe637ee4e # const long lsci + member_id: 0x67e974e2 # const long lsic } } elf_symbol { @@ -289,10 +289,10 @@ elf_symbol { name: "cl" is_defined: true symbol_type: OBJECT - type_id: 0xf9007b0e + type_id: 0xf9007b0e # struct CL full_name: "cl" } interface { id: 0x84ea5130 - symbol_id: 0x89cb2256 + symbol_id: 0x89cb2256 # struct CL cl } diff --git a/test_cases/info_tests/qualified/expected/int_c.btf_stg b/test_cases/info_tests/qualified/expected/int_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/qualified/expected/int_c.btf_stg +++ b/test_cases/info_tests/qualified/expected/int_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/qualified/expected/int_c.elf_stg b/test_cases/info_tests/qualified/expected/int_c.elf_stg index e3a9124..e753873 100644 --- a/test_cases/info_tests/qualified/expected/int_c.elf_stg +++ b/test_cases/info_tests/qualified/expected/int_c.elf_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface qualified { id: 0x8dde4646 qualifier: VOLATILE - qualified_type_id: 0x6720d32f + qualified_type_id: 0x6720d32f # int } qualified { id: 0xc5d9d969 qualifier: CONST - qualified_type_id: 0x6720d32f + qualified_type_id: 0x6720d32f # int } qualified { id: 0xff667c33 qualifier: CONST - qualified_type_id: 0x8dde4646 + qualified_type_id: 0x8dde4646 # volatile int } primitive { id: 0x6720d32f @@ -26,7 +26,7 @@ elf_symbol { name: "a" is_defined: true symbol_type: OBJECT - type_id: 0xc5d9d969 + type_id: 0xc5d9d969 # const int full_name: "a" } elf_symbol { @@ -34,7 +34,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: OBJECT - type_id: 0x8dde4646 + type_id: 0x8dde4646 # volatile int full_name: "b" } elf_symbol { @@ -42,7 +42,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0xff667c33 + type_id: 0xff667c33 # const volatile int full_name: "c" } elf_symbol { @@ -50,13 +50,13 @@ elf_symbol { name: "d" is_defined: true symbol_type: OBJECT - type_id: 0xff667c33 + type_id: 0xff667c33 # const volatile int full_name: "d" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x63f6f9b1 + symbol_id: 0xa7b0241d # const int a + symbol_id: 0xe371117a # volatile int b + symbol_id: 0x2230fb28 # const volatile int c + symbol_id: 0x63f6f9b1 # const volatile int d } diff --git a/test_cases/info_tests/qualified/expected/mutant_qualifier_typedef_array_c.btf_stg b/test_cases/info_tests/qualified/expected/mutant_qualifier_typedef_array_c.btf_stg index ab05688..e11a9ca 100644 --- a/test_cases/info_tests/qualified/expected/mutant_qualifier_typedef_array_c.btf_stg +++ b/test_cases/info_tests/qualified/expected/mutant_qualifier_typedef_array_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,97 +7,97 @@ special { pointer_reference { id: 0x37cf4758 kind: POINTER - pointee_type_id: 0xf57dfbfc + pointee_type_id: 0xf57dfbfc # struct S } typedef { id: 0x46a9f023 name: "A" - referred_type_id: 0x7106acfa + referred_type_id: 0x7106acfa # int[7] } typedef { id: 0x8468cdd8 name: "B" - referred_type_id: 0x46a9f023 + referred_type_id: 0x46a9f023 # A } typedef { id: 0xc52928ca name: "C" - referred_type_id: 0xfd0bded4 + referred_type_id: 0xfd0bded4 # const B } typedef { id: 0x00eb2593 name: "D" - referred_type_id: 0xc52928ca + referred_type_id: 0xc52928ca # C } typedef { id: 0x41ab82dc name: "E" - referred_type_id: 0x942cbbe9 + referred_type_id: 0x942cbbe9 # volatile D } typedef { id: 0x816a54f3 name: "F" - referred_type_id: 0x41ab82dc + referred_type_id: 0x41ab82dc # E } qualified { id: 0x847c923a qualifier: VOLATILE - qualified_type_id: 0x41ab82dc + qualified_type_id: 0x41ab82dc # E } qualified { id: 0x85bc0e85 qualifier: VOLATILE - qualified_type_id: 0x46a9f023 + qualified_type_id: 0x46a9f023 # A } qualified { id: 0x942cbbe9 qualifier: VOLATILE - qualified_type_id: 0x00eb2593 + qualified_type_id: 0x00eb2593 # D } qualified { id: 0xa55c38bf qualifier: VOLATILE - qualified_type_id: 0xc52928ca + qualified_type_id: 0xc52928ca # C } qualified { id: 0xb44ce7b1 qualifier: VOLATILE - qualified_type_id: 0x816a54f3 + qualified_type_id: 0x816a54f3 # F } qualified { id: 0xb50c41fb qualifier: VOLATILE - qualified_type_id: 0x8468cdd8 + qualified_type_id: 0x8468cdd8 # B } qualified { id: 0xcc7b0d15 qualifier: CONST - qualified_type_id: 0x41ab82dc + qualified_type_id: 0x41ab82dc # E } qualified { id: 0xcdbb91aa qualifier: CONST - qualified_type_id: 0x46a9f023 + qualified_type_id: 0x46a9f023 # A } qualified { id: 0xdc2b24c6 qualifier: CONST - qualified_type_id: 0x00eb2593 + qualified_type_id: 0x00eb2593 # D } qualified { id: 0xed5ba790 qualifier: CONST - qualified_type_id: 0xc52928ca + qualified_type_id: 0xc52928ca # C } qualified { id: 0xfc4b789e qualifier: CONST - qualified_type_id: 0x816a54f3 + qualified_type_id: 0x816a54f3 # F } qualified { id: 0xfd0bded4 qualifier: CONST - qualified_type_id: 0x8468cdd8 + qualified_type_id: 0x8468cdd8 # B } primitive { id: 0x6720d32f @@ -108,77 +108,77 @@ primitive { array { id: 0x7106acfa number_of_elements: 7 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } member { id: 0x859eb33b name: "c_a" - type_id: 0xcdbb91aa + type_id: 0xcdbb91aa # const A } member { id: 0xedd386c5 name: "c_b" - type_id: 0xfd0bded4 + type_id: 0xfd0bded4 # const B offset: 448 } member { id: 0x2c3cbbdb name: "c_c" - type_id: 0xed5ba790 + type_id: 0xed5ba790 # const C offset: 896 } member { id: 0x6e72662a name: "c_d" - type_id: 0xdc2b24c6 + type_id: 0xdc2b24c6 # const D offset: 1344 } member { id: 0xae9dc617 name: "c_e" - type_id: 0xcc7b0d15 + type_id: 0xcc7b0d15 # const E offset: 1792 } member { id: 0xe8ed5f4a name: "c_f" - type_id: 0xfc4b789e + type_id: 0xfc4b789e # const F offset: 2240 } member { id: 0x052ba833 name: "v_a" - type_id: 0x85bc0e85 + type_id: 0x85bc0e85 # volatile A offset: 224 } member { id: 0xaf583c89 name: "v_b" - type_id: 0xb50c41fb + type_id: 0xb50c41fb # volatile B offset: 672 } member { id: 0xeb8bef0f name: "v_c" - type_id: 0xa55c38bf + type_id: 0xa55c38bf # volatile C offset: 1120 } member { id: 0x47fcea6b name: "v_d" - type_id: 0x942cbbe9 + type_id: 0x942cbbe9 # volatile D offset: 1568 } member { id: 0x002c128f name: "v_e" - type_id: 0x847c923a + type_id: 0x847c923a # volatile E offset: 2016 } member { id: 0xc45bf5fc name: "v_f" - type_id: 0xb44ce7b1 + type_id: 0xb44ce7b1 # volatile F offset: 2464 } struct_union { @@ -187,33 +187,33 @@ struct_union { name: "S" definition { bytesize: 336 - member_id: 0x859eb33b - member_id: 0x052ba833 - member_id: 0xedd386c5 - member_id: 0xaf583c89 - member_id: 0x2c3cbbdb - member_id: 0xeb8bef0f - member_id: 0x6e72662a - member_id: 0x47fcea6b - member_id: 0xae9dc617 - member_id: 0x002c128f - member_id: 0xe8ed5f4a - member_id: 0xc45bf5fc + member_id: 0x859eb33b # const A c_a + member_id: 0x052ba833 # volatile A v_a + member_id: 0xedd386c5 # const B c_b + member_id: 0xaf583c89 # volatile B v_b + member_id: 0x2c3cbbdb # const C c_c + member_id: 0xeb8bef0f # volatile C v_c + member_id: 0x6e72662a # const D c_d + member_id: 0x47fcea6b # volatile D v_d + member_id: 0xae9dc617 # const E c_e + member_id: 0x002c128f # volatile E v_e + member_id: 0xe8ed5f4a # const F c_f + member_id: 0xc45bf5fc # volatile F v_f } } function { id: 0x1d6b8045 - return_type_id: 0x48b5725f - parameter_id: 0x37cf4758 + return_type_id: 0x48b5725f # void + parameter_id: 0x37cf4758 # struct S* } elf_symbol { id: 0xc018d523 name: "fun" is_defined: true symbol_type: FUNCTION - type_id: 0x1d6b8045 + type_id: 0x1d6b8045 # void(struct S*) } interface { id: 0x84ea5130 - symbol_id: 0xc018d523 + symbol_id: 0xc018d523 # void fun(struct S*) } diff --git a/test_cases/info_tests/qualified/expected/mutant_qualifier_typedef_array_c.elf_stg b/test_cases/info_tests/qualified/expected/mutant_qualifier_typedef_array_c.elf_stg index fc5ba20..c9cf745 100644 --- a/test_cases/info_tests/qualified/expected/mutant_qualifier_typedef_array_c.elf_stg +++ b/test_cases/info_tests/qualified/expected/mutant_qualifier_typedef_array_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,97 +7,97 @@ special { pointer_reference { id: 0x37cf4758 kind: POINTER - pointee_type_id: 0xf57dfbfc + pointee_type_id: 0xf57dfbfc # struct S } typedef { id: 0x46a9f023 name: "A" - referred_type_id: 0x7106acfa + referred_type_id: 0x7106acfa # int[7] } typedef { id: 0x8468cdd8 name: "B" - referred_type_id: 0x46a9f023 + referred_type_id: 0x46a9f023 # A } typedef { id: 0xc52928ca name: "C" - referred_type_id: 0xfd0bded4 + referred_type_id: 0xfd0bded4 # const B } typedef { id: 0x00eb2593 name: "D" - referred_type_id: 0xc52928ca + referred_type_id: 0xc52928ca # C } typedef { id: 0x41ab82dc name: "E" - referred_type_id: 0x942cbbe9 + referred_type_id: 0x942cbbe9 # volatile D } typedef { id: 0x816a54f3 name: "F" - referred_type_id: 0x41ab82dc + referred_type_id: 0x41ab82dc # E } qualified { id: 0x847c923a qualifier: VOLATILE - qualified_type_id: 0x41ab82dc + qualified_type_id: 0x41ab82dc # E } qualified { id: 0x85bc0e85 qualifier: VOLATILE - qualified_type_id: 0x46a9f023 + qualified_type_id: 0x46a9f023 # A } qualified { id: 0x942cbbe9 qualifier: VOLATILE - qualified_type_id: 0x00eb2593 + qualified_type_id: 0x00eb2593 # D } qualified { id: 0xa55c38bf qualifier: VOLATILE - qualified_type_id: 0xc52928ca + qualified_type_id: 0xc52928ca # C } qualified { id: 0xb44ce7b1 qualifier: VOLATILE - qualified_type_id: 0x816a54f3 + qualified_type_id: 0x816a54f3 # F } qualified { id: 0xb50c41fb qualifier: VOLATILE - qualified_type_id: 0x8468cdd8 + qualified_type_id: 0x8468cdd8 # B } qualified { id: 0xcc7b0d15 qualifier: CONST - qualified_type_id: 0x41ab82dc + qualified_type_id: 0x41ab82dc # E } qualified { id: 0xcdbb91aa qualifier: CONST - qualified_type_id: 0x46a9f023 + qualified_type_id: 0x46a9f023 # A } qualified { id: 0xdc2b24c6 qualifier: CONST - qualified_type_id: 0x00eb2593 + qualified_type_id: 0x00eb2593 # D } qualified { id: 0xed5ba790 qualifier: CONST - qualified_type_id: 0xc52928ca + qualified_type_id: 0xc52928ca # C } qualified { id: 0xfc4b789e qualifier: CONST - qualified_type_id: 0x816a54f3 + qualified_type_id: 0x816a54f3 # F } qualified { id: 0xfd0bded4 qualifier: CONST - qualified_type_id: 0x8468cdd8 + qualified_type_id: 0x8468cdd8 # B } primitive { id: 0x6720d32f @@ -108,77 +108,77 @@ primitive { array { id: 0x7106acfa number_of_elements: 7 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } member { id: 0x859eb33b name: "c_a" - type_id: 0xcdbb91aa + type_id: 0xcdbb91aa # const A } member { id: 0xedd386c5 name: "c_b" - type_id: 0xfd0bded4 + type_id: 0xfd0bded4 # const B offset: 448 } member { id: 0x2c3cbbdb name: "c_c" - type_id: 0xed5ba790 + type_id: 0xed5ba790 # const C offset: 896 } member { id: 0x6e72662a name: "c_d" - type_id: 0xdc2b24c6 + type_id: 0xdc2b24c6 # const D offset: 1344 } member { id: 0xae9dc617 name: "c_e" - type_id: 0xcc7b0d15 + type_id: 0xcc7b0d15 # const E offset: 1792 } member { id: 0xe8ed5f4a name: "c_f" - type_id: 0xfc4b789e + type_id: 0xfc4b789e # const F offset: 2240 } member { id: 0x052ba833 name: "v_a" - type_id: 0x85bc0e85 + type_id: 0x85bc0e85 # volatile A offset: 224 } member { id: 0xaf583c89 name: "v_b" - type_id: 0xb50c41fb + type_id: 0xb50c41fb # volatile B offset: 672 } member { id: 0xeb8bef0f name: "v_c" - type_id: 0xa55c38bf + type_id: 0xa55c38bf # volatile C offset: 1120 } member { id: 0x47fcea6b name: "v_d" - type_id: 0x942cbbe9 + type_id: 0x942cbbe9 # volatile D offset: 1568 } member { id: 0x002c128f name: "v_e" - type_id: 0x847c923a + type_id: 0x847c923a # volatile E offset: 2016 } member { id: 0xc45bf5fc name: "v_f" - type_id: 0xb44ce7b1 + type_id: 0xb44ce7b1 # volatile F offset: 2464 } struct_union { @@ -187,34 +187,34 @@ struct_union { name: "S" definition { bytesize: 336 - member_id: 0x859eb33b - member_id: 0x052ba833 - member_id: 0xedd386c5 - member_id: 0xaf583c89 - member_id: 0x2c3cbbdb - member_id: 0xeb8bef0f - member_id: 0x6e72662a - member_id: 0x47fcea6b - member_id: 0xae9dc617 - member_id: 0x002c128f - member_id: 0xe8ed5f4a - member_id: 0xc45bf5fc + member_id: 0x859eb33b # const A c_a + member_id: 0x052ba833 # volatile A v_a + member_id: 0xedd386c5 # const B c_b + member_id: 0xaf583c89 # volatile B v_b + member_id: 0x2c3cbbdb # const C c_c + member_id: 0xeb8bef0f # volatile C v_c + member_id: 0x6e72662a # const D c_d + member_id: 0x47fcea6b # volatile D v_d + member_id: 0xae9dc617 # const E c_e + member_id: 0x002c128f # volatile E v_e + member_id: 0xe8ed5f4a # const F c_f + member_id: 0xc45bf5fc # volatile F v_f } } function { id: 0x1d6b8045 - return_type_id: 0x48b5725f - parameter_id: 0x37cf4758 + return_type_id: 0x48b5725f # void + parameter_id: 0x37cf4758 # struct S* } elf_symbol { id: 0xc018d523 name: "fun" is_defined: true symbol_type: FUNCTION - type_id: 0x1d6b8045 + type_id: 0x1d6b8045 # void(struct S*) full_name: "fun" } interface { id: 0x84ea5130 - symbol_id: 0xc018d523 + symbol_id: 0xc018d523 # void fun(struct S*) } diff --git a/test_cases/info_tests/qualified/expected/pointers_c.btf_stg b/test_cases/info_tests/qualified/expected/pointers_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/qualified/expected/pointers_c.btf_stg +++ b/test_cases/info_tests/qualified/expected/pointers_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/qualified/expected/pointers_c.elf_stg b/test_cases/info_tests/qualified/expected/pointers_c.elf_stg index 2162bb5..160ef62 100644 --- a/test_cases/info_tests/qualified/expected/pointers_c.elf_stg +++ b/test_cases/info_tests/qualified/expected/pointers_c.elf_stg @@ -1,39 +1,39 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x13580d6c kind: POINTER - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0x3be64ffd kind: POINTER - pointee_type_id: 0xc5d9d969 + pointee_type_id: 0xc5d9d969 # const int } qualified { id: 0x4008d327 qualifier: RESTRICT - qualified_type_id: 0x13580d6c + qualified_type_id: 0x13580d6c # int* } qualified { id: 0x4a274383 qualifier: RESTRICT - qualified_type_id: 0x3be64ffd + qualified_type_id: 0x3be64ffd # const int* } qualified { id: 0xc5d9d969 qualifier: CONST - qualified_type_id: 0x6720d32f + qualified_type_id: 0x6720d32f # int } qualified { id: 0xcc13d96b qualifier: CONST - qualified_type_id: 0x4008d327 + qualified_type_id: 0x4008d327 # int* restrict } qualified { id: 0xd8c7eef9 qualifier: CONST - qualified_type_id: 0x13580d6c + qualified_type_id: 0x13580d6c # int* } primitive { id: 0x6720d32f @@ -46,7 +46,7 @@ elf_symbol { name: "a" is_defined: true symbol_type: OBJECT - type_id: 0x3be64ffd + type_id: 0x3be64ffd # const int* full_name: "a" } elf_symbol { @@ -54,7 +54,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: OBJECT - type_id: 0xd8c7eef9 + type_id: 0xd8c7eef9 # int* const full_name: "b" } elf_symbol { @@ -62,7 +62,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0x4008d327 + type_id: 0x4008d327 # int* restrict full_name: "c" } elf_symbol { @@ -70,7 +70,7 @@ elf_symbol { name: "d" is_defined: true symbol_type: OBJECT - type_id: 0x4a274383 + type_id: 0x4a274383 # const int* restrict full_name: "d" } elf_symbol { @@ -78,7 +78,7 @@ elf_symbol { name: "e" is_defined: true symbol_type: OBJECT - type_id: 0xcc13d96b + type_id: 0xcc13d96b # int* restrict const full_name: "e" } elf_symbol { @@ -86,15 +86,15 @@ elf_symbol { name: "f" is_defined: true symbol_type: OBJECT - type_id: 0xcc13d96b + type_id: 0xcc13d96b # int* restrict const full_name: "f" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x63f6f9b1 - symbol_id: 0xa2b65a7e - symbol_id: 0xe0778f95 + symbol_id: 0xa7b0241d # const int* a + symbol_id: 0xe371117a # int* const b + symbol_id: 0x2230fb28 # int* restrict c + symbol_id: 0x63f6f9b1 # const int* restrict d + symbol_id: 0xa2b65a7e # int* restrict const e + symbol_id: 0xe0778f95 # int* restrict const f } diff --git a/test_cases/info_tests/qualified/expected/useless_c.btf_stg b/test_cases/info_tests/qualified/expected/useless_c.btf_stg index 373258d..d42abf1 100644 --- a/test_cases/info_tests/qualified/expected/useless_c.btf_stg +++ b/test_cases/info_tests/qualified/expected/useless_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,37 +7,37 @@ special { pointer_reference { id: 0x0dd55c4a kind: POINTER - pointee_type_id: 0x1d1597b4 + pointee_type_id: 0x1d1597b4 # void(const volatile struct foo*) } pointer_reference { id: 0x24b3ee1b kind: POINTER - pointee_type_id: 0xb88f5ef1 + pointee_type_id: 0xb88f5ef1 # struct foo } pointer_reference { id: 0x3637189c kind: POINTER - pointee_type_id: 0xf29c84ee + pointee_type_id: 0xf29c84ee # const volatile struct foo } qualified { id: 0x9763259f qualifier: VOLATILE - qualified_type_id: 0x0dd55c4a + qualified_type_id: 0x0dd55c4a # void(*)(const volatile struct foo*) } qualified { id: 0xba35a531 qualifier: VOLATILE - qualified_type_id: 0xb88f5ef1 + qualified_type_id: 0xb88f5ef1 # struct foo } qualified { id: 0xf29c84ee qualifier: CONST - qualified_type_id: 0xba35a531 + qualified_type_id: 0xba35a531 # volatile struct foo } qualified { id: 0xf9c924c5 qualifier: CONST - qualified_type_id: 0x9763259f + qualified_type_id: 0x9763259f # void(* volatile)(const volatile struct foo*) } struct_union { id: 0xb88f5ef1 @@ -48,43 +48,43 @@ struct_union { } function { id: 0x19b4aa15 - return_type_id: 0x48b5725f - parameter_id: 0x24b3ee1b + return_type_id: 0x48b5725f # void + parameter_id: 0x24b3ee1b # struct foo* } function { id: 0x1d1597b4 - return_type_id: 0x48b5725f - parameter_id: 0x3637189c + return_type_id: 0x48b5725f # void + parameter_id: 0x3637189c # const volatile struct foo* } function { id: 0x2eea18a2 - return_type_id: 0x48b5725f - parameter_id: 0xf9c924c5 + return_type_id: 0x48b5725f # void + parameter_id: 0xf9c924c5 # void(* volatile const)(const volatile struct foo*) } elf_symbol { id: 0xa58ca0b6 name: "bar" is_defined: true symbol_type: FUNCTION - type_id: 0x1d1597b4 + type_id: 0x1d1597b4 # void(const volatile struct foo*) } elf_symbol { id: 0xe89bbaac name: "bar_2" is_defined: true symbol_type: FUNCTION - type_id: 0x19b4aa15 + type_id: 0x19b4aa15 # void(struct foo*) } elf_symbol { id: 0xbf8fc404 name: "baz" is_defined: true symbol_type: FUNCTION - type_id: 0x2eea18a2 + type_id: 0x2eea18a2 # void(void(* volatile const)(const volatile struct foo*)) } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 - symbol_id: 0xe89bbaac - symbol_id: 0xbf8fc404 + symbol_id: 0xa58ca0b6 # void bar(const volatile struct foo*) + symbol_id: 0xe89bbaac # void bar_2(struct foo*) + symbol_id: 0xbf8fc404 # void baz(void(* volatile const)(const volatile struct foo*)) } diff --git a/test_cases/info_tests/qualified/expected/useless_c.elf_stg b/test_cases/info_tests/qualified/expected/useless_c.elf_stg index 19b006e..2449a6c 100644 --- a/test_cases/info_tests/qualified/expected/useless_c.elf_stg +++ b/test_cases/info_tests/qualified/expected/useless_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,37 +7,37 @@ special { pointer_reference { id: 0x0dd55c4a kind: POINTER - pointee_type_id: 0x1d1597b4 + pointee_type_id: 0x1d1597b4 # void(const volatile struct foo*) } pointer_reference { id: 0x24b3ee1b kind: POINTER - pointee_type_id: 0xb88f5ef1 + pointee_type_id: 0xb88f5ef1 # struct foo } pointer_reference { id: 0x3637189c kind: POINTER - pointee_type_id: 0xf29c84ee + pointee_type_id: 0xf29c84ee # const volatile struct foo } qualified { id: 0x9763259f qualifier: VOLATILE - qualified_type_id: 0x0dd55c4a + qualified_type_id: 0x0dd55c4a # void(*)(const volatile struct foo*) } qualified { id: 0xba35a531 qualifier: VOLATILE - qualified_type_id: 0xb88f5ef1 + qualified_type_id: 0xb88f5ef1 # struct foo } qualified { id: 0xf29c84ee qualifier: CONST - qualified_type_id: 0xba35a531 + qualified_type_id: 0xba35a531 # volatile struct foo } qualified { id: 0xf9c924c5 qualifier: CONST - qualified_type_id: 0x9763259f + qualified_type_id: 0x9763259f # void(* volatile)(const volatile struct foo*) } struct_union { id: 0xb88f5ef1 @@ -48,25 +48,25 @@ struct_union { } function { id: 0x13ed0681 - return_type_id: 0x48b5725f - parameter_id: 0x0dd55c4a + return_type_id: 0x48b5725f # void + parameter_id: 0x0dd55c4a # void(*)(const volatile struct foo*) } function { id: 0x19b4aa15 - return_type_id: 0x48b5725f - parameter_id: 0x24b3ee1b + return_type_id: 0x48b5725f # void + parameter_id: 0x24b3ee1b # struct foo* } function { id: 0x1d1597b4 - return_type_id: 0x48b5725f - parameter_id: 0x3637189c + return_type_id: 0x48b5725f # void + parameter_id: 0x3637189c # const volatile struct foo* } elf_symbol { id: 0xa58ca0b6 name: "bar" is_defined: true symbol_type: FUNCTION - type_id: 0x1d1597b4 + type_id: 0x1d1597b4 # void(const volatile struct foo*) full_name: "bar" } elf_symbol { @@ -74,7 +74,7 @@ elf_symbol { name: "bar_2" is_defined: true symbol_type: FUNCTION - type_id: 0x19b4aa15 + type_id: 0x19b4aa15 # void(struct foo*) full_name: "bar_2" } elf_symbol { @@ -82,7 +82,7 @@ elf_symbol { name: "baz" is_defined: true symbol_type: FUNCTION - type_id: 0x13ed0681 + type_id: 0x13ed0681 # void(void(*)(const volatile struct foo*)) full_name: "baz" } elf_symbol { @@ -90,13 +90,13 @@ elf_symbol { name: "quux" is_defined: true symbol_type: OBJECT - type_id: 0xf9c924c5 + type_id: 0xf9c924c5 # void(* volatile const)(const volatile struct foo*) full_name: "quux" } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 - symbol_id: 0xe89bbaac - symbol_id: 0xbf8fc404 - symbol_id: 0x4602d7e1 + symbol_id: 0xa58ca0b6 # void bar(const volatile struct foo*) + symbol_id: 0xe89bbaac # void bar_2(struct foo*) + symbol_id: 0xbf8fc404 # void baz(void(*)(const volatile struct foo*)) + symbol_id: 0x4602d7e1 # void(* volatile const quux)(const volatile struct foo*) } diff --git a/test_cases/info_tests/reference/expected/type_cc.elf_stg b/test_cases/info_tests/reference/expected/type_cc.elf_stg index 58bb765..1971203 100644 --- a/test_cases/info_tests/reference/expected/type_cc.elf_stg +++ b/test_cases/info_tests/reference/expected/type_cc.elf_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x13580d6c kind: POINTER - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0x6398b08c kind: RVALUE_REFERENCE - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0xde581bbb kind: LVALUE_REFERENCE - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -24,18 +24,18 @@ primitive { member { id: 0xc46f84f6 name: "lref" - type_id: 0xde581bbb + type_id: 0xde581bbb # int& offset: 64 } member { id: 0x46e392d8 name: "ptr" - type_id: 0x13580d6c + type_id: 0x13580d6c # int* } member { id: 0x2a89c81c name: "rref" - type_id: 0x6398b08c + type_id: 0x6398b08c # int&& offset: 128 } struct_union { @@ -44,25 +44,25 @@ struct_union { name: "foo" definition { bytesize: 24 - member_id: 0x46e392d8 - member_id: 0xc46f84f6 - member_id: 0x2a89c81c + member_id: 0x46e392d8 # int* ptr + member_id: 0xc46f84f6 # int& lref + member_id: 0x2a89c81c # int&& rref } } function { id: 0xb3a33493 - return_type_id: 0x6720d32f - parameter_id: 0xb88f5ef1 + return_type_id: 0x6720d32f # int + parameter_id: 0xb88f5ef1 # struct foo } elf_symbol { id: 0x68629c2b name: "_Z4func3foo" is_defined: true symbol_type: FUNCTION - type_id: 0xb3a33493 + type_id: 0xb3a33493 # int(struct foo) full_name: "func" } interface { id: 0x84ea5130 - symbol_id: 0x68629c2b + symbol_id: 0x68629c2b # int func(struct foo) } diff --git a/test_cases/info_tests/scc/expected/same_c.btf_stg b/test_cases/info_tests/scc/expected/same_c.btf_stg index a3c3be1..3c8506e 100644 --- a/test_cases/info_tests/scc/expected/same_c.btf_stg +++ b/test_cases/info_tests/scc/expected/same_c.btf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x2a409878 kind: POINTER - pointee_type_id: 0x8342877c + pointee_type_id: 0x8342877c # struct M } primitive { id: 0x6720d32f @@ -14,12 +14,12 @@ primitive { member { id: 0xb53d99d2 name: "head" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xeeb7e480 name: "tail" - type_id: 0x2a409878 + type_id: 0x2a409878 # struct M* offset: 64 } struct_union { @@ -28,23 +28,23 @@ struct_union { name: "M" definition { bytesize: 16 - member_id: 0xb53d99d2 - member_id: 0xeeb7e480 + member_id: 0xb53d99d2 # int head + member_id: 0xeeb7e480 # struct M* tail } } function { id: 0x9710c531 - return_type_id: 0x6720d32f - parameter_id: 0x2a409878 + return_type_id: 0x6720d32f # int + parameter_id: 0x2a409878 # struct M* } elf_symbol { id: 0x6713ecab name: "loop" is_defined: true symbol_type: FUNCTION - type_id: 0x9710c531 + type_id: 0x9710c531 # int(struct M*) } interface { id: 0x84ea5130 - symbol_id: 0x6713ecab + symbol_id: 0x6713ecab # int loop(struct M*) } diff --git a/test_cases/info_tests/scc/expected/same_c.elf_stg b/test_cases/info_tests/scc/expected/same_c.elf_stg index 27f1dd9..d27acca 100644 --- a/test_cases/info_tests/scc/expected/same_c.elf_stg +++ b/test_cases/info_tests/scc/expected/same_c.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x2a409878 kind: POINTER - pointee_type_id: 0x8342877c + pointee_type_id: 0x8342877c # struct M } primitive { id: 0x6720d32f @@ -14,12 +14,12 @@ primitive { member { id: 0xb53d99d2 name: "head" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xeeb7e480 name: "tail" - type_id: 0x2a409878 + type_id: 0x2a409878 # struct M* offset: 64 } struct_union { @@ -28,24 +28,24 @@ struct_union { name: "M" definition { bytesize: 16 - member_id: 0xb53d99d2 - member_id: 0xeeb7e480 + member_id: 0xb53d99d2 # int head + member_id: 0xeeb7e480 # struct M* tail } } function { id: 0x9710c531 - return_type_id: 0x6720d32f - parameter_id: 0x2a409878 + return_type_id: 0x6720d32f # int + parameter_id: 0x2a409878 # struct M* } elf_symbol { id: 0x6713ecab name: "loop" is_defined: true symbol_type: FUNCTION - type_id: 0x9710c531 + type_id: 0x9710c531 # int(struct M*) full_name: "loop" } interface { id: 0x84ea5130 - symbol_id: 0x6713ecab + symbol_id: 0x6713ecab # int loop(struct M*) } diff --git a/test_cases/info_tests/scc/expected/simple_c.btf_stg b/test_cases/info_tests/scc/expected/simple_c.btf_stg index ce62dd8..6a94047 100644 --- a/test_cases/info_tests/scc/expected/simple_c.btf_stg +++ b/test_cases/info_tests/scc/expected/simple_c.btf_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x32b38621 kind: POINTER - pointee_type_id: 0xe08efe1a + pointee_type_id: 0xe08efe1a # struct N } typedef { id: 0x5c0e9566 name: "foo" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -25,24 +25,24 @@ primitive { member { id: 0x50eb5162 name: "extra" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 128 } member { id: 0x35a562d1 name: "left" - type_id: 0x5c0e9566 + type_id: 0x5c0e9566 # foo offset: 64 } member { id: 0x11c1b359 name: "next" - type_id: 0x32b38621 + type_id: 0x32b38621 # struct N* } member { id: 0x0b2abf8a name: "right" - type_id: 0x5c0e9566 + type_id: 0x5c0e9566 # foo offset: 96 } struct_union { @@ -51,26 +51,26 @@ struct_union { name: "N" definition { bytesize: 24 - member_id: 0x11c1b359 - member_id: 0x35a562d1 - member_id: 0x0b2abf8a - member_id: 0x50eb5162 + member_id: 0x11c1b359 # struct N* next + member_id: 0x35a562d1 # foo left + member_id: 0x0b2abf8a # foo right + member_id: 0x50eb5162 # short extra } } function { id: 0xa56992b1 - return_type_id: 0x6720d32f - parameter_id: 0xe08efe1a - parameter_id: 0x32b38621 + return_type_id: 0x6720d32f # int + parameter_id: 0xe08efe1a # struct N + parameter_id: 0x32b38621 # struct N* } elf_symbol { id: 0xc018d523 name: "fun" is_defined: true symbol_type: FUNCTION - type_id: 0xa56992b1 + type_id: 0xa56992b1 # int(struct N, struct N*) } interface { id: 0x84ea5130 - symbol_id: 0xc018d523 + symbol_id: 0xc018d523 # int fun(struct N, struct N*) } diff --git a/test_cases/info_tests/scc/expected/simple_c.elf_stg b/test_cases/info_tests/scc/expected/simple_c.elf_stg index ea582e3..ddacdb9 100644 --- a/test_cases/info_tests/scc/expected/simple_c.elf_stg +++ b/test_cases/info_tests/scc/expected/simple_c.elf_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x32b38621 kind: POINTER - pointee_type_id: 0xe08efe1a + pointee_type_id: 0xe08efe1a # struct N } typedef { id: 0x5c0e9566 name: "foo" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -25,24 +25,24 @@ primitive { member { id: 0x50eb5162 name: "extra" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 128 } member { id: 0x35a562d1 name: "left" - type_id: 0x5c0e9566 + type_id: 0x5c0e9566 # foo offset: 64 } member { id: 0x11c1b359 name: "next" - type_id: 0x32b38621 + type_id: 0x32b38621 # struct N* } member { id: 0x0b2abf8a name: "right" - type_id: 0x5c0e9566 + type_id: 0x5c0e9566 # foo offset: 96 } struct_union { @@ -51,27 +51,27 @@ struct_union { name: "N" definition { bytesize: 24 - member_id: 0x11c1b359 - member_id: 0x35a562d1 - member_id: 0x0b2abf8a - member_id: 0x50eb5162 + member_id: 0x11c1b359 # struct N* next + member_id: 0x35a562d1 # foo left + member_id: 0x0b2abf8a # foo right + member_id: 0x50eb5162 # short extra } } function { id: 0xa56992b1 - return_type_id: 0x6720d32f - parameter_id: 0xe08efe1a - parameter_id: 0x32b38621 + return_type_id: 0x6720d32f # int + parameter_id: 0xe08efe1a # struct N + parameter_id: 0x32b38621 # struct N* } elf_symbol { id: 0xc018d523 name: "fun" is_defined: true symbol_type: FUNCTION - type_id: 0xa56992b1 + type_id: 0xa56992b1 # int(struct N, struct N*) full_name: "fun" } interface { id: 0x84ea5130 - symbol_id: 0xc018d523 + symbol_id: 0xc018d523 # int fun(struct N, struct N*) } diff --git a/test_cases/info_tests/scc/expected/simple_hwasan_c.elf_stg b/test_cases/info_tests/scc/expected/simple_hwasan_c.elf_stg index ea582e3..ddacdb9 100644 --- a/test_cases/info_tests/scc/expected/simple_hwasan_c.elf_stg +++ b/test_cases/info_tests/scc/expected/simple_hwasan_c.elf_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x32b38621 kind: POINTER - pointee_type_id: 0xe08efe1a + pointee_type_id: 0xe08efe1a # struct N } typedef { id: 0x5c0e9566 name: "foo" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -25,24 +25,24 @@ primitive { member { id: 0x50eb5162 name: "extra" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 128 } member { id: 0x35a562d1 name: "left" - type_id: 0x5c0e9566 + type_id: 0x5c0e9566 # foo offset: 64 } member { id: 0x11c1b359 name: "next" - type_id: 0x32b38621 + type_id: 0x32b38621 # struct N* } member { id: 0x0b2abf8a name: "right" - type_id: 0x5c0e9566 + type_id: 0x5c0e9566 # foo offset: 96 } struct_union { @@ -51,27 +51,27 @@ struct_union { name: "N" definition { bytesize: 24 - member_id: 0x11c1b359 - member_id: 0x35a562d1 - member_id: 0x0b2abf8a - member_id: 0x50eb5162 + member_id: 0x11c1b359 # struct N* next + member_id: 0x35a562d1 # foo left + member_id: 0x0b2abf8a # foo right + member_id: 0x50eb5162 # short extra } } function { id: 0xa56992b1 - return_type_id: 0x6720d32f - parameter_id: 0xe08efe1a - parameter_id: 0x32b38621 + return_type_id: 0x6720d32f # int + parameter_id: 0xe08efe1a # struct N + parameter_id: 0x32b38621 # struct N* } elf_symbol { id: 0xc018d523 name: "fun" is_defined: true symbol_type: FUNCTION - type_id: 0xa56992b1 + type_id: 0xa56992b1 # int(struct N, struct N*) full_name: "fun" } interface { id: 0x84ea5130 - symbol_id: 0xc018d523 + symbol_id: 0xc018d523 # int fun(struct N, struct N*) } diff --git a/test_cases/info_tests/scc/expected/simple_thumb_c.elf_stg b/test_cases/info_tests/scc/expected/simple_thumb_c.elf_stg index 8f74460..93c3088 100644 --- a/test_cases/info_tests/scc/expected/simple_thumb_c.elf_stg +++ b/test_cases/info_tests/scc/expected/simple_thumb_c.elf_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x32b38621 kind: POINTER - pointee_type_id: 0xe08efe1a + pointee_type_id: 0xe08efe1a # struct N } typedef { id: 0x5c0e9566 name: "foo" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -25,24 +25,24 @@ primitive { member { id: 0x50eb5123 name: "extra" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 96 } member { id: 0x35a56b0b name: "left" - type_id: 0x5c0e9566 + type_id: 0x5c0e9566 # foo offset: 32 } member { id: 0x11c1b359 name: "next" - type_id: 0x32b38621 + type_id: 0x32b38621 # struct N* } member { id: 0x0b2ab2e8 name: "right" - type_id: 0x5c0e9566 + type_id: 0x5c0e9566 # foo offset: 64 } struct_union { @@ -51,27 +51,27 @@ struct_union { name: "N" definition { bytesize: 16 - member_id: 0x11c1b359 - member_id: 0x35a56b0b - member_id: 0x0b2ab2e8 - member_id: 0x50eb5123 + member_id: 0x11c1b359 # struct N* next + member_id: 0x35a56b0b # foo left + member_id: 0x0b2ab2e8 # foo right + member_id: 0x50eb5123 # short extra } } function { id: 0xa56992b1 - return_type_id: 0x6720d32f - parameter_id: 0xe08efe1a - parameter_id: 0x32b38621 + return_type_id: 0x6720d32f # int + parameter_id: 0xe08efe1a # struct N + parameter_id: 0x32b38621 # struct N* } elf_symbol { id: 0xc018d523 name: "fun" is_defined: true symbol_type: FUNCTION - type_id: 0xa56992b1 + type_id: 0xa56992b1 # int(struct N, struct N*) full_name: "fun" } interface { id: 0x84ea5130 - symbol_id: 0xc018d523 + symbol_id: 0xc018d523 # int fun(struct N, struct N*) } diff --git a/test_cases/info_tests/source_filter/expected/no_decl_file__clang_riscv64_c.elf_stg b/test_cases/info_tests/source_filter/expected/no_decl_file__clang_riscv64_c.elf_stg index dd04c40..472ee6c 100644 --- a/test_cases/info_tests/source_filter/expected/no_decl_file__clang_riscv64_c.elf_stg +++ b/test_cases/info_tests/source_filter/expected/no_decl_file__clang_riscv64_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,32 +7,32 @@ special { pointer_reference { id: 0x18bd6530 kind: POINTER - pointee_type_id: 0x48b5725f + pointee_type_id: 0x48b5725f # void } pointer_reference { id: 0x25727f37 kind: POINTER - pointee_type_id: 0xbf891a41 + pointee_type_id: 0xbf891a41 # __builtin_va_list } typedef { id: 0xbf891a41 name: "__builtin_va_list" - referred_type_id: 0x18bd6530 + referred_type_id: 0x18bd6530 # void* } function { id: 0x5fca2e3c - return_type_id: 0x18bd6530 - parameter_id: 0x25727f37 + return_type_id: 0x18bd6530 # void* + parameter_id: 0x25727f37 # __builtin_va_list* } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0x5fca2e3c + type_id: 0x5fca2e3c # void*(__builtin_va_list*) full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # void* foo(__builtin_va_list*) } diff --git a/test_cases/info_tests/source_filter/expected/no_decl_file__clang_x86_64_c.elf_stg b/test_cases/info_tests/source_filter/expected/no_decl_file__clang_x86_64_c.elf_stg index 44c2173..d72df22 100644 --- a/test_cases/info_tests/source_filter/expected/no_decl_file__clang_x86_64_c.elf_stg +++ b/test_cases/info_tests/source_filter/expected/no_decl_file__clang_x86_64_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x18bd6530 kind: POINTER - pointee_type_id: 0x48b5725f + pointee_type_id: 0x48b5725f # void } pointer_reference { id: 0x25727f37 kind: POINTER - pointee_type_id: 0xbf891a41 + pointee_type_id: 0xbf891a41 # __builtin_va_list } typedef { id: 0xbf891a41 name: "__builtin_va_list" - referred_type_id: 0xa0f8f2f4 + referred_type_id: 0xa0f8f2f4 # struct __va_list_tag[1] } primitive { id: 0x4585663f @@ -28,29 +28,29 @@ primitive { array { id: 0xa0f8f2f4 number_of_elements: 1 - element_type_id: 0x54c451f9 + element_type_id: 0x54c451f9 # struct __va_list_tag } member { id: 0xa90f4e9b name: "fp_offset" - type_id: 0x4585663f + type_id: 0x4585663f # unsigned int offset: 32 } member { id: 0xcfeeb67c name: "gp_offset" - type_id: 0x4585663f + type_id: 0x4585663f # unsigned int } member { id: 0x185223b4 name: "overflow_arg_area" - type_id: 0x18bd6530 + type_id: 0x18bd6530 # void* offset: 64 } member { id: 0xbde65725 name: "reg_save_area" - type_id: 0x18bd6530 + type_id: 0x18bd6530 # void* offset: 128 } struct_union { @@ -59,26 +59,26 @@ struct_union { name: "__va_list_tag" definition { bytesize: 24 - member_id: 0xcfeeb67c - member_id: 0xa90f4e9b - member_id: 0x185223b4 - member_id: 0xbde65725 + member_id: 0xcfeeb67c # unsigned int gp_offset + member_id: 0xa90f4e9b # unsigned int fp_offset + member_id: 0x185223b4 # void* overflow_arg_area + member_id: 0xbde65725 # void* reg_save_area } } function { id: 0x5fca2e3c - return_type_id: 0x18bd6530 - parameter_id: 0x25727f37 + return_type_id: 0x18bd6530 # void* + parameter_id: 0x25727f37 # __builtin_va_list* } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0x5fca2e3c + type_id: 0x5fca2e3c # void*(__builtin_va_list*) full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # void* foo(__builtin_va_list*) } diff --git a/test_cases/info_tests/source_filter/expected/no_decl_file_c.elf_stg b/test_cases/info_tests/source_filter/expected/no_decl_file_c.elf_stg index 61023cb..97b6734 100644 --- a/test_cases/info_tests/source_filter/expected/no_decl_file_c.elf_stg +++ b/test_cases/info_tests/source_filter/expected/no_decl_file_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x18bd6530 kind: POINTER - pointee_type_id: 0x48b5725f + pointee_type_id: 0x48b5725f # void } pointer_reference { id: 0x25727f37 kind: POINTER - pointee_type_id: 0xbf891a41 + pointee_type_id: 0xbf891a41 # __builtin_va_list } typedef { id: 0xbf891a41 name: "__builtin_va_list" - referred_type_id: 0xb51bbadb + referred_type_id: 0xb51bbadb # struct __va_list } primitive { id: 0x6720d32f @@ -28,30 +28,30 @@ primitive { member { id: 0x87c6ed94 name: "__gr_offs" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 192 } member { id: 0xb4bbd2af name: "__gr_top" - type_id: 0x18bd6530 + type_id: 0x18bd6530 # void* offset: 64 } member { id: 0x11319dfd name: "__stack" - type_id: 0x18bd6530 + type_id: 0x18bd6530 # void* } member { id: 0x9aaa3037 name: "__vr_offs" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 224 } member { id: 0x8e6c4f6e name: "__vr_top" - type_id: 0x18bd6530 + type_id: 0x18bd6530 # void* offset: 128 } struct_union { @@ -60,27 +60,27 @@ struct_union { name: "__va_list" definition { bytesize: 32 - member_id: 0x11319dfd - member_id: 0xb4bbd2af - member_id: 0x8e6c4f6e - member_id: 0x87c6ed94 - member_id: 0x9aaa3037 + member_id: 0x11319dfd # void* __stack + member_id: 0xb4bbd2af # void* __gr_top + member_id: 0x8e6c4f6e # void* __vr_top + member_id: 0x87c6ed94 # int __gr_offs + member_id: 0x9aaa3037 # int __vr_offs } } function { id: 0x5fca2e3c - return_type_id: 0x18bd6530 - parameter_id: 0x25727f37 + return_type_id: 0x18bd6530 # void* + parameter_id: 0x25727f37 # __builtin_va_list* } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0x5fca2e3c + type_id: 0x5fca2e3c # void*(__builtin_va_list*) full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # void* foo(__builtin_va_list*) } diff --git a/test_cases/info_tests/source_filter/expected/type_roots_cc.elf_stg b/test_cases/info_tests/source_filter/expected/type_roots_cc.elf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/source_filter/expected/type_roots_cc.elf_stg +++ b/test_cases/info_tests/source_filter/expected/type_roots_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/source_filter/expected/types_cc.elf_stg b/test_cases/info_tests/source_filter/expected/types_cc.elf_stg index f6c669d..71b0566 100644 --- a/test_cases/info_tests/source_filter/expected/types_cc.elf_stg +++ b/test_cases/info_tests/source_filter/expected/types_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,12 +7,12 @@ special { pointer_reference { id: 0x18bd6530 kind: POINTER - pointee_type_id: 0x48b5725f + pointee_type_id: 0x48b5725f # void } typedef { id: 0x4f137329 name: "Typedef" - referred_type_id: 0x18bd6530 + referred_type_id: 0x18bd6530 # void* } struct_union { id: 0x54a61673 @@ -42,7 +42,7 @@ elf_symbol { name: "foo_class" is_defined: true symbol_type: OBJECT - type_id: 0x54a61673 + type_id: 0x54a61673 # struct Class full_name: "foo_class" } elf_symbol { @@ -50,7 +50,7 @@ elf_symbol { name: "foo_enum" is_defined: true symbol_type: OBJECT - type_id: 0x86ad6dbf + type_id: 0x86ad6dbf # enum Enum full_name: "foo_enum" } elf_symbol { @@ -58,7 +58,7 @@ elf_symbol { name: "foo_enum_class" is_defined: true symbol_type: OBJECT - type_id: 0x75740575 + type_id: 0x75740575 # enum EnumClass full_name: "foo_enum_class" } elf_symbol { @@ -66,7 +66,7 @@ elf_symbol { name: "foo_struct" is_defined: true symbol_type: OBJECT - type_id: 0xf5c7508c + type_id: 0xf5c7508c # struct Struct full_name: "foo_struct" } elf_symbol { @@ -74,7 +74,7 @@ elf_symbol { name: "foo_typedef" is_defined: true symbol_type: OBJECT - type_id: 0x4f137329 + type_id: 0x4f137329 # Typedef full_name: "foo_typedef" } elf_symbol { @@ -82,15 +82,15 @@ elf_symbol { name: "foo_union" is_defined: true symbol_type: OBJECT - type_id: 0x399387a9 + type_id: 0x399387a9 # union Union full_name: "foo_union" } interface { id: 0x84ea5130 - symbol_id: 0x663a751a - symbol_id: 0x5f43725e - symbol_id: 0x49093003 - symbol_id: 0x8361f42b - symbol_id: 0x90772e58 - symbol_id: 0xc77e6f56 + symbol_id: 0x663a751a # struct Class foo_class + symbol_id: 0x5f43725e # enum Enum foo_enum + symbol_id: 0x49093003 # enum EnumClass foo_enum_class + symbol_id: 0x8361f42b # struct Struct foo_struct + symbol_id: 0x90772e58 # Typedef foo_typedef + symbol_id: 0xc77e6f56 # union Union foo_union } diff --git a/test_cases/info_tests/static/expected/simple_cc.elf_stg b/test_cases/info_tests/static/expected/simple_cc.elf_stg index 921cfef..863fa24 100644 --- a/test_cases/info_tests/static/expected/simple_cc.elf_stg +++ b/test_cases/info_tests/static/expected/simple_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -9,7 +9,7 @@ primitive { member { id: 0x9cebeb53 name: "bar" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0xf6f304f7 @@ -17,19 +17,19 @@ struct_union { name: "Foo" definition { bytesize: 4 - member_id: 0x9cebeb53 + member_id: 0x9cebeb53 # int bar } } function { id: 0xe5d22a85 - return_type_id: 0xf6f304f7 + return_type_id: 0xf6f304f7 # struct Foo } elf_symbol { id: 0x20a0c465 name: "_ZN3Foo2stE" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "Foo::st" } elf_symbol { @@ -37,11 +37,11 @@ elf_symbol { name: "_ZN3Foo7DefaultEv" is_defined: true symbol_type: FUNCTION - type_id: 0xe5d22a85 + type_id: 0xe5d22a85 # struct Foo() full_name: "Foo::Default" } interface { id: 0x84ea5130 - symbol_id: 0x20a0c465 - symbol_id: 0x3ccd5aea + symbol_id: 0x20a0c465 # int Foo::st + symbol_id: 0x3ccd5aea # struct Foo Foo::Default() } diff --git a/test_cases/info_tests/struct/expected/anonymous_c.btf_stg b/test_cases/info_tests/struct/expected/anonymous_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/struct/expected/anonymous_c.btf_stg +++ b/test_cases/info_tests/struct/expected/anonymous_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/struct/expected/anonymous_c.elf_stg b/test_cases/info_tests/struct/expected/anonymous_c.elf_stg index b91c15d..f2dab7f 100644 --- a/test_cases/info_tests/struct/expected/anonymous_c.elf_stg +++ b/test_cases/info_tests/struct/expected/anonymous_c.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x7d386fee name: "Foo" - referred_type_id: 0x154ec986 + referred_type_id: 0x154ec986 # struct { union { struct { unsigned int x; unsigned int y; }; unsigned long long z; }; } } primitive { id: 0x4585663f @@ -19,34 +19,34 @@ primitive { } member { id: 0x2fd000b1 - type_id: 0x306e72d7 + type_id: 0x306e72d7 # struct { unsigned int x; unsigned int y; } } member { id: 0x348a3575 - type_id: 0x5d06a5c7 + type_id: 0x5d06a5c7 # union { struct { unsigned int x; unsigned int y; }; unsigned long long z; } } member { id: 0xa0f7eeb0 name: "x" - type_id: 0x4585663f + type_id: 0x4585663f # unsigned int } member { id: 0xff3682d9 name: "y" - type_id: 0x4585663f + type_id: 0x4585663f # unsigned int offset: 32 } member { id: 0x21e0aad1 name: "z" - type_id: 0xd5df6730 + type_id: 0xd5df6730 # unsigned long long } struct_union { id: 0x154ec986 kind: STRUCT definition { bytesize: 8 - member_id: 0x348a3575 + member_id: 0x348a3575 # union { struct { unsigned int x; unsigned int y; }; unsigned long long z; } } } struct_union { @@ -54,8 +54,8 @@ struct_union { kind: STRUCT definition { bytesize: 8 - member_id: 0xa0f7eeb0 - member_id: 0xff3682d9 + member_id: 0xa0f7eeb0 # unsigned int x + member_id: 0xff3682d9 # unsigned int y } } struct_union { @@ -63,8 +63,8 @@ struct_union { kind: UNION definition { bytesize: 8 - member_id: 0x2fd000b1 - member_id: 0x21e0aad1 + member_id: 0x2fd000b1 # struct { unsigned int x; unsigned int y; } + member_id: 0x21e0aad1 # unsigned long long z } } elf_symbol { @@ -72,10 +72,10 @@ elf_symbol { name: "var" is_defined: true symbol_type: OBJECT - type_id: 0x7d386fee + type_id: 0x7d386fee # Foo full_name: "var" } interface { id: 0x84ea5130 - symbol_id: 0x3997c6eb + symbol_id: 0x3997c6eb # Foo var } diff --git a/test_cases/info_tests/struct/expected/bit_field_be_dwarf3_c.elf_stg b/test_cases/info_tests/struct/expected/bit_field_be_dwarf3_c.elf_stg index b03695f..b38e7d2 100644 --- a/test_cases/info_tests/struct/expected/bit_field_be_dwarf3_c.elf_stg +++ b/test_cases/info_tests/struct/expected/bit_field_be_dwarf3_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xb0312d5a name: "short" @@ -9,26 +9,26 @@ primitive { member { id: 0x6203902d name: "rest_of_the_struct" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short } member { id: 0x4dbddff8 name: "x" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 16 bitsize: 5 } member { id: 0x214471dc name: "y" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 21 bitsize: 6 } member { id: 0xc93d2a5e name: "z" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 27 bitsize: 5 } @@ -38,10 +38,10 @@ struct_union { name: "Foo" definition { bytesize: 4 - member_id: 0x6203902d - member_id: 0x4dbddff8 - member_id: 0x214471dc - member_id: 0xc93d2a5e + member_id: 0x6203902d # short rest_of_the_struct + member_id: 0x4dbddff8 # short x:5 + member_id: 0x214471dc # short y:6 + member_id: 0xc93d2a5e # short z:5 } } elf_symbol { @@ -49,10 +49,10 @@ elf_symbol { name: "var" is_defined: true symbol_type: OBJECT - type_id: 0xf6f304f7 + type_id: 0xf6f304f7 # struct Foo full_name: "var" } interface { id: 0x84ea5130 - symbol_id: 0x3997c6eb + symbol_id: 0x3997c6eb # struct Foo var } diff --git a/test_cases/info_tests/struct/expected/bit_field_c.btf_stg b/test_cases/info_tests/struct/expected/bit_field_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/struct/expected/bit_field_c.btf_stg +++ b/test_cases/info_tests/struct/expected/bit_field_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/struct/expected/bit_field_c.elf_stg b/test_cases/info_tests/struct/expected/bit_field_c.elf_stg index b03695f..b38e7d2 100644 --- a/test_cases/info_tests/struct/expected/bit_field_c.elf_stg +++ b/test_cases/info_tests/struct/expected/bit_field_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xb0312d5a name: "short" @@ -9,26 +9,26 @@ primitive { member { id: 0x6203902d name: "rest_of_the_struct" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short } member { id: 0x4dbddff8 name: "x" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 16 bitsize: 5 } member { id: 0x214471dc name: "y" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 21 bitsize: 6 } member { id: 0xc93d2a5e name: "z" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 27 bitsize: 5 } @@ -38,10 +38,10 @@ struct_union { name: "Foo" definition { bytesize: 4 - member_id: 0x6203902d - member_id: 0x4dbddff8 - member_id: 0x214471dc - member_id: 0xc93d2a5e + member_id: 0x6203902d # short rest_of_the_struct + member_id: 0x4dbddff8 # short x:5 + member_id: 0x214471dc # short y:6 + member_id: 0xc93d2a5e # short z:5 } } elf_symbol { @@ -49,10 +49,10 @@ elf_symbol { name: "var" is_defined: true symbol_type: OBJECT - type_id: 0xf6f304f7 + type_id: 0xf6f304f7 # struct Foo full_name: "var" } interface { id: 0x84ea5130 - symbol_id: 0x3997c6eb + symbol_id: 0x3997c6eb # struct Foo var } diff --git a/test_cases/info_tests/struct/expected/bit_field_dwarf3_c.elf_stg b/test_cases/info_tests/struct/expected/bit_field_dwarf3_c.elf_stg index b03695f..b38e7d2 100644 --- a/test_cases/info_tests/struct/expected/bit_field_dwarf3_c.elf_stg +++ b/test_cases/info_tests/struct/expected/bit_field_dwarf3_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xb0312d5a name: "short" @@ -9,26 +9,26 @@ primitive { member { id: 0x6203902d name: "rest_of_the_struct" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short } member { id: 0x4dbddff8 name: "x" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 16 bitsize: 5 } member { id: 0x214471dc name: "y" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 21 bitsize: 6 } member { id: 0xc93d2a5e name: "z" - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short offset: 27 bitsize: 5 } @@ -38,10 +38,10 @@ struct_union { name: "Foo" definition { bytesize: 4 - member_id: 0x6203902d - member_id: 0x4dbddff8 - member_id: 0x214471dc - member_id: 0xc93d2a5e + member_id: 0x6203902d # short rest_of_the_struct + member_id: 0x4dbddff8 # short x:5 + member_id: 0x214471dc # short y:6 + member_id: 0xc93d2a5e # short z:5 } } elf_symbol { @@ -49,10 +49,10 @@ elf_symbol { name: "var" is_defined: true symbol_type: OBJECT - type_id: 0xf6f304f7 + type_id: 0xf6f304f7 # struct Foo full_name: "var" } interface { id: 0x84ea5130 - symbol_id: 0x3997c6eb + symbol_id: 0x3997c6eb # struct Foo var } diff --git a/test_cases/info_tests/struct/expected/declaration_only_c.btf_stg b/test_cases/info_tests/struct/expected/declaration_only_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/struct/expected/declaration_only_c.btf_stg +++ b/test_cases/info_tests/struct/expected/declaration_only_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/struct/expected/declaration_only_c.elf_stg b/test_cases/info_tests/struct/expected/declaration_only_c.elf_stg index af1a122..e82b8bd 100644 --- a/test_cases/info_tests/struct/expected/declaration_only_c.elf_stg +++ b/test_cases/info_tests/struct/expected/declaration_only_c.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x34c1eb21 kind: POINTER - pointee_type_id: 0xf9474a19 + pointee_type_id: 0xf9474a19 # struct Foo } struct_union { id: 0xf9474a19 @@ -15,10 +15,10 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0x34c1eb21 + type_id: 0x34c1eb21 # struct Foo* full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # struct Foo* foo } diff --git a/test_cases/info_tests/struct/expected/nested_c.btf_stg b/test_cases/info_tests/struct/expected/nested_c.btf_stg index 62967b4..5c41c48 100644 --- a/test_cases/info_tests/struct/expected/nested_c.btf_stg +++ b/test_cases/info_tests/struct/expected/nested_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x12c83f93 kind: POINTER - pointee_type_id: 0x616018d1 + pointee_type_id: 0x616018d1 # struct nested } pointer_reference { id: 0x1b5b5f31 kind: POINTER - pointee_type_id: 0x472d9a5b + pointee_type_id: 0x472d9a5b # struct containing } pointer_reference { id: 0x32c82798 kind: POINTER - pointee_type_id: 0xe16078fd + pointee_type_id: 0xe16078fd # struct referring } primitive { id: 0xfc0e1dbd @@ -28,17 +28,17 @@ primitive { member { id: 0xc0117331 name: "inner" - type_id: 0x12c83f93 + type_id: 0x12c83f93 # struct nested* } member { id: 0xc062db16 name: "inner" - type_id: 0x616018d1 + type_id: 0x616018d1 # struct nested } member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x472d9a5b @@ -46,7 +46,7 @@ struct_union { name: "containing" definition { bytesize: 8 - member_id: 0xc062db16 + member_id: 0xc062db16 # struct nested inner } } struct_union { @@ -55,7 +55,7 @@ struct_union { name: "nested" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -64,61 +64,61 @@ struct_union { name: "referring" definition { bytesize: 8 - member_id: 0xc0117331 + member_id: 0xc0117331 # struct nested* inner } } function { id: 0x01533705 - return_type_id: 0x48b5725f - parameter_id: 0x472d9a5b + return_type_id: 0x48b5725f # void + parameter_id: 0x472d9a5b # struct containing } function { id: 0x164e865f - return_type_id: 0x48b5725f - parameter_id: 0x1b5b5f31 + return_type_id: 0x48b5725f # void + parameter_id: 0x1b5b5f31 # struct containing* } function { id: 0x1c2a5875 - return_type_id: 0x48b5725f - parameter_id: 0x32c82798 + return_type_id: 0x48b5725f # void + parameter_id: 0x32c82798 # struct referring* } function { id: 0x28c04fac - return_type_id: 0x48b5725f - parameter_id: 0xe16078fd + return_type_id: 0x48b5725f # void + parameter_id: 0xe16078fd # struct referring } elf_symbol { id: 0x97e8ca66 name: "register_ops6" is_defined: true symbol_type: FUNCTION - type_id: 0x01533705 + type_id: 0x01533705 # void(struct containing) } elf_symbol { id: 0x68a86d39 name: "register_ops7" is_defined: true symbol_type: FUNCTION - type_id: 0x164e865f + type_id: 0x164e865f # void(struct containing*) } elf_symbol { id: 0x1f6abcc7 name: "register_ops8" is_defined: true symbol_type: FUNCTION - type_id: 0x28c04fac + type_id: 0x28c04fac # void(struct referring) } elf_symbol { id: 0xdc2ac9cf name: "register_ops9" is_defined: true symbol_type: FUNCTION - type_id: 0x1c2a5875 + type_id: 0x1c2a5875 # void(struct referring*) } interface { id: 0x84ea5130 - symbol_id: 0x97e8ca66 - symbol_id: 0x68a86d39 - symbol_id: 0x1f6abcc7 - symbol_id: 0xdc2ac9cf + symbol_id: 0x97e8ca66 # void register_ops6(struct containing) + symbol_id: 0x68a86d39 # void register_ops7(struct containing*) + symbol_id: 0x1f6abcc7 # void register_ops8(struct referring) + symbol_id: 0xdc2ac9cf # void register_ops9(struct referring*) } diff --git a/test_cases/info_tests/struct/expected/nested_c.elf_stg b/test_cases/info_tests/struct/expected/nested_c.elf_stg index 1ffc858..28fd1ee 100644 --- a/test_cases/info_tests/struct/expected/nested_c.elf_stg +++ b/test_cases/info_tests/struct/expected/nested_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x12c83f93 kind: POINTER - pointee_type_id: 0x616018d1 + pointee_type_id: 0x616018d1 # struct nested } pointer_reference { id: 0x1b5b5f31 kind: POINTER - pointee_type_id: 0x472d9a5b + pointee_type_id: 0x472d9a5b # struct containing } pointer_reference { id: 0x32c82798 kind: POINTER - pointee_type_id: 0xe16078fd + pointee_type_id: 0xe16078fd # struct referring } primitive { id: 0xfc0e1dbd @@ -28,17 +28,17 @@ primitive { member { id: 0xc0117331 name: "inner" - type_id: 0x12c83f93 + type_id: 0x12c83f93 # struct nested* } member { id: 0xc062db16 name: "inner" - type_id: 0x616018d1 + type_id: 0x616018d1 # struct nested } member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x472d9a5b @@ -46,7 +46,7 @@ struct_union { name: "containing" definition { bytesize: 8 - member_id: 0xc062db16 + member_id: 0xc062db16 # struct nested inner } } struct_union { @@ -55,7 +55,7 @@ struct_union { name: "nested" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -64,35 +64,35 @@ struct_union { name: "referring" definition { bytesize: 8 - member_id: 0xc0117331 + member_id: 0xc0117331 # struct nested* inner } } function { id: 0x01533705 - return_type_id: 0x48b5725f - parameter_id: 0x472d9a5b + return_type_id: 0x48b5725f # void + parameter_id: 0x472d9a5b # struct containing } function { id: 0x164e865f - return_type_id: 0x48b5725f - parameter_id: 0x1b5b5f31 + return_type_id: 0x48b5725f # void + parameter_id: 0x1b5b5f31 # struct containing* } function { id: 0x1c2a5875 - return_type_id: 0x48b5725f - parameter_id: 0x32c82798 + return_type_id: 0x48b5725f # void + parameter_id: 0x32c82798 # struct referring* } function { id: 0x28c04fac - return_type_id: 0x48b5725f - parameter_id: 0xe16078fd + return_type_id: 0x48b5725f # void + parameter_id: 0xe16078fd # struct referring } elf_symbol { id: 0x97e8ca66 name: "register_ops6" is_defined: true symbol_type: FUNCTION - type_id: 0x01533705 + type_id: 0x01533705 # void(struct containing) full_name: "register_ops6" } elf_symbol { @@ -100,7 +100,7 @@ elf_symbol { name: "register_ops7" is_defined: true symbol_type: FUNCTION - type_id: 0x164e865f + type_id: 0x164e865f # void(struct containing*) full_name: "register_ops7" } elf_symbol { @@ -108,7 +108,7 @@ elf_symbol { name: "register_ops8" is_defined: true symbol_type: FUNCTION - type_id: 0x28c04fac + type_id: 0x28c04fac # void(struct referring) full_name: "register_ops8" } elf_symbol { @@ -116,13 +116,13 @@ elf_symbol { name: "register_ops9" is_defined: true symbol_type: FUNCTION - type_id: 0x1c2a5875 + type_id: 0x1c2a5875 # void(struct referring*) full_name: "register_ops9" } interface { id: 0x84ea5130 - symbol_id: 0x97e8ca66 - symbol_id: 0x68a86d39 - symbol_id: 0x1f6abcc7 - symbol_id: 0xdc2ac9cf + symbol_id: 0x97e8ca66 # void register_ops6(struct containing) + symbol_id: 0x68a86d39 # void register_ops7(struct containing*) + symbol_id: 0x1f6abcc7 # void register_ops8(struct referring) + symbol_id: 0xdc2ac9cf # void register_ops9(struct referring*) } diff --git a/test_cases/info_tests/struct/expected/nested_cc.elf_stg b/test_cases/info_tests/struct/expected/nested_cc.elf_stg index 9034610..6e0fa99 100644 --- a/test_cases/info_tests/struct/expected/nested_cc.elf_stg +++ b/test_cases/info_tests/struct/expected/nested_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x12c83f93 kind: POINTER - pointee_type_id: 0x616018d1 + pointee_type_id: 0x616018d1 # struct nested } pointer_reference { id: 0x1b5b5f31 kind: POINTER - pointee_type_id: 0x472d9a5b + pointee_type_id: 0x472d9a5b # struct containing } pointer_reference { id: 0x32c82798 kind: POINTER - pointee_type_id: 0xe16078fd + pointee_type_id: 0xe16078fd # struct referring } primitive { id: 0xfc0e1dbd @@ -28,17 +28,17 @@ primitive { member { id: 0xc0117331 name: "inner" - type_id: 0x12c83f93 + type_id: 0x12c83f93 # struct nested* } member { id: 0xc062db16 name: "inner" - type_id: 0x616018d1 + type_id: 0x616018d1 # struct nested } member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x472d9a5b @@ -46,7 +46,7 @@ struct_union { name: "containing" definition { bytesize: 8 - member_id: 0xc062db16 + member_id: 0xc062db16 # struct nested inner } } struct_union { @@ -55,7 +55,7 @@ struct_union { name: "nested" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -64,35 +64,35 @@ struct_union { name: "referring" definition { bytesize: 8 - member_id: 0xc0117331 + member_id: 0xc0117331 # struct nested* inner } } function { id: 0x01533705 - return_type_id: 0x48b5725f - parameter_id: 0x472d9a5b + return_type_id: 0x48b5725f # void + parameter_id: 0x472d9a5b # struct containing } function { id: 0x164e865f - return_type_id: 0x48b5725f - parameter_id: 0x1b5b5f31 + return_type_id: 0x48b5725f # void + parameter_id: 0x1b5b5f31 # struct containing* } function { id: 0x1c2a5875 - return_type_id: 0x48b5725f - parameter_id: 0x32c82798 + return_type_id: 0x48b5725f # void + parameter_id: 0x32c82798 # struct referring* } function { id: 0x28c04fac - return_type_id: 0x48b5725f - parameter_id: 0xe16078fd + return_type_id: 0x48b5725f # void + parameter_id: 0xe16078fd # struct referring } elf_symbol { id: 0x347b0ec1 name: "_Z13register_ops610containing" is_defined: true symbol_type: FUNCTION - type_id: 0x01533705 + type_id: 0x01533705 # void(struct containing) full_name: "register_ops6" } elf_symbol { @@ -100,7 +100,7 @@ elf_symbol { name: "_Z13register_ops7P10containing" is_defined: true symbol_type: FUNCTION - type_id: 0x164e865f + type_id: 0x164e865f # void(struct containing*) full_name: "register_ops7" } elf_symbol { @@ -108,7 +108,7 @@ elf_symbol { name: "_Z13register_ops89referring" is_defined: true symbol_type: FUNCTION - type_id: 0x28c04fac + type_id: 0x28c04fac # void(struct referring) full_name: "register_ops8" } elf_symbol { @@ -116,13 +116,13 @@ elf_symbol { name: "_Z13register_ops9P9referring" is_defined: true symbol_type: FUNCTION - type_id: 0x1c2a5875 + type_id: 0x1c2a5875 # void(struct referring*) full_name: "register_ops9" } interface { id: 0x84ea5130 - symbol_id: 0x347b0ec1 - symbol_id: 0xcc14c364 - symbol_id: 0xe408ab24 - symbol_id: 0x9d450b2c + symbol_id: 0x347b0ec1 # void register_ops6(struct containing) + symbol_id: 0xcc14c364 # void register_ops7(struct containing*) + symbol_id: 0xe408ab24 # void register_ops8(struct referring) + symbol_id: 0x9d450b2c # void register_ops9(struct referring*) } diff --git a/test_cases/info_tests/struct/expected/struct_union_c.btf_stg b/test_cases/info_tests/struct/expected/struct_union_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/struct/expected/struct_union_c.btf_stg +++ b/test_cases/info_tests/struct/expected/struct_union_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/struct/expected/struct_union_c.elf_stg b/test_cases/info_tests/struct/expected/struct_union_c.elf_stg index f071211..5cae3c4 100644 --- a/test_cases/info_tests/struct/expected/struct_union_c.elf_stg +++ b/test_cases/info_tests/struct/expected/struct_union_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -9,7 +9,7 @@ primitive { member { id: 0xa0d54b05 name: "x" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } struct_union { id: 0xae62fdac @@ -17,7 +17,7 @@ struct_union { name: "Struct" definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } struct_union { @@ -26,7 +26,7 @@ struct_union { name: "Union" definition { bytesize: 4 - member_id: 0xa0d54b05 + member_id: 0xa0d54b05 # int x } } elf_symbol { @@ -34,7 +34,7 @@ elf_symbol { name: "bar" is_defined: true symbol_type: OBJECT - type_id: 0x58ad1075 + type_id: 0x58ad1075 # union Union full_name: "bar" } elf_symbol { @@ -42,11 +42,11 @@ elf_symbol { name: "foo" is_defined: true symbol_type: OBJECT - type_id: 0xae62fdac + type_id: 0xae62fdac # struct Struct full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0xa58ca0b6 - symbol_id: 0x06f8338c + symbol_id: 0xa58ca0b6 # union Union bar + symbol_id: 0x06f8338c # struct Struct foo } diff --git a/test_cases/info_tests/symbol/expected/absolute_object_c.btf_stg b/test_cases/info_tests/symbol/expected/absolute_object_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/symbol/expected/absolute_object_c.btf_stg +++ b/test_cases/info_tests/symbol/expected/absolute_object_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/symbol/expected/absolute_object_c.elf_stg b/test_cases/info_tests/symbol/expected/absolute_object_c.elf_stg index b520046..d2c5d6f 100644 --- a/test_cases/info_tests/symbol/expected/absolute_object_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/absolute_object_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0xfc0e1dbd name: "long" @@ -11,7 +11,7 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long full_name: "x" } elf_symbol { @@ -19,11 +19,11 @@ elf_symbol { name: "y" is_defined: true symbol_type: OBJECT - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long full_name: "y" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 - symbol_id: 0xb5c9c657 + symbol_id: 0x7709bd40 # long x + symbol_id: 0xb5c9c657 # long y } diff --git a/test_cases/info_tests/symbol/expected/alias_c.btf_stg b/test_cases/info_tests/symbol/expected/alias_c.btf_stg index c5731ce..fe8fb15 100644 --- a/test_cases/info_tests/symbol/expected/alias_c.btf_stg +++ b/test_cases/info_tests/symbol/expected/alias_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,16 +8,16 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0xa7b0241d name: "a" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d + symbol_id: 0xa7b0241d # int a() } diff --git a/test_cases/info_tests/symbol/expected/alias_c.elf_stg b/test_cases/info_tests/symbol/expected/alias_c.elf_stg index e69864d..eb5c71a 100644 --- a/test_cases/info_tests/symbol/expected/alias_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/alias_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,14 +8,14 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0xa7b0241d name: "a" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "a" } elf_symbol { @@ -23,7 +23,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "a" } elf_symbol { @@ -32,7 +32,7 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "a" } elf_symbol { @@ -40,7 +40,7 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "x" } elf_symbol { @@ -48,7 +48,7 @@ elf_symbol { name: "y" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "x" } elf_symbol { @@ -57,15 +57,15 @@ elf_symbol { is_defined: true symbol_type: OBJECT binding: WEAK - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x7709bd40 - symbol_id: 0xb5c9c657 - symbol_id: 0xf58aebbc + symbol_id: 0xa7b0241d # int a() + symbol_id: 0xe371117a # int a() + symbol_id: 0x2230fb28 # int a() + symbol_id: 0x7709bd40 # int x + symbol_id: 0xb5c9c657 # int x + symbol_id: 0xf58aebbc # int x } diff --git a/test_cases/info_tests/symbol/expected/ifunc_c.btf_stg b/test_cases/info_tests/symbol/expected/ifunc_c.btf_stg index 19bb95e..ca7004a 100644 --- a/test_cases/info_tests/symbol/expected/ifunc_c.btf_stg +++ b/test_cases/info_tests/symbol/expected/ifunc_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,32 +7,32 @@ special { pointer_reference { id: 0x0eb62dc3 kind: POINTER - pointee_type_id: 0x10985193 + pointee_type_id: 0x10985193 # void() } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } function { id: 0xc76a0666 - return_type_id: 0x0eb62dc3 + return_type_id: 0x0eb62dc3 # void(*)() } elf_symbol { id: 0xa0dfae18 name: "my_func" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() } elf_symbol { id: 0x3a11f024 name: "resolve_func" is_defined: true symbol_type: FUNCTION - type_id: 0xc76a0666 + type_id: 0xc76a0666 # void(*())() } interface { id: 0x84ea5130 - symbol_id: 0xa0dfae18 - symbol_id: 0x3a11f024 + symbol_id: 0xa0dfae18 # void my_func() + symbol_id: 0x3a11f024 # void(* resolve_func())() } diff --git a/test_cases/info_tests/symbol/expected/ifunc_c.elf_stg b/test_cases/info_tests/symbol/expected/ifunc_c.elf_stg index 0fe02f8..83d4614 100644 --- a/test_cases/info_tests/symbol/expected/ifunc_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/ifunc_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface elf_symbol { id: 0xa49e03a0 name: "func" @@ -8,5 +8,5 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0xa49e03a0 + symbol_id: 0xa49e03a0 # func } diff --git a/test_cases/info_tests/symbol/expected/tls__clang_riscv64_c.elf_stg b/test_cases/info_tests/symbol/expected/tls__clang_riscv64_c.elf_stg index b15dabe..8203fa0 100644 --- a/test_cases/info_tests/symbol/expected/tls__clang_riscv64_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/tls__clang_riscv64_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -17,7 +17,7 @@ elf_symbol { name: "var1" is_defined: true symbol_type: TLS - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "var1" } elf_symbol { @@ -25,11 +25,11 @@ elf_symbol { name: "var2" is_defined: true symbol_type: TLS - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long full_name: "var2" } interface { id: 0x84ea5130 - symbol_id: 0x3c10a6b0 - symbol_id: 0x7652705b + symbol_id: 0x3c10a6b0 # int var1 + symbol_id: 0x7652705b # long var2 } diff --git a/test_cases/info_tests/symbol/expected/tls__clang_riscv64_cc.elf_stg b/test_cases/info_tests/symbol/expected/tls__clang_riscv64_cc.elf_stg index 1e32710..1844533 100644 --- a/test_cases/info_tests/symbol/expected/tls__clang_riscv64_cc.elf_stg +++ b/test_cases/info_tests/symbol/expected/tls__clang_riscv64_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -14,14 +14,14 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } elf_symbol { @@ -29,7 +29,7 @@ elf_symbol { name: "_ZN2ns3fooE" is_defined: true symbol_type: TLS - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short full_name: "ns::foo" } elf_symbol { @@ -37,12 +37,12 @@ elf_symbol { name: "foo" is_defined: true symbol_type: TLS - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 - symbol_id: 0xa4e142ef - symbol_id: 0x06f8338c + symbol_id: 0x92009dc1 # int bar() + symbol_id: 0xa4e142ef # short ns::foo + symbol_id: 0x06f8338c # int foo } diff --git a/test_cases/info_tests/symbol/expected/tls__clang_x86_64_c.elf_stg b/test_cases/info_tests/symbol/expected/tls__clang_x86_64_c.elf_stg index b15dabe..8203fa0 100644 --- a/test_cases/info_tests/symbol/expected/tls__clang_x86_64_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/tls__clang_x86_64_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -17,7 +17,7 @@ elf_symbol { name: "var1" is_defined: true symbol_type: TLS - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "var1" } elf_symbol { @@ -25,11 +25,11 @@ elf_symbol { name: "var2" is_defined: true symbol_type: TLS - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long full_name: "var2" } interface { id: 0x84ea5130 - symbol_id: 0x3c10a6b0 - symbol_id: 0x7652705b + symbol_id: 0x3c10a6b0 # int var1 + symbol_id: 0x7652705b # long var2 } diff --git a/test_cases/info_tests/symbol/expected/tls__clang_x86_64_cc.elf_stg b/test_cases/info_tests/symbol/expected/tls__clang_x86_64_cc.elf_stg index 1e32710..1844533 100644 --- a/test_cases/info_tests/symbol/expected/tls__clang_x86_64_cc.elf_stg +++ b/test_cases/info_tests/symbol/expected/tls__clang_x86_64_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -14,14 +14,14 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } elf_symbol { @@ -29,7 +29,7 @@ elf_symbol { name: "_ZN2ns3fooE" is_defined: true symbol_type: TLS - type_id: 0xb0312d5a + type_id: 0xb0312d5a # short full_name: "ns::foo" } elf_symbol { @@ -37,12 +37,12 @@ elf_symbol { name: "foo" is_defined: true symbol_type: TLS - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 - symbol_id: 0xa4e142ef - symbol_id: 0x06f8338c + symbol_id: 0x92009dc1 # int bar() + symbol_id: 0xa4e142ef # short ns::foo + symbol_id: 0x06f8338c # int foo } diff --git a/test_cases/info_tests/symbol/expected/tls_c.btf_stg b/test_cases/info_tests/symbol/expected/tls_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/symbol/expected/tls_c.btf_stg +++ b/test_cases/info_tests/symbol/expected/tls_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/symbol/expected/tls_c.elf_stg b/test_cases/info_tests/symbol/expected/tls_c.elf_stg index 289e0b7..9219940 100644 --- a/test_cases/info_tests/symbol/expected/tls_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/tls_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface elf_symbol { id: 0x3c10a6b0 name: "var1" @@ -14,6 +14,6 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0x3c10a6b0 - symbol_id: 0x7652705b + symbol_id: 0x3c10a6b0 # var1 + symbol_id: 0x7652705b # var2 } diff --git a/test_cases/info_tests/symbol/expected/tls_cc.elf_stg b/test_cases/info_tests/symbol/expected/tls_cc.elf_stg index 210fda3..d3bf37a 100644 --- a/test_cases/info_tests/symbol/expected/tls_cc.elf_stg +++ b/test_cases/info_tests/symbol/expected/tls_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,14 +8,14 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } elf_symbol { @@ -32,7 +32,7 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 - symbol_id: 0xa4e142ef - symbol_id: 0x06f8338c + symbol_id: 0x92009dc1 # int bar() + symbol_id: 0xa4e142ef # _ZN2ns3fooE + symbol_id: 0x06f8338c # foo } diff --git a/test_cases/info_tests/symbol/expected/tls_emulated_c.elf_stg b/test_cases/info_tests/symbol/expected/tls_emulated_c.elf_stg index b4cd4f9..bda8356 100644 --- a/test_cases/info_tests/symbol/expected/tls_emulated_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/tls_emulated_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface elf_symbol { id: 0x688c97e0 name: "__emutls_t.var2" @@ -20,7 +20,7 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0x688c97e0 - symbol_id: 0xa2dcdaef - symbol_id: 0xe19c7b87 + symbol_id: 0x688c97e0 # __emutls_t.var2 + symbol_id: 0xa2dcdaef # __emutls_v.var1 + symbol_id: 0xe19c7b87 # __emutls_v.var2 } diff --git a/test_cases/info_tests/symbol/expected/tls_emulated_cc.elf_stg b/test_cases/info_tests/symbol/expected/tls_emulated_cc.elf_stg index 3ddf217..5964efa 100644 --- a/test_cases/info_tests/symbol/expected/tls_emulated_cc.elf_stg +++ b/test_cases/info_tests/symbol/expected/tls_emulated_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,14 +8,14 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } elf_symbol { @@ -32,7 +32,7 @@ elf_symbol { } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 - symbol_id: 0x6c57e66c - symbol_id: 0xb0192ccb + symbol_id: 0x92009dc1 # int bar() + symbol_id: 0x6c57e66c # __emutls_v._ZN2ns3fooE + symbol_id: 0xb0192ccb # __emutls_v.foo } diff --git a/test_cases/info_tests/symbol/expected/version_definition_c.elf_stg b/test_cases/info_tests/symbol/expected/version_definition_c.elf_stg index 6342898..5a80408 100644 --- a/test_cases/info_tests/symbol/expected/version_definition_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/version_definition_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -12,18 +12,18 @@ primitive { } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x886f3c7a name: "test" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "test" } elf_symbol { @@ -31,7 +31,7 @@ elf_symbol { name: "versioned_foo" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "versioned_foo" } elf_symbol { @@ -39,7 +39,7 @@ elf_symbol { name: "versioned_foo_v1" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "versioned_foo_v1" } elf_symbol { @@ -47,7 +47,7 @@ elf_symbol { name: "versioned_foo_v2" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "versioned_foo_v2" } elf_symbol { @@ -55,14 +55,14 @@ elf_symbol { name: "versioned_foo_v3" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "versioned_foo_v3" } interface { id: 0x84ea5130 - symbol_id: 0x886f3c7a - symbol_id: 0x48a2620a - symbol_id: 0xc828cd97 - symbol_id: 0x77e76a1f - symbol_id: 0x36a79a97 + symbol_id: 0x886f3c7a # int test() + symbol_id: 0x48a2620a # void versioned_foo() + symbol_id: 0xc828cd97 # void versioned_foo_v1() + symbol_id: 0x77e76a1f # void versioned_foo_v2() + symbol_id: 0x36a79a97 # void versioned_foo_v3() } diff --git a/test_cases/info_tests/symbol/expected/version_need_c.elf_stg b/test_cases/info_tests/symbol/expected/version_need_c.elf_stg index bdeed29..635d0b9 100644 --- a/test_cases/info_tests/symbol/expected/version_need_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/version_need_c.elf_stg @@ -1,22 +1,22 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0x886f3c7a name: "test" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "test" } interface { id: 0x84ea5130 - symbol_id: 0x886f3c7a + symbol_id: 0x886f3c7a # void test() } diff --git a/test_cases/info_tests/symbol/expected/visibility_c.btf_stg b/test_cases/info_tests/symbol/expected/visibility_c.btf_stg index 32324cd..0bdc7f0 100644 --- a/test_cases/info_tests/symbol/expected/visibility_c.btf_stg +++ b/test_cases/info_tests/symbol/expected/visibility_c.btf_stg @@ -1,45 +1,45 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0xa7b0241d name: "a" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() } elf_symbol { id: 0xe371117a name: "b" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() } elf_symbol { id: 0x2230fb28 name: "c" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() } elf_symbol { id: 0x63f6f9b1 name: "d" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x63f6f9b1 + symbol_id: 0xa7b0241d # void a() + symbol_id: 0xe371117a # void b() + symbol_id: 0x2230fb28 # void c() + symbol_id: 0x63f6f9b1 # void d() } diff --git a/test_cases/info_tests/symbol/expected/visibility_c.elf_stg b/test_cases/info_tests/symbol/expected/visibility_c.elf_stg index f122793..eec44c6 100644 --- a/test_cases/info_tests/symbol/expected/visibility_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/visibility_c.elf_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0xa7b0241d name: "a" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "a" } elf_symbol { @@ -22,11 +22,11 @@ elf_symbol { is_defined: true symbol_type: FUNCTION visibility: PROTECTED - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "b" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a + symbol_id: 0xa7b0241d # void a() + symbol_id: 0xe371117a # void b() } diff --git a/test_cases/info_tests/symbol/expected/visibility_cc.elf_stg b/test_cases/info_tests/symbol/expected/visibility_cc.elf_stg index a1d67e7..5b6960d 100644 --- a/test_cases/info_tests/symbol/expected/visibility_cc.elf_stg +++ b/test_cases/info_tests/symbol/expected/visibility_cc.elf_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0x60468be1 name: "_Z1av" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "a" } elf_symbol { @@ -22,11 +22,11 @@ elf_symbol { is_defined: true symbol_type: FUNCTION visibility: PROTECTED - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "b" } interface { id: 0x84ea5130 - symbol_id: 0x60468be1 - symbol_id: 0xfe73b6f7 + symbol_id: 0x60468be1 # void a() + symbol_id: 0xfe73b6f7 # void b() } diff --git a/test_cases/info_tests/symbol/expected/weak_c.btf_stg b/test_cases/info_tests/symbol/expected/weak_c.btf_stg index 77dd33e..da26a11 100644 --- a/test_cases/info_tests/symbol/expected/weak_c.btf_stg +++ b/test_cases/info_tests/symbol/expected/weak_c.btf_stg @@ -1,21 +1,21 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0x7709bd40 name: "x" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # void x() } diff --git a/test_cases/info_tests/symbol/expected/weak_c.elf_stg b/test_cases/info_tests/symbol/expected/weak_c.elf_stg index 41d7867..5d8023a 100644 --- a/test_cases/info_tests/symbol/expected/weak_c.elf_stg +++ b/test_cases/info_tests/symbol/expected/weak_c.elf_stg @@ -1,12 +1,12 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0x7709bd40 @@ -14,10 +14,10 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # void x() } diff --git a/test_cases/info_tests/symbol/expected/weak_cc.elf_stg b/test_cases/info_tests/symbol/expected/weak_cc.elf_stg index 8e222d7..6d62d79 100644 --- a/test_cases/info_tests/symbol/expected/weak_cc.elf_stg +++ b/test_cases/info_tests/symbol/expected/weak_cc.elf_stg @@ -1,12 +1,12 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0xf285345b @@ -14,10 +14,10 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0xf285345b + symbol_id: 0xf285345b # void x() } diff --git a/test_cases/info_tests/template/expected/template_class_cc.elf_stg b/test_cases/info_tests/template/expected/template_class_cc.elf_stg index ea347ae..e0b17e3 100644 --- a/test_cases/info_tests/template/expected/template_class_cc.elf_stg +++ b/test_cases/info_tests/template/expected/template_class_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -9,12 +9,12 @@ primitive { array { id: 0x9d362140 number_of_elements: 17 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } member { id: 0xe0b89aa0 name: "member" - type_id: 0x9d362140 + type_id: 0x9d362140 # int[17] } struct_union { id: 0x0515f337 @@ -22,7 +22,7 @@ struct_union { name: "wrapper<int, 17>" definition { bytesize: 68 - member_id: 0xe0b89aa0 + member_id: 0xe0b89aa0 # int member[17] } } elf_symbol { @@ -30,10 +30,10 @@ elf_symbol { name: "variable" is_defined: true symbol_type: OBJECT - type_id: 0x0515f337 + type_id: 0x0515f337 # struct wrapper<int, 17> full_name: "variable" } interface { id: 0x84ea5130 - symbol_id: 0x4529dee2 + symbol_id: 0x4529dee2 # struct wrapper<int, 17> variable } diff --git a/test_cases/info_tests/template/expected/template_function_cc.elf_stg b/test_cases/info_tests/template/expected/template_function_cc.elf_stg index 188f807..3cf16cd 100644 --- a/test_cases/info_tests/template/expected/template_function_cc.elf_stg +++ b/test_cases/info_tests/template/expected/template_function_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,7 +7,7 @@ special { pointer_reference { id: 0xde581bbb kind: LVALUE_REFERENCE - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -17,12 +17,12 @@ primitive { } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } function { id: 0x270e577d - return_type_id: 0x48b5725f - parameter_id: 0xde581bbb + return_type_id: 0x48b5725f # void + parameter_id: 0xde581bbb # int& } elf_symbol { id: 0x8a449676 @@ -30,7 +30,7 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x270e577d + type_id: 0x270e577d # void(int&) full_name: "func<int, 17>" } elf_symbol { @@ -38,11 +38,11 @@ elf_symbol { name: "_Z7triggerv" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "trigger" } interface { id: 0x84ea5130 - symbol_id: 0x8a449676 - symbol_id: 0x9fd01bb1 + symbol_id: 0x8a449676 # void func<int, 17>(int&) + symbol_id: 0x9fd01bb1 # void trigger() } diff --git a/test_cases/info_tests/template/expected/template_member_function_cc.elf_stg b/test_cases/info_tests/template/expected/template_member_function_cc.elf_stg index 6f6bd93..5ad800d 100644 --- a/test_cases/info_tests/template/expected/template_member_function_cc.elf_stg +++ b/test_cases/info_tests/template/expected/template_member_function_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x3ad526c8 kind: POINTER - pointee_type_id: 0xc1147dbd + pointee_type_id: 0xc1147dbd # struct A } pointer_reference { id: 0xde581bbb kind: LVALUE_REFERENCE - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0xf7d5301f kind: LVALUE_REFERENCE - pointee_type_id: 0xc1147dbd + pointee_type_id: 0xc1147dbd # struct A } primitive { id: 0x6720d32f @@ -35,21 +35,21 @@ struct_union { } function { id: 0x1d54784f - return_type_id: 0x48b5725f - parameter_id: 0x3ad526c8 - parameter_id: 0xde581bbb + return_type_id: 0x48b5725f # void + parameter_id: 0x3ad526c8 # struct A* + parameter_id: 0xde581bbb # int& } function { id: 0x2d6d1d94 - return_type_id: 0x48b5725f - parameter_id: 0xf7d5301f + return_type_id: 0x48b5725f # void + parameter_id: 0xf7d5301f # struct A& } elf_symbol { id: 0x698c1373 name: "_Z7triggerR1A" is_defined: true symbol_type: FUNCTION - type_id: 0x2d6d1d94 + type_id: 0x2d6d1d94 # void(struct A&) full_name: "trigger" } elf_symbol { @@ -58,11 +58,11 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x1d54784f + type_id: 0x1d54784f # void(struct A*, int&) full_name: "A::func<int, 17>" } interface { id: 0x84ea5130 - symbol_id: 0x698c1373 - symbol_id: 0x30ccf441 + symbol_id: 0x698c1373 # void trigger(struct A&) + symbol_id: 0x30ccf441 # void A::func<int, 17>(struct A*, int&) } diff --git a/test_cases/info_tests/template/expected/template_parameter_cc.elf_stg b/test_cases/info_tests/template/expected/template_parameter_cc.elf_stg index f44fb07..4c015bf 100644 --- a/test_cases/info_tests/template/expected/template_parameter_cc.elf_stg +++ b/test_cases/info_tests/template/expected/template_parameter_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -9,92 +9,92 @@ primitive { array { id: 0x9d362140 number_of_elements: 17 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } member { id: 0x80bcb4cd name: "a" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x4cff5574 name: "b" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 32 } member { id: 0x4cff584f name: "b" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x0f3f9186 name: "c" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 32 } member { id: 0xc37de7d7 name: "d" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 64 } member { id: 0x874410b0 name: "e" - type_id: 0x9d362140 + type_id: 0x9d362140 # int[17] } member { id: 0x41fcdfad name: "f" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 544 } member { id: 0x023d43d4 name: "g" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 576 } member { id: 0xa8938b2e name: "h" - type_id: 0x7578447d + type_id: 0x7578447d # struct T1<int> } member { id: 0x86c14d13 name: "i" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x2d952030 name: "j" - type_id: 0xa5c1eab5 + type_id: 0xa5c1eab5 # struct T2<int, int> } member { id: 0x6940985f name: "k" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0xc5d22295 name: "l" - type_id: 0xcb978265 + type_id: 0xcb978265 # struct T3<17, int> } member { id: 0x8dbf3d30 name: "m" - type_id: 0x6720d32f + type_id: 0x6720d32f # int } member { id: 0x46ee5fe7 name: "n" - type_id: 0x8891f0f8 + type_id: 0x8891f0f8 # union T6<T3> } member { id: 0x04420382 name: "o" - type_id: 0x6720d32f + type_id: 0x6720d32f # int offset: 608 } struct_union { @@ -103,8 +103,8 @@ struct_union { name: "T1<int>" definition { bytesize: 8 - member_id: 0x80bcb4cd - member_id: 0x4cff5574 + member_id: 0x80bcb4cd # int a + member_id: 0x4cff5574 # int b } } struct_union { @@ -113,9 +113,9 @@ struct_union { name: "T2<int, int>" definition { bytesize: 12 - member_id: 0x4cff584f - member_id: 0x0f3f9186 - member_id: 0xc37de7d7 + member_id: 0x4cff584f # int b + member_id: 0x0f3f9186 # int c + member_id: 0xc37de7d7 # int d } } struct_union { @@ -124,9 +124,9 @@ struct_union { name: "T3<17, int>" definition { bytesize: 76 - member_id: 0x874410b0 - member_id: 0x41fcdfad - member_id: 0x023d43d4 + member_id: 0x874410b0 # int e[17] + member_id: 0x41fcdfad # int f + member_id: 0x023d43d4 # int g } } struct_union { @@ -135,8 +135,8 @@ struct_union { name: "T4<T1>" definition { bytesize: 8 - member_id: 0xa8938b2e - member_id: 0x86c14d13 + member_id: 0xa8938b2e # struct T1<int> h + member_id: 0x86c14d13 # int i } } struct_union { @@ -145,8 +145,8 @@ struct_union { name: "T5<T2>" definition { bytesize: 12 - member_id: 0x2d952030 - member_id: 0x6940985f + member_id: 0x2d952030 # struct T2<int, int> j + member_id: 0x6940985f # int k } } struct_union { @@ -155,8 +155,8 @@ struct_union { name: "T6<T3>" definition { bytesize: 76 - member_id: 0xc5d22295 - member_id: 0x8dbf3d30 + member_id: 0xc5d22295 # struct T3<17, int> l + member_id: 0x8dbf3d30 # int m } } struct_union { @@ -165,8 +165,8 @@ struct_union { name: "T7<T6>" definition { bytesize: 80 - member_id: 0x46ee5fe7 - member_id: 0x04420382 + member_id: 0x46ee5fe7 # union T6<T3> n + member_id: 0x04420382 # int o } } elf_symbol { @@ -174,7 +174,7 @@ elf_symbol { name: "v1" is_defined: true symbol_type: OBJECT - type_id: 0xd94d74b0 + type_id: 0xd94d74b0 # union T4<T1> full_name: "v1" } elf_symbol { @@ -182,7 +182,7 @@ elf_symbol { name: "v2" is_defined: true symbol_type: OBJECT - type_id: 0x5e0ea2b4 + type_id: 0x5e0ea2b4 # union T5<T2> full_name: "v2" } elf_symbol { @@ -190,7 +190,7 @@ elf_symbol { name: "v3" is_defined: true symbol_type: OBJECT - type_id: 0x8891f0f8 + type_id: 0x8891f0f8 # union T6<T3> full_name: "v3" } elf_symbol { @@ -198,13 +198,13 @@ elf_symbol { name: "v4" is_defined: true symbol_type: OBJECT - type_id: 0x886d9bb6 + type_id: 0x886d9bb6 # struct T7<T6> full_name: "v4" } interface { id: 0x84ea5130 - symbol_id: 0xab18a5e8 - symbol_id: 0x975e59cf - symbol_id: 0x2999e447 - symbol_id: 0x19de9370 + symbol_id: 0xab18a5e8 # union T4<T1> v1 + symbol_id: 0x975e59cf # union T5<T2> v2 + symbol_id: 0x2999e447 # union T6<T3> v3 + symbol_id: 0x19de9370 # struct T7<T6> v4 } diff --git a/test_cases/info_tests/template/expected/template_typedef_cc.elf_stg b/test_cases/info_tests/template/expected/template_typedef_cc.elf_stg index 7db268b..318c716 100644 --- a/test_cases/info_tests/template/expected/template_typedef_cc.elf_stg +++ b/test_cases/info_tests/template/expected/template_typedef_cc.elf_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0xd9d16158 name: "A<bool, 17>" - referred_type_id: 0x9c55ba7e + referred_type_id: 0x9c55ba7e # bool[17] } typedef { id: 0xc2355d02 name: "A<int, 17>" - referred_type_id: 0x9d362140 + referred_type_id: 0x9d362140 # int[17] } primitive { id: 0x62aebfd4 @@ -25,19 +25,19 @@ primitive { array { id: 0x9c55ba7e number_of_elements: 17 - element_type_id: 0x62aebfd4 + element_type_id: 0x62aebfd4 # bool } array { id: 0x9d362140 number_of_elements: 17 - element_type_id: 0x6720d32f + element_type_id: 0x6720d32f # int } elf_symbol { id: 0x7709bd40 name: "x" is_defined: true symbol_type: OBJECT - type_id: 0xc2355d02 + type_id: 0xc2355d02 # A<int, 17> full_name: "x" } elf_symbol { @@ -45,11 +45,11 @@ elf_symbol { name: "y" is_defined: true symbol_type: OBJECT - type_id: 0xd9d16158 + type_id: 0xd9d16158 # A<bool, 17> full_name: "y" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 - symbol_id: 0xb5c9c657 + symbol_id: 0x7709bd40 # A<int, 17> x + symbol_id: 0xb5c9c657 # A<bool, 17> y } diff --git a/test_cases/info_tests/template/expected/value_parameter_cc.elf_stg b/test_cases/info_tests/template/expected/value_parameter_cc.elf_stg index 24f9d2d..ec30b74 100644 --- a/test_cases/info_tests/template/expected/value_parameter_cc.elf_stg +++ b/test_cases/info_tests/template/expected/value_parameter_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0xc3b63b14 kind: LVALUE_REFERENCE - pointee_type_id: 0x10985193 + pointee_type_id: 0x10985193 # void() } pointer_reference { id: 0xf6e6592a kind: LVALUE_REFERENCE - pointee_type_id: 0xc5d9d969 + pointee_type_id: 0xc5d9d969 # const int } qualified { id: 0xc5d9d969 qualifier: CONST - qualified_type_id: 0x6720d32f + qualified_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -107,14 +107,14 @@ struct_union { } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0x65e66866 name: "_Z1ev" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "e" } elf_symbol { @@ -122,7 +122,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0xf6e6592a + type_id: 0xf6e6592a # const int& full_name: "c" } elf_symbol { @@ -130,7 +130,7 @@ elf_symbol { name: "f" is_defined: true symbol_type: OBJECT - type_id: 0xc3b63b14 + type_id: 0xc3b63b14 # void(&)() full_name: "f" } elf_symbol { @@ -138,7 +138,7 @@ elf_symbol { name: "v_char" is_defined: true symbol_type: OBJECT - type_id: 0x54943dbe + type_id: 0x54943dbe # struct S<'p'> full_name: "v_char" } elf_symbol { @@ -146,7 +146,7 @@ elf_symbol { name: "v_enumerator" is_defined: true symbol_type: OBJECT - type_id: 0x2119c209 + type_id: 0x2119c209 # struct S<(K)0> full_name: "v_enumerator" } elf_symbol { @@ -154,7 +154,7 @@ elf_symbol { name: "v_function_pointer" is_defined: true symbol_type: OBJECT - type_id: 0x3a75138f + type_id: 0x3a75138f # struct S<&d> full_name: "v_function_pointer" } elf_symbol { @@ -162,7 +162,7 @@ elf_symbol { name: "v_function_reference" is_defined: true symbol_type: OBJECT - type_id: 0x31dac610 + type_id: 0x31dac610 # struct S<&e> full_name: "v_function_reference" } elf_symbol { @@ -170,7 +170,7 @@ elf_symbol { name: "v_int" is_defined: true symbol_type: OBJECT - type_id: 0x3bb4a383 + type_id: 0x3bb4a383 # struct S<15> full_name: "v_int" } elf_symbol { @@ -178,7 +178,7 @@ elf_symbol { name: "v_int_pointer" is_defined: true symbol_type: OBJECT - type_id: 0xe4d3d1c9 + type_id: 0xe4d3d1c9 # struct S<&a> full_name: "v_int_pointer" } elf_symbol { @@ -186,7 +186,7 @@ elf_symbol { name: "v_int_reference" is_defined: true symbol_type: OBJECT - type_id: 0x0e0f27de + type_id: 0x0e0f27de # struct S<4> full_name: "v_int_reference" } elf_symbol { @@ -194,7 +194,7 @@ elf_symbol { name: "v_nullptr" is_defined: true symbol_type: OBJECT - type_id: 0x0257c3b9 + type_id: 0x0257c3b9 # struct S<nullptr> full_name: "v_nullptr" } elf_symbol { @@ -202,7 +202,7 @@ elf_symbol { name: "v_pointer_to_member" is_defined: true symbol_type: OBJECT - type_id: 0x04d4366e + type_id: 0x04d4366e # struct S<&H::i2> full_name: "v_pointer_to_member" } elf_symbol { @@ -210,22 +210,22 @@ elf_symbol { name: "v_pointer_to_method" is_defined: true symbol_type: OBJECT - type_id: 0x8fd5ff58 + type_id: 0x8fd5ff58 # struct S<&H::j2> full_name: "v_pointer_to_method" } interface { id: 0x84ea5130 - symbol_id: 0x65e66866 - symbol_id: 0x2230fb28 - symbol_id: 0xe0778f95 - symbol_id: 0xea07c015 - symbol_id: 0xc31d4af7 - symbol_id: 0x87e5aa8a - symbol_id: 0x2c4cacfa - symbol_id: 0x40715147 - symbol_id: 0x575714fe - symbol_id: 0xe323633f - symbol_id: 0x481dfc0e - symbol_id: 0xcb9e41aa - symbol_id: 0x3dc86173 + symbol_id: 0x65e66866 # void e() + symbol_id: 0x2230fb28 # const int& c + symbol_id: 0xe0778f95 # void(& f)() + symbol_id: 0xea07c015 # struct S<'p'> v_char + symbol_id: 0xc31d4af7 # struct S<(K)0> v_enumerator + symbol_id: 0x87e5aa8a # struct S<&d> v_function_pointer + symbol_id: 0x2c4cacfa # struct S<&e> v_function_reference + symbol_id: 0x40715147 # struct S<15> v_int + symbol_id: 0x575714fe # struct S<&a> v_int_pointer + symbol_id: 0xe323633f # struct S<4> v_int_reference + symbol_id: 0x481dfc0e # struct S<nullptr> v_nullptr + symbol_id: 0xcb9e41aa # struct S<&H::i2> v_pointer_to_member + symbol_id: 0x3dc86173 # struct S<&H::j2> v_pointer_to_method } diff --git a/test_cases/info_tests/template/expected/variadic_template_alias_cc.elf_stg b/test_cases/info_tests/template/expected/variadic_template_alias_cc.elf_stg index ff7fdd4..eba6203 100644 --- a/test_cases/info_tests/template/expected/variadic_template_alias_cc.elf_stg +++ b/test_cases/info_tests/template/expected/variadic_template_alias_cc.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0xda6f7726 name: "Jones<int, bool, char>" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -16,10 +16,10 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0xda6f7726 + type_id: 0xda6f7726 # Jones<int, bool, char> full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # Jones<int, bool, char> x } diff --git a/test_cases/info_tests/template/expected/variadic_template_class_cc.elf_stg b/test_cases/info_tests/template/expected/variadic_template_class_cc.elf_stg index 13eee26..e621f2d 100644 --- a/test_cases/info_tests/template/expected/variadic_template_class_cc.elf_stg +++ b/test_cases/info_tests/template/expected/variadic_template_class_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface struct_union { id: 0xcb563532 kind: STRUCT @@ -13,10 +13,10 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0xcb563532 + type_id: 0xcb563532 # struct Smith<int, bool, char> full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # struct Smith<int, bool, char> x } diff --git a/test_cases/info_tests/template/expected/variadic_template_function_cc.elf_stg b/test_cases/info_tests/template/expected/variadic_template_function_cc.elf_stg index a1e710c..849b0a9 100644 --- a/test_cases/info_tests/template/expected/variadic_template_function_cc.elf_stg +++ b/test_cases/info_tests/template/expected/variadic_template_function_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,17 +7,17 @@ special { pointer_reference { id: 0x62fb2bb2 kind: RVALUE_REFERENCE - pointee_type_id: 0x62aebfd4 + pointee_type_id: 0x62aebfd4 # bool } pointer_reference { id: 0x6398b08c kind: RVALUE_REFERENCE - pointee_type_id: 0x6720d32f + pointee_type_id: 0x6720d32f # int } pointer_reference { id: 0x74435b18 kind: RVALUE_REFERENCE - pointee_type_id: 0x384f7d7c + pointee_type_id: 0x384f7d7c # char } primitive { id: 0x384f7d7c @@ -39,21 +39,21 @@ primitive { } function { id: 0x09e881c8 - return_type_id: 0x48b5725f - parameter_id: 0x6398b08c - parameter_id: 0x62fb2bb2 - parameter_id: 0x74435b18 + return_type_id: 0x48b5725f # void + parameter_id: 0x6398b08c # int&& + parameter_id: 0x62fb2bb2 # bool&& + parameter_id: 0x74435b18 # char&& } function { id: 0x10985193 - return_type_id: 0x48b5725f + return_type_id: 0x48b5725f # void } elf_symbol { id: 0xe79339c6 name: "_Z1fv" is_defined: true symbol_type: FUNCTION - type_id: 0x10985193 + type_id: 0x10985193 # void() full_name: "f" } elf_symbol { @@ -62,11 +62,11 @@ elf_symbol { is_defined: true symbol_type: FUNCTION binding: WEAK - type_id: 0x09e881c8 + type_id: 0x09e881c8 # void(int&&, bool&&, char&&) full_name: "func<int, bool, char>" } interface { id: 0x84ea5130 - symbol_id: 0xe79339c6 - symbol_id: 0xce316f1b + symbol_id: 0xe79339c6 # void f() + symbol_id: 0xce316f1b # void func<int, bool, char>(int&&, bool&&, char&&) } diff --git a/test_cases/info_tests/template/expected/variadic_template_variable_cc.elf_stg b/test_cases/info_tests/template/expected/variadic_template_variable_cc.elf_stg index 250e010..35c7a1b 100644 --- a/test_cases/info_tests/template/expected/variadic_template_variable_cc.elf_stg +++ b/test_cases/info_tests/template/expected/variadic_template_variable_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x33756485 name: "unsigned long" @@ -11,10 +11,10 @@ elf_symbol { name: "x" is_defined: true symbol_type: OBJECT - type_id: 0x33756485 + type_id: 0x33756485 # unsigned long full_name: "x" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 + symbol_id: 0x7709bd40 # unsigned long x } diff --git a/test_cases/info_tests/type_roots/expected/types_cc.elf_stg b/test_cases/info_tests/type_roots/expected/types_cc.elf_stg index 9e4def8..b49b7fa 100644 --- a/test_cases/info_tests/type_roots/expected/types_cc.elf_stg +++ b/test_cases/info_tests/type_roots/expected/types_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,27 +7,27 @@ special { pointer_reference { id: 0x1200d1dc kind: POINTER - pointee_type_id: 0x6243a1ef + pointee_type_id: 0x6243a1ef # struct S2 } pointer_reference { id: 0x20b816bd kind: POINTER - pointee_type_id: 0xa8a0bc6a + pointee_type_id: 0xa8a0bc6a # union U2 } pointer_reference { id: 0x2be23006 kind: POINTER - pointee_type_id: 0x85c82684 + pointee_type_id: 0x85c82684 # enum E2 } typedef { id: 0xe9e9f0af name: "T1" - referred_type_id: 0x5d8155a5 + referred_type_id: 0x5d8155a5 # unsigned char } typedef { id: 0xab298d57 name: "T2" - referred_type_id: 0x186c44db + referred_type_id: 0x186c44db # struct { } } primitive { id: 0x4585663f @@ -78,7 +78,7 @@ enumeration { id: 0xb06ea7a9 name: "E1" definition { - underlying_type_id: 0x4585663f + underlying_type_id: 0x4585663f # unsigned int } } enumeration { @@ -87,30 +87,30 @@ enumeration { } function { id: 0x3c3a5242 - return_type_id: 0x48b5725f - parameter_id: 0xb06ea7a9 - parameter_id: 0x2be23006 - parameter_id: 0x59489d72 - parameter_id: 0x1200d1dc - parameter_id: 0xe9e9f0af - parameter_id: 0xab298d57 - parameter_id: 0x264d3dec - parameter_id: 0x20b816bd + return_type_id: 0x48b5725f # void + parameter_id: 0xb06ea7a9 # enum E1 + parameter_id: 0x2be23006 # enum E2* + parameter_id: 0x59489d72 # struct S1 + parameter_id: 0x1200d1dc # struct S2* + parameter_id: 0xe9e9f0af # T1 + parameter_id: 0xab298d57 # T2 + parameter_id: 0x264d3dec # union U1 + parameter_id: 0x20b816bd # union U2* } elf_symbol { id: 0xedaed4d8 name: "_Z4func2E1P2E22S1P2S2h2T22U1P2U2" is_defined: true symbol_type: FUNCTION - type_id: 0x3c3a5242 + type_id: 0x3c3a5242 # void(enum E1, enum E2*, struct S1, struct S2*, T1, T2, union U1, union U2*) full_name: "func" } interface { id: 0x84ea5130 - symbol_id: 0xedaed4d8 - type_id: 0xe9e9f0af - type_id: 0xab298d57 - type_id: 0xb06ea7a9 - type_id: 0x59489d72 - type_id: 0x264d3dec + symbol_id: 0xedaed4d8 # void func(enum E1, enum E2*, struct S1, struct S2*, T1, T2, union U1, union U2*) + type_id: 0xe9e9f0af # T1 + type_id: 0xab298d57 # T2 + type_id: 0xb06ea7a9 # enum E1 + type_id: 0x59489d72 # struct S1 + type_id: 0x264d3dec # union U1 } diff --git a/test_cases/info_tests/typedef/expected/chain_c.btf_stg b/test_cases/info_tests/typedef/expected/chain_c.btf_stg index 48ab534..dd5af6a 100644 --- a/test_cases/info_tests/typedef/expected/chain_c.btf_stg +++ b/test_cases/info_tests/typedef/expected/chain_c.btf_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x4c2182f3 name: "INT_1" - referred_type_id: 0x4585663f + referred_type_id: 0x4585663f # unsigned int } typedef { id: 0x8be225a3 name: "INT_2" - referred_type_id: 0x4c2182f3 + referred_type_id: 0x4c2182f3 # INT_1 } typedef { id: 0xcaa2df0c name: "INT_3" - referred_type_id: 0x8be225a3 + referred_type_id: 0x8be225a3 # INT_2 } primitive { id: 0x4585663f @@ -24,7 +24,7 @@ primitive { member { id: 0xa078c909 name: "x" - type_id: 0xcaa2df0c + type_id: 0xcaa2df0c # INT_3 } struct_union { id: 0xb88f5ef1 @@ -32,22 +32,22 @@ struct_union { name: "foo" definition { bytesize: 4 - member_id: 0xa078c909 + member_id: 0xa078c909 # INT_3 x } } function { id: 0xe0f8a947 - return_type_id: 0x4585663f - parameter_id: 0xb88f5ef1 + return_type_id: 0x4585663f # unsigned int + parameter_id: 0xb88f5ef1 # struct foo } elf_symbol { id: 0xa49e03a0 name: "func" is_defined: true symbol_type: FUNCTION - type_id: 0xe0f8a947 + type_id: 0xe0f8a947 # unsigned int(struct foo) } interface { id: 0x84ea5130 - symbol_id: 0xa49e03a0 + symbol_id: 0xa49e03a0 # unsigned int func(struct foo) } diff --git a/test_cases/info_tests/typedef/expected/chain_c.elf_stg b/test_cases/info_tests/typedef/expected/chain_c.elf_stg index 99004e0..136f67c 100644 --- a/test_cases/info_tests/typedef/expected/chain_c.elf_stg +++ b/test_cases/info_tests/typedef/expected/chain_c.elf_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x4c2182f3 name: "INT_1" - referred_type_id: 0x4585663f + referred_type_id: 0x4585663f # unsigned int } typedef { id: 0x8be225a3 name: "INT_2" - referred_type_id: 0x4c2182f3 + referred_type_id: 0x4c2182f3 # INT_1 } typedef { id: 0xcaa2df0c name: "INT_3" - referred_type_id: 0x8be225a3 + referred_type_id: 0x8be225a3 # INT_2 } primitive { id: 0x4585663f @@ -24,7 +24,7 @@ primitive { member { id: 0xa078c909 name: "x" - type_id: 0xcaa2df0c + type_id: 0xcaa2df0c # INT_3 } struct_union { id: 0xb88f5ef1 @@ -32,23 +32,23 @@ struct_union { name: "foo" definition { bytesize: 4 - member_id: 0xa078c909 + member_id: 0xa078c909 # INT_3 x } } function { id: 0xe0f8a947 - return_type_id: 0x4585663f - parameter_id: 0xb88f5ef1 + return_type_id: 0x4585663f # unsigned int + parameter_id: 0xb88f5ef1 # struct foo } elf_symbol { id: 0xa49e03a0 name: "func" is_defined: true symbol_type: FUNCTION - type_id: 0xe0f8a947 + type_id: 0xe0f8a947 # unsigned int(struct foo) full_name: "func" } interface { id: 0x84ea5130 - symbol_id: 0xa49e03a0 + symbol_id: 0xa49e03a0 # unsigned int func(struct foo) } diff --git a/test_cases/info_tests/typedef/expected/nullptr_cc.elf_stg b/test_cases/info_tests/typedef/expected/nullptr_cc.elf_stg index 357d0e5..3a3bbd7 100644 --- a/test_cases/info_tests/typedef/expected/nullptr_cc.elf_stg +++ b/test_cases/info_tests/typedef/expected/nullptr_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -11,22 +11,22 @@ special { typedef { id: 0xb19fc2d0 name: "nullptr_t" - referred_type_id: 0x0bbde79e + referred_type_id: 0x0bbde79e # decltype(nullptr) } function { id: 0x3cffa127 - return_type_id: 0x48b5725f - parameter_id: 0xb19fc2d0 + return_type_id: 0x48b5725f # void + parameter_id: 0xb19fc2d0 # nullptr_t } elf_symbol { id: 0x9a0c90e8 name: "_Z3fooDn" is_defined: true symbol_type: FUNCTION - type_id: 0x3cffa127 + type_id: 0x3cffa127 # void(nullptr_t) full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x9a0c90e8 + symbol_id: 0x9a0c90e8 # void foo(nullptr_t) } diff --git a/test_cases/info_tests/typedef/expected/scoped_composite_nested_struct_cc.elf_stg b/test_cases/info_tests/typedef/expected/scoped_composite_nested_struct_cc.elf_stg index 71cbad4..890d7eb 100644 --- a/test_cases/info_tests/typedef/expected/scoped_composite_nested_struct_cc.elf_stg +++ b/test_cases/info_tests/typedef/expected/scoped_composite_nested_struct_cc.elf_stg @@ -1,19 +1,19 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0xfb6cf44f name: "Scope::UnnamedClass" - referred_type_id: 0x3bed8a5a + referred_type_id: 0x3bed8a5a # struct { struct Scope::<unnamed struct>::Nested nested; } } typedef { id: 0xcab74faf name: "Scope::UnnamedStruct" - referred_type_id: 0x3bed8a5a + referred_type_id: 0x3bed8a5a # struct { struct Scope::<unnamed struct>::Nested nested; } } typedef { id: 0xceeae534 name: "Scope::UnnamedUnion" - referred_type_id: 0x755cd280 + referred_type_id: 0x755cd280 # union { struct Scope::<unnamed union>::Nested nested; } } primitive { id: 0xfc0e1dbd @@ -24,24 +24,24 @@ primitive { member { id: 0x8e073a07 name: "nested" - type_id: 0x5b06e344 + type_id: 0x5b06e344 # struct Scope::<unnamed struct>::Nested } member { id: 0x8e983d07 name: "nested" - type_id: 0xc401e384 + type_id: 0xc401e384 # struct Scope::<unnamed union>::Nested } member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0x3bed8a5a kind: STRUCT definition { bytesize: 8 - member_id: 0x8e073a07 + member_id: 0x8e073a07 # struct Scope::<unnamed struct>::Nested nested } } struct_union { @@ -49,7 +49,7 @@ struct_union { kind: UNION definition { bytesize: 8 - member_id: 0x8e983d07 + member_id: 0x8e983d07 # struct Scope::<unnamed union>::Nested nested } } struct_union { @@ -58,7 +58,7 @@ struct_union { name: "Scope::<unnamed struct>::Nested" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } struct_union { @@ -67,7 +67,7 @@ struct_union { name: "Scope::<unnamed union>::Nested" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } elf_symbol { @@ -75,7 +75,7 @@ elf_symbol { name: "unnamed_class" is_defined: true symbol_type: OBJECT - type_id: 0xfb6cf44f + type_id: 0xfb6cf44f # Scope::UnnamedClass full_name: "unnamed_class" } elf_symbol { @@ -83,7 +83,7 @@ elf_symbol { name: "unnamed_struct" is_defined: true symbol_type: OBJECT - type_id: 0xcab74faf + type_id: 0xcab74faf # Scope::UnnamedStruct full_name: "unnamed_struct" } elf_symbol { @@ -91,12 +91,12 @@ elf_symbol { name: "unnamed_union" is_defined: true symbol_type: OBJECT - type_id: 0xceeae534 + type_id: 0xceeae534 # Scope::UnnamedUnion full_name: "unnamed_union" } interface { id: 0x84ea5130 - symbol_id: 0x07764df4 - symbol_id: 0x9f8f7d6d - symbol_id: 0x1b55b488 + symbol_id: 0x07764df4 # Scope::UnnamedClass unnamed_class + symbol_id: 0x9f8f7d6d # Scope::UnnamedStruct unnamed_struct + symbol_id: 0x1b55b488 # Scope::UnnamedUnion unnamed_union } diff --git a/test_cases/info_tests/typedef/expected/simple_c.btf_stg b/test_cases/info_tests/typedef/expected/simple_c.btf_stg index 9bfa4a3..b9db0a8 100644 --- a/test_cases/info_tests/typedef/expected/simple_c.btf_stg +++ b/test_cases/info_tests/typedef/expected/simple_c.btf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x1e70e31d name: "large" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -20,7 +20,7 @@ primitive { member { id: 0xa0ac1b35 name: "x" - type_id: 0x1e70e31d + type_id: 0x1e70e31d # large } struct_union { id: 0xb88f5ef1 @@ -28,35 +28,35 @@ struct_union { name: "foo" definition { bytesize: 4 - member_id: 0xa0ac1b35 + member_id: 0xa0ac1b35 # large x } } function { id: 0x8903ec25 - return_type_id: 0xfc0e1dbd - parameter_id: 0xb88f5ef1 + return_type_id: 0xfc0e1dbd # long + parameter_id: 0xb88f5ef1 # struct foo } function { id: 0xa0bc035e - return_type_id: 0xfc0e1dbd - parameter_id: 0x1e70e31d + return_type_id: 0xfc0e1dbd # long + parameter_id: 0x1e70e31d # large } elf_symbol { id: 0x55bca565 name: "id1" is_defined: true symbol_type: FUNCTION - type_id: 0x8903ec25 + type_id: 0x8903ec25 # long(struct foo) } elf_symbol { id: 0x947ccf1d name: "id2" is_defined: true symbol_type: FUNCTION - type_id: 0xa0bc035e + type_id: 0xa0bc035e # long(large) } interface { id: 0x84ea5130 - symbol_id: 0x55bca565 - symbol_id: 0x947ccf1d + symbol_id: 0x55bca565 # long id1(struct foo) + symbol_id: 0x947ccf1d # long id2(large) } diff --git a/test_cases/info_tests/typedef/expected/simple_c.elf_stg b/test_cases/info_tests/typedef/expected/simple_c.elf_stg index 77f3b7c..ed90456 100644 --- a/test_cases/info_tests/typedef/expected/simple_c.elf_stg +++ b/test_cases/info_tests/typedef/expected/simple_c.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x1e70e31d name: "large" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -20,7 +20,7 @@ primitive { member { id: 0xa0ac1b35 name: "x" - type_id: 0x1e70e31d + type_id: 0x1e70e31d # large } struct_union { id: 0xb88f5ef1 @@ -28,25 +28,25 @@ struct_union { name: "foo" definition { bytesize: 4 - member_id: 0xa0ac1b35 + member_id: 0xa0ac1b35 # large x } } function { id: 0x8903ec25 - return_type_id: 0xfc0e1dbd - parameter_id: 0xb88f5ef1 + return_type_id: 0xfc0e1dbd # long + parameter_id: 0xb88f5ef1 # struct foo } function { id: 0xa0bc035e - return_type_id: 0xfc0e1dbd - parameter_id: 0x1e70e31d + return_type_id: 0xfc0e1dbd # long + parameter_id: 0x1e70e31d # large } elf_symbol { id: 0x55bca565 name: "id1" is_defined: true symbol_type: FUNCTION - type_id: 0x8903ec25 + type_id: 0x8903ec25 # long(struct foo) full_name: "id1" } elf_symbol { @@ -54,11 +54,11 @@ elf_symbol { name: "id2" is_defined: true symbol_type: FUNCTION - type_id: 0xa0bc035e + type_id: 0xa0bc035e # long(large) full_name: "id2" } interface { id: 0x84ea5130 - symbol_id: 0x55bca565 - symbol_id: 0x947ccf1d + symbol_id: 0x55bca565 # long id1(struct foo) + symbol_id: 0x947ccf1d # long id2(large) } diff --git a/test_cases/info_tests/typedef/expected/simple_cc.elf_stg b/test_cases/info_tests/typedef/expected/simple_cc.elf_stg index eab27ff..4329f40 100644 --- a/test_cases/info_tests/typedef/expected/simple_cc.elf_stg +++ b/test_cases/info_tests/typedef/expected/simple_cc.elf_stg @@ -1,9 +1,9 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x1e70e31d name: "large" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } primitive { id: 0x6720d32f @@ -20,7 +20,7 @@ primitive { member { id: 0xa0ac1b35 name: "x" - type_id: 0x1e70e31d + type_id: 0x1e70e31d # large } struct_union { id: 0xb88f5ef1 @@ -28,25 +28,25 @@ struct_union { name: "foo" definition { bytesize: 4 - member_id: 0xa0ac1b35 + member_id: 0xa0ac1b35 # large x } } function { id: 0x8903ec25 - return_type_id: 0xfc0e1dbd - parameter_id: 0xb88f5ef1 + return_type_id: 0xfc0e1dbd # long + parameter_id: 0xb88f5ef1 # struct foo } function { id: 0xa0bc035e - return_type_id: 0xfc0e1dbd - parameter_id: 0x1e70e31d + return_type_id: 0xfc0e1dbd # long + parameter_id: 0x1e70e31d # large } elf_symbol { id: 0x7ecd75c6 name: "_Z3id13foo" is_defined: true symbol_type: FUNCTION - type_id: 0x8903ec25 + type_id: 0x8903ec25 # long(struct foo) full_name: "id1" } elf_symbol { @@ -54,11 +54,11 @@ elf_symbol { name: "_Z3id2i" is_defined: true symbol_type: FUNCTION - type_id: 0xa0bc035e + type_id: 0xa0bc035e # long(large) full_name: "id2" } interface { id: 0x84ea5130 - symbol_id: 0x7ecd75c6 - symbol_id: 0x763ddaba + symbol_id: 0x7ecd75c6 # long id1(struct foo) + symbol_id: 0x763ddaba # long id2(large) } diff --git a/test_cases/info_tests/typedef/expected/using_and_typedef_cc.elf_stg b/test_cases/info_tests/typedef/expected/using_and_typedef_cc.elf_stg index 6e9b302..ece90fa 100644 --- a/test_cases/info_tests/typedef/expected/using_and_typedef_cc.elf_stg +++ b/test_cases/info_tests/typedef/expected/using_and_typedef_cc.elf_stg @@ -1,14 +1,14 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface typedef { id: 0x1e70e31d name: "large" - referred_type_id: 0x6720d32f + referred_type_id: 0x6720d32f # int } typedef { id: 0x8a4b42d3 name: "small" - referred_type_id: 0xb0312d5a + referred_type_id: 0xb0312d5a # short } primitive { id: 0x6720d32f @@ -24,18 +24,18 @@ primitive { } function { id: 0x444df63a - return_type_id: 0x8a4b42d3 + return_type_id: 0x8a4b42d3 # small } function { id: 0xa208cc61 - return_type_id: 0x1e70e31d + return_type_id: 0x1e70e31d # large } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0xa208cc61 + type_id: 0xa208cc61 # large() full_name: "bar" } elf_symbol { @@ -43,11 +43,11 @@ elf_symbol { name: "_Z3foov" is_defined: true symbol_type: FUNCTION - type_id: 0x444df63a + type_id: 0x444df63a # small() full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 - symbol_id: 0x10da60a3 + symbol_id: 0x92009dc1 # large bar() + symbol_id: 0x10da60a3 # small foo() } diff --git a/test_cases/info_tests/typedef/expected/using_in_function_cc.elf_stg b/test_cases/info_tests/typedef/expected/using_in_function_cc.elf_stg index a81d3ef..6007bf3 100644 --- a/test_cases/info_tests/typedef/expected/using_in_function_cc.elf_stg +++ b/test_cases/info_tests/typedef/expected/using_in_function_cc.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x6720d32f name: "int" @@ -8,17 +8,17 @@ primitive { } function { id: 0x9d80e32f - return_type_id: 0x6720d32f + return_type_id: 0x6720d32f # int } elf_symbol { id: 0x92009dc1 name: "_Z3barv" is_defined: true symbol_type: FUNCTION - type_id: 0x9d80e32f + type_id: 0x9d80e32f # int() full_name: "bar" } interface { id: 0x84ea5130 - symbol_id: 0x92009dc1 + symbol_id: 0x92009dc1 # int bar() } diff --git a/test_cases/info_tests/typedef/expected/void_typedef_c.btf_stg b/test_cases/info_tests/typedef/expected/void_typedef_c.btf_stg index d8bcb44..4f1144b 100644 --- a/test_cases/info_tests/typedef/expected/void_typedef_c.btf_stg +++ b/test_cases/info_tests/typedef/expected/void_typedef_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,25 +7,25 @@ special { pointer_reference { id: 0x273ae441 kind: POINTER - pointee_type_id: 0xb6ab779b + pointee_type_id: 0xb6ab779b # nil } typedef { id: 0xb6ab779b name: "nil" - referred_type_id: 0x48b5725f + referred_type_id: 0x48b5725f # void } function { id: 0xd6101c84 - return_type_id: 0x273ae441 + return_type_id: 0x273ae441 # nil* } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0xd6101c84 + type_id: 0xd6101c84 # nil*() } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # nil* foo() } diff --git a/test_cases/info_tests/typedef/expected/void_typedef_c.elf_stg b/test_cases/info_tests/typedef/expected/void_typedef_c.elf_stg index 55d4d5f..8246c0f 100644 --- a/test_cases/info_tests/typedef/expected/void_typedef_c.elf_stg +++ b/test_cases/info_tests/typedef/expected/void_typedef_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface special { id: 0x48b5725f kind: VOID @@ -7,26 +7,26 @@ special { pointer_reference { id: 0x273ae441 kind: POINTER - pointee_type_id: 0xb6ab779b + pointee_type_id: 0xb6ab779b # nil } typedef { id: 0xb6ab779b name: "nil" - referred_type_id: 0x48b5725f + referred_type_id: 0x48b5725f # void } function { id: 0xd6101c84 - return_type_id: 0x273ae441 + return_type_id: 0x273ae441 # nil* } elf_symbol { id: 0x06f8338c name: "foo" is_defined: true symbol_type: FUNCTION - type_id: 0xd6101c84 + type_id: 0xd6101c84 # nil*() full_name: "foo" } interface { id: 0x84ea5130 - symbol_id: 0x06f8338c + symbol_id: 0x06f8338c # nil* foo() } diff --git a/test_cases/info_tests/types/expected/char_c.btf_stg b/test_cases/info_tests/types/expected/char_c.btf_stg index 99bf03f..d64ae7a 100644 --- a/test_cases/info_tests/types/expected/char_c.btf_stg +++ b/test_cases/info_tests/types/expected/char_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x384f7d7c name: "char" @@ -20,43 +20,43 @@ primitive { } function { id: 0x0ccacff7 - return_type_id: 0x384f7d7c - parameter_id: 0x384f7d7c + return_type_id: 0x384f7d7c # char + parameter_id: 0x384f7d7c # char } function { id: 0x903bc575 - return_type_id: 0x5ab350f8 - parameter_id: 0x5ab350f8 + return_type_id: 0x5ab350f8 # signed char + parameter_id: 0x5ab350f8 # signed char } function { id: 0xdab9eed2 - return_type_id: 0x5d8155a5 - parameter_id: 0x5d8155a5 + return_type_id: 0x5d8155a5 # unsigned char + parameter_id: 0x5d8155a5 # unsigned char } elf_symbol { id: 0x7709bd40 name: "x" is_defined: true symbol_type: FUNCTION - type_id: 0x903bc575 + type_id: 0x903bc575 # signed char(signed char) } elf_symbol { id: 0xb5c9c657 name: "y" is_defined: true symbol_type: FUNCTION - type_id: 0x0ccacff7 + type_id: 0x0ccacff7 # char(char) } elf_symbol { id: 0xf58aebbc name: "z" is_defined: true symbol_type: FUNCTION - type_id: 0xdab9eed2 + type_id: 0xdab9eed2 # unsigned char(unsigned char) } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 - symbol_id: 0xb5c9c657 - symbol_id: 0xf58aebbc + symbol_id: 0x7709bd40 # signed char x(signed char) + symbol_id: 0xb5c9c657 # char y(char) + symbol_id: 0xf58aebbc # unsigned char z(unsigned char) } diff --git a/test_cases/info_tests/types/expected/char_c.elf_stg b/test_cases/info_tests/types/expected/char_c.elf_stg index 52f10ad..bf11f81 100644 --- a/test_cases/info_tests/types/expected/char_c.elf_stg +++ b/test_cases/info_tests/types/expected/char_c.elf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface primitive { id: 0x384f7d7c name: "char" @@ -20,25 +20,25 @@ primitive { } function { id: 0x0ccacff7 - return_type_id: 0x384f7d7c - parameter_id: 0x384f7d7c + return_type_id: 0x384f7d7c # char + parameter_id: 0x384f7d7c # char } function { id: 0x903bc575 - return_type_id: 0x5ab350f8 - parameter_id: 0x5ab350f8 + return_type_id: 0x5ab350f8 # signed char + parameter_id: 0x5ab350f8 # signed char } function { id: 0xdab9eed2 - return_type_id: 0x5d8155a5 - parameter_id: 0x5d8155a5 + return_type_id: 0x5d8155a5 # unsigned char + parameter_id: 0x5d8155a5 # unsigned char } elf_symbol { id: 0x7709bd40 name: "x" is_defined: true symbol_type: FUNCTION - type_id: 0x903bc575 + type_id: 0x903bc575 # signed char(signed char) full_name: "x" } elf_symbol { @@ -46,7 +46,7 @@ elf_symbol { name: "y" is_defined: true symbol_type: FUNCTION - type_id: 0x0ccacff7 + type_id: 0x0ccacff7 # char(char) full_name: "y" } elf_symbol { @@ -54,12 +54,12 @@ elf_symbol { name: "z" is_defined: true symbol_type: FUNCTION - type_id: 0xdab9eed2 + type_id: 0xdab9eed2 # unsigned char(unsigned char) full_name: "z" } interface { id: 0x84ea5130 - symbol_id: 0x7709bd40 - symbol_id: 0xb5c9c657 - symbol_id: 0xf58aebbc + symbol_id: 0x7709bd40 # signed char x(signed char) + symbol_id: 0xb5c9c657 # char y(char) + symbol_id: 0xf58aebbc # unsigned char z(unsigned char) } diff --git a/test_cases/info_tests/types/expected/pointer_c.btf_stg b/test_cases/info_tests/types/expected/pointer_c.btf_stg index e91b30c..24079d1 100644 --- a/test_cases/info_tests/types/expected/pointer_c.btf_stg +++ b/test_cases/info_tests/types/expected/pointer_c.btf_stg @@ -1,5 +1,5 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface interface { id: 0x84ea5130 } diff --git a/test_cases/info_tests/types/expected/pointer_c.elf_stg b/test_cases/info_tests/types/expected/pointer_c.elf_stg index d1c44db..e4a0a7f 100644 --- a/test_cases/info_tests/types/expected/pointer_c.elf_stg +++ b/test_cases/info_tests/types/expected/pointer_c.elf_stg @@ -1,29 +1,29 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x03bcc221 kind: POINTER - pointee_type_id: 0x24b3ee1b + pointee_type_id: 0x24b3ee1b # struct foo* } pointer_reference { id: 0x0717146f kind: POINTER - pointee_type_id: 0x361cb720 + pointee_type_id: 0x361cb720 # const struct foo* } pointer_reference { id: 0x24b3ee1b kind: POINTER - pointee_type_id: 0xb88f5ef1 + pointee_type_id: 0xb88f5ef1 # struct foo } pointer_reference { id: 0x361cb720 kind: POINTER - pointee_type_id: 0xf2323a1e + pointee_type_id: 0xf2323a1e # const struct foo } qualified { id: 0xf2323a1e qualifier: CONST - qualified_type_id: 0xb88f5ef1 + qualified_type_id: 0xb88f5ef1 # struct foo } primitive { id: 0x6720d32f @@ -40,7 +40,7 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0xb88f5ef1 @@ -48,7 +48,7 @@ struct_union { name: "foo" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } elf_symbol { @@ -56,7 +56,7 @@ elf_symbol { name: "a" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "a" } elf_symbol { @@ -64,7 +64,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: OBJECT - type_id: 0xb88f5ef1 + type_id: 0xb88f5ef1 # struct foo full_name: "b" } elf_symbol { @@ -72,7 +72,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0x24b3ee1b + type_id: 0x24b3ee1b # struct foo* full_name: "c" } elf_symbol { @@ -80,7 +80,7 @@ elf_symbol { name: "e" is_defined: true symbol_type: OBJECT - type_id: 0x03bcc221 + type_id: 0x03bcc221 # struct foo** full_name: "e" } elf_symbol { @@ -88,7 +88,7 @@ elf_symbol { name: "g" is_defined: true symbol_type: OBJECT - type_id: 0xf2323a1e + type_id: 0xf2323a1e # const struct foo full_name: "g" } elf_symbol { @@ -96,7 +96,7 @@ elf_symbol { name: "h" is_defined: true symbol_type: OBJECT - type_id: 0x361cb720 + type_id: 0x361cb720 # const struct foo* full_name: "h" } elf_symbol { @@ -104,16 +104,16 @@ elf_symbol { name: "j" is_defined: true symbol_type: OBJECT - type_id: 0x0717146f + type_id: 0x0717146f # const struct foo** full_name: "j" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0xa2b65a7e - symbol_id: 0x213764e1 - symbol_id: 0x68f3ac2c - symbol_id: 0xe98c5fb8 + symbol_id: 0xa7b0241d # int a + symbol_id: 0xe371117a # struct foo b + symbol_id: 0x2230fb28 # struct foo* c + symbol_id: 0xa2b65a7e # struct foo** e + symbol_id: 0x213764e1 # const struct foo g + symbol_id: 0x68f3ac2c # const struct foo* h + symbol_id: 0xe98c5fb8 # const struct foo** j } diff --git a/test_cases/info_tests/types/expected/pointer_reference_cc.elf_stg b/test_cases/info_tests/types/expected/pointer_reference_cc.elf_stg index e253c59..c44b1be 100644 --- a/test_cases/info_tests/types/expected/pointer_reference_cc.elf_stg +++ b/test_cases/info_tests/types/expected/pointer_reference_cc.elf_stg @@ -1,49 +1,49 @@ version: 0x00000002 -root_id: 0x84ea5130 +root_id: 0x84ea5130 # interface pointer_reference { id: 0x03bcc221 kind: POINTER - pointee_type_id: 0x24b3ee1b + pointee_type_id: 0x24b3ee1b # struct foo* } pointer_reference { id: 0x0717146f kind: POINTER - pointee_type_id: 0x361cb720 + pointee_type_id: 0x361cb720 # const struct foo* } pointer_reference { id: 0x24b3ee1b kind: POINTER - pointee_type_id: 0xb88f5ef1 + pointee_type_id: 0xb88f5ef1 # struct foo } pointer_reference { id: 0x361cb720 kind: POINTER - pointee_type_id: 0xf2323a1e + pointee_type_id: 0xf2323a1e # const struct foo } pointer_reference { id: 0xca1702b8 kind: LVALUE_REFERENCE - pointee_type_id: 0x361cb720 + pointee_type_id: 0x361cb720 # const struct foo* } pointer_reference { id: 0xcebcd4f6 kind: LVALUE_REFERENCE - pointee_type_id: 0x24b3ee1b + pointee_type_id: 0x24b3ee1b # struct foo* } pointer_reference { id: 0xe9b3f8cc kind: LVALUE_REFERENCE - pointee_type_id: 0xb88f5ef1 + pointee_type_id: 0xb88f5ef1 # struct foo } pointer_reference { id: 0xfb1ca1f7 kind: LVALUE_REFERENCE - pointee_type_id: 0xf2323a1e + pointee_type_id: 0xf2323a1e # const struct foo } qualified { id: 0xf2323a1e qualifier: CONST - qualified_type_id: 0xb88f5ef1 + qualified_type_id: 0xb88f5ef1 # struct foo } primitive { id: 0x6720d32f @@ -60,7 +60,7 @@ primitive { member { id: 0xa04e65cb name: "x" - type_id: 0xfc0e1dbd + type_id: 0xfc0e1dbd # long } struct_union { id: 0xb88f5ef1 @@ -68,7 +68,7 @@ struct_union { name: "foo" definition { bytesize: 8 - member_id: 0xa04e65cb + member_id: 0xa04e65cb # long x } } elf_symbol { @@ -76,7 +76,7 @@ elf_symbol { name: "a" is_defined: true symbol_type: OBJECT - type_id: 0x6720d32f + type_id: 0x6720d32f # int full_name: "a" } elf_symbol { @@ -84,7 +84,7 @@ elf_symbol { name: "b" is_defined: true symbol_type: OBJECT - type_id: 0xb88f5ef1 + type_id: 0xb88f5ef1 # struct foo full_name: "b" } elf_symbol { @@ -92,7 +92,7 @@ elf_symbol { name: "c" is_defined: true symbol_type: OBJECT - type_id: 0x24b3ee1b + type_id: 0x24b3ee1b # struct foo* full_name: "c" } elf_symbol { @@ -100,7 +100,7 @@ elf_symbol { name: "d" is_defined: true symbol_type: OBJECT - type_id: 0xe9b3f8cc + type_id: 0xe9b3f8cc # struct foo& full_name: "d" } elf_symbol { @@ -108,7 +108,7 @@ elf_symbol { name: "e" is_defined: true symbol_type: OBJECT - type_id: 0x03bcc221 + type_id: 0x03bcc221 # struct foo** full_name: "e" } elf_symbol { @@ -116,7 +116,7 @@ elf_symbol { name: "f" is_defined: true symbol_type: OBJECT - type_id: 0xcebcd4f6 + type_id: 0xcebcd4f6 # struct foo*& full_name: "f" } elf_symbol { @@ -124,7 +124,7 @@ elf_symbol { name: "h" is_defined: true symbol_type: OBJECT - type_id: 0x361cb720 + type_id: 0x361cb720 # const struct foo* full_name: "h" } elf_symbol { @@ -132,7 +132,7 @@ elf_symbol { name: "i" is_defined: true symbol_type: OBJECT - type_id: 0xfb1ca1f7 + type_id: 0xfb1ca1f7 # const struct foo& full_name: "i" } elf_symbol { @@ -140,7 +140,7 @@ elf_symbol { name: "j" is_defined: true symbol_type: OBJECT - type_id: 0x0717146f + type_id: 0x0717146f # const struct foo** full_name: "j" } elf_symbol { @@ -148,19 +148,19 @@ elf_symbol { name: "k" is_defined: true symbol_type: OBJECT - type_id: 0xca1702b8 + type_id: 0xca1702b8 # const struct foo*& full_name: "k" } interface { id: 0x84ea5130 - symbol_id: 0xa7b0241d - symbol_id: 0xe371117a - symbol_id: 0x2230fb28 - symbol_id: 0x63f6f9b1 - symbol_id: 0xa2b65a7e - symbol_id: 0xe0778f95 - symbol_id: 0x68f3ac2c - symbol_id: 0xa9b30393 - symbol_id: 0xe98c5fb8 - symbol_id: 0x284c384a + symbol_id: 0xa7b0241d # int a + symbol_id: 0xe371117a # struct foo b + symbol_id: 0x2230fb28 # struct foo* c + symbol_id: 0x63f6f9b1 # struct foo& d + symbol_id: 0xa2b65a7e # struct foo** e + symbol_id: 0xe0778f95 # struct foo*& f + symbol_id: 0x68f3ac2c # const struct foo* h + symbol_id: 0xa9b30393 # const struct foo& i + symbol_id: 0xe98c5fb8 # const struct foo** j + symbol_id: 0x284c384a # const struct foo*& k } |