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, 5 insertions, 5 deletions

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
 }