Index: llvm/trunk/test/Object/nm-trivial-object.test
===================================================================
--- llvm/trunk/test/Object/nm-trivial-object.test
+++ llvm/trunk/test/Object/nm-trivial-object.test
@@ -61,6 +61,7 @@
 
 
 WASM:      00000000 d .L.str
+WASM-NEXT: 00000003 t .LSomeOtherFunction_bitcast
 WASM-NEXT:          U SomeOtherFunction
 WASM-NEXT: 00000002 T main
 WASM-NEXT:          U puts
Index: llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
===================================================================
--- llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
+++ llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
@@ -4,5 +4,6 @@
 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
Index: llvm/trunk/test/tools/llvm-objdump/wasm.txt
===================================================================
--- llvm/trunk/test/tools/llvm-objdump/wasm.txt
+++ llvm/trunk/test/tools/llvm-objdump/wasm.txt
@@ -2,13 +2,13 @@
 
 # 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
 
@@ -18,5 +18,6 @@
 # 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                             ....
Index: llvm/trunk/test/tools/llvm-readobj/print-hex.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/print-hex.test
+++ llvm/trunk/test/tools/llvm-readobj/print-hex.test
@@ -22,4 +22,5 @@
 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                                  .
Index: llvm/trunk/test/tools/llvm-readobj/relocations.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/relocations.test
+++ llvm/trunk/test/tools/llvm-readobj/relocations.test
@@ -302,6 +302,11 @@
 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:   }
Index: llvm/trunk/test/tools/llvm-readobj/sections.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/sections.test
+++ llvm/trunk/test/tools/llvm-readobj/sections.test
@@ -496,28 +496,28 @@
 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
@@ -528,14 +528,14 @@
 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: ]
Index: llvm/trunk/test/tools/llvm-readobj/symbols.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/symbols.test
+++ llvm/trunk/test/tools/llvm-readobj/symbols.test
@@ -88,6 +88,11 @@
 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