Merge branch 'upstream-main' into 'main'

* aosp/upstream-main:
  DWARF processor: do not apply file filters to types in Rust objects
  DWARF processor: add language awareness to STG DWARF processor
  DWARF wrappers: add DWARF getter for mandatory attributes
  order: rework ExtendOrder as CombineOrders
  order: fix vector reservations in `Reorder`
  order test: make some order combination tests a bit clearer
  order test: rename local variables for clarity
  order: tweak order merging to prefer second sequence
  test suite: all expected STG output files are now annotated
  proto: add an option to print annotations for STG output
  naming: emit method type instead of mangled name
  proto writer: fix created file permissions
  proto writer: add annotating printer for fields denoting IDs
  proto writer: add method returning a mapping from external to internal IDs
  proto writer: print directly to a zero copy file output stream
  proto writer: move printing code into `Writer::Write` method

Signed-off-by: Giuliano Procida <gprocida@google.com>
Change-Id: I655cfd11fb8ba2a073378306fb6051972c8ca267

1 files changed, 13 insertions, 13 deletions

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)
 }