[WebAssembly] Update test cases after FixFunctionBitcasts

[aheejin]

Summary

This updates generated binaries and corresponding test cases up to date
after applying FixFunctionBitcasts pass.

[aheejin]

This does not update these 'invalid' test cases:

test/tools/llvm-objdump/Inputs/corrupt-section.wasm
test/Object/Inputs/WASM/missing-version.wasm
test/Object/Inputs/WASM/string-outside-section.wasm

Because it is unclear how to regenerate these invalid test cases. Do you think we should regenerate them? If so, how? @sbc100

[sbc100]

Hmm.. just to be clear, these tests are not failing on HEAD are they?

Why not just leave them as is?

Also, I've had some fallout from the change to enable the main wrappers by default so I think we should perhaps revert it. Specifically the test_mainenv test in emscripten is failing because it expects envp to be set to null, not some undefined value (which happens to be non-null right now).

[aheejin]

• Update test cases on top of D54117

[aheejin]

In D54070#1287492, @sbc100 wrote:

Hmm.. just to be clear, these tests are not failing on HEAD are they?

Before test/Object/Inputs/WASM/string-outside-section.wasm failed after I added the event section, but maybe it is because I reassigned section number incorrectly.

Why not just leave them as is?

Yes I'm gonna leave them as is for now.

Also, I've had some fallout from the change to enable the main wrappers by default so I think we should perhaps revert it. Specifically the test_mainenv test in emscripten is failing because it expects envp to be set to null, not some undefined value (which happens to be non-null right now).

I rebased this CL on top of D54117. We apparently still have something to update because of FixFunctionBitCasts on SomeOtherFunction.

[sbc100]

Its not clear to me that we should regenerate these binaries every time a change to llvm means the binary would change. These test inputs remain valid even if llvm would no longer that same file bit-for-bit.

[aheejin]

I wasn't planning on regenerating test binaries every time; the reason I did this patch was, after I incorrectly changed section numbers (by making the event section 7 and shifting all later sections by 1), I had to regenerate test binaries, and accidentally all these FixFunctionBitCast changes were included in that CL. Anyway, after I reassigned the correct section number (12) to the event section, I don't need to update binary tests anymore there so I don't need this CL either. Thanks!

[aheejin]

Hmm, come to think about it, maybe it's better to update the binaries here and in D54096 after all, because D54096 adds a new section. (I'm not planning on updating these every time we change something on binaries) The reason is, for example, if I want to see if the event section code (0xC) is correctly printed in this test, I have to update binaries. And if I update binaries only in D54096 and abandon this CL, these changes from FixFunctionBitCasts will be all included in that CL, which I don't want.

llvm/trunk/test/Object/nm-trivial-object.test

 COFF32-NEXT: 00000000 t .text
 COFF32-NEXT: 00000000 d L_.str
 COFF32-NEXT:          U _SomeOtherFunction
 COFF32-NEXT: 00000000 T _main
 COFF32-NEXT:          U _puts
 
 
 WASM:      00000000 d .L.str
+WASM-NEXT: 00000003 t .LSomeOtherFunction_bitcast
 WASM-NEXT:          U SomeOtherFunction
 WASM-NEXT: 00000002 T main
 WASM-NEXT:          U puts
 WASM-NEXT: 00000010 D var
 
 
 COFF64: 00000000 d .data
 COFF64-NEXT: 00000000 t .text

llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test

 RUN: llvm-objdump -t %p/../Inputs/trivial.obj.wasm | FileCheck %s
 
 CHECK:      SYMBOL TABLE:
 CHECK-NEXT: 00000002 g     F CODE main
 CHECK-NEXT: 00000000 l       DATA .L.str
 CHECK-NEXT: 00000000 g     F *UND*  puts
+CHECK-NEXT: 00000003 l     F CODE .LSomeOtherFunction_bitcast
 CHECK-NEXT: 00000000 g     F *UND*  SomeOtherFunction
 CHECK-NEXT: 00000010 g       DATA var

llvm/trunk/test/tools/llvm-objdump/wasm.txt

 # RUN: llvm-objdump -h %p/Inputs/trivial.obj.wasm | FileCheck %s
 
 # CHECK:      Sections:
 # CHECK-NEXT: Idx Name          Size      Address          Type
-# CHECK-NEXT:  0 TYPE          0000000e 0000000000000000
+# CHECK-NEXT:  0 TYPE          00000011 0000000000000000
 # CHECK-NEXT:  1 IMPORT        0000005d 0000000000000000
-# CHECK-NEXT:  2 FUNCTION      00000002 0000000000000000
-# CHECK-NEXT:  3 CODE          00000019 0000000000000000 TEXT
+# CHECK-NEXT:  2 FUNCTION      00000003 0000000000000000
+# CHECK-NEXT:  3 CODE          00000024 0000000000000000 TEXT
 # CHECK-NEXT:  4 DATA          0000001c 0000000000000000 DATA
-# CHECK-NEXT:  5 linking       00000051 0000000000000000
-# CHECK-NEXT:  6 reloc.CODE    0000000c 0000000000000000
+# CHECK-NEXT:  5 linking       0000006d 0000000000000000
+# CHECK-NEXT:  6 reloc.CODE    0000000f 0000000000000000
 
 # RUN: llvm-objdump -p %p/Inputs/trivial.obj.wasm | FileCheck %s -check-prefix CHECK-HEADER
 
 # CHECK-HEADER: Program Header:
 # CHECK-HEADER: Version: 0x1
 
 # RUN: llvm-objdump -s --section=CODE %p/Inputs/trivial.obj.wasm | FileCheck %s -check-prefix CHECK-SECTIONS
 
 # CHECK-SECTIONS: Contents of section CODE:
-# CHECK-SECTIONS: 0000 01170041 80808080 00108080 8080001a  ...A............
-# CHECK-SECTIONS: 0010 10818080 80004100 0b                 ......A..
+# CHECK-SECTIONS: 0000 02170041 80808080 00108080 8080001a  ...A............
+# CHECK-SECTIONS: 0010 10838080 80004100 0b0a0041 00108180  ......A....A....
+# CHECK-SECTIONS: 0020 8080000b                             ....

llvm/trunk/test/tools/llvm-readobj/print-hex.test

 RUN:     | FileCheck %s --check-prefix MACHO
 
 MACHO: 0x00000000 50488d3d 00000000 e8000000 00e80000 PH.=............
 MACHO: 0x00000010 000031c0 5ac3                       ..1.Z.
 
 RUN: llvm-readobj -x 1 %p/Inputs/trivial.obj.wasm \
 RUN:     | FileCheck %s --check-prefix WASM
 
-WASM: 0x00000000 03600001 7f60017f 017f6001 7f00 .`...`....`...
+WASM: 0x00000000 04600001 7f60017f 017f6000 0060017f .`...`....`..`..
+WASM: 0x00000010 00                                  .

llvm/trunk/test/tools/llvm-readobj/relocations.test

 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
 WASM-NEXT:       Offset: 0xA
 WASM-NEXT:       Symbol: puts
 WASM-NEXT:     }
 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
 WASM-NEXT:       Offset: 0x11
+WASM-NEXT:       Symbol: .LSomeOtherFunction_bitcast
+WASM-NEXT:     }
+WASM-NEXT:     Relocation {
+WASM-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
+WASM-NEXT:       Offset: 0x1E
 WASM-NEXT:       Symbol: SomeOtherFunction
 WASM-NEXT:     }
 WASM-NEXT:   }
 WASM-NEXT: ]

llvm/trunk/test/tools/llvm-readobj/sections.test

 MACHO-ARM-NEXT:    Reserved1: 0x0
 MACHO-ARM-NEXT:    Reserved2: 0x0
 MACHO-ARM-NEXT:  }
 MACHO-ARM-NEXT:]
 
 WASM:      Sections [
 WASM-NEXT:   Section {
 WASM-NEXT:     Type: TYPE (0x1)
-WASM-NEXT:     Size: 14
+WASM-NEXT:     Size: 17
 WASM-NEXT:     Offset: 8
 WASM-NEXT:   }
 WASM-NEXT:   Section {
 WASM-NEXT:     Type: IMPORT (0x2)
 WASM-NEXT:     Size: 93
-WASM-NEXT:     Offset: 28
+WASM-NEXT:     Offset: 31
 WASM-NEXT:   }
 WASM-NEXT:   Section {
 WASM-NEXT:     Type: FUNCTION (0x3)
-WASM-NEXT:     Size: 2
-WASM-NEXT:     Offset: 127
+WASM-NEXT:     Size: 3
+WASM-NEXT:     Offset: 130
 WASM-NEXT:   }
 WASM-NEXT:   Section {
 WASM-NEXT:     Type: CODE (0xA)
-WASM-NEXT:     Size: 25
-WASM-NEXT:     Offset: 135
+WASM-NEXT:     Size: 36
+WASM-NEXT:     Offset: 139
 WASM-NEXT:   }
 WASM-NEXT:   Section {
 WASM-NEXT:     Type: DATA (0xB)
 WASM-NEXT:     Size: 19
-WASM-NEXT:     Offset: 166
+WASM-NEXT:     Offset: 181
 WASM-NEXT:     Segments [
 WASM-NEXT:       Segment {
 WASM-NEXT:         Name: .rodata..L.str
 WASM-NEXT:         Size: 13
 WASM-NEXT:         Offset: 0
 WASM-NEXT:       }
 WASM-NEXT:     ]
 WASM-NEXT:   }
 WASM-NEXT:   Section {
 WASM-NEXT:     Type: CUSTOM (0x0)
-WASM-NEXT:     Size: 61
-WASM-NEXT:     Offset: 191
+WASM-NEXT:     Size: 89
+WASM-NEXT:     Offset: 206
 WASM-NEXT:     Name: linking
 WASM-NEXT:   }
 WASM-NEXT:   Section {
 WASM-NEXT:     Type: CUSTOM (0x0)
-WASM-NEXT:     Size: 12
-WASM-NEXT:     Offset: 266
+WASM-NEXT:     Size: 15
+WASM-NEXT:     Offset: 309
 WASM-NEXT:     Name: reloc.CODE
 WASM-NEXT:   }
 WASM-NEXT: ]

llvm/trunk/test/tools/llvm-readobj/symbols.test

 WASM-NEXT:     Flags: 0x2
 WASM-NEXT:   }
 WASM-NEXT:   Symbol {
 WASM-NEXT:     Name: puts
 WASM-NEXT:     Type: FUNCTION (0x0)
 WASM-NEXT:     Flags: 0x10
 WASM-NEXT:   }
 WASM-NEXT:   Symbol {
+WASM-NEXT:     Name: .LSomeOtherFunction_bitcast
+WASM-NEXT:     Type: FUNCTION (0x0)
+WASM-NEXT:     Flags: 0x2
+WASM-NEXT:   }
+WASM-NEXT:   Symbol {
 WASM-NEXT:     Name: SomeOtherFunction
 WASM-NEXT:     Type: FUNCTION (0x0)
 WASM-NEXT:     Flags: 0x10
 WASM-NEXT:   }
 WASM-NEXT: ]