Index: test/wasm/init-fini.ll =================================================================== --- test/wasm/init-fini.ll +++ test/wasm/init-fini.ll @@ -23,6 +23,9 @@ ret void } +declare hidden void @externCtor() +declare hidden void @externDtor() + define i32 @__cxa_atexit(i32 %func, i32 %arg, i32 %dso_handle) { ret i32 0 } @@ -32,75 +35,95 @@ ret void } -@llvm.global_ctors = appending global [3 x { i32, void ()*, i8* }] [ +@llvm.global_ctors = appending global [4 x { i32, void ()*, i8* }] [ { i32, void ()*, i8* } { i32 1001, void ()* @func1, i8* null }, { i32, void ()*, i8* } { i32 101, void ()* @func1, i8* null }, - { i32, void ()*, i8* } { i32 101, void ()* @func2, i8* null } + { i32, void ()*, i8* } { i32 101, void ()* @func2, i8* null }, + { i32, void ()*, i8* } { i32 4000, void ()* @externCtor, i8* null } ] -@llvm.global_dtors = appending global [3 x { i32, void ()*, i8* }] [ +@llvm.global_dtors = appending global [4 x { i32, void ()*, i8* }] [ { i32, void ()*, i8* } { i32 1001, void ()* @func3, i8* null }, { i32, void ()*, i8* } { i32 101, void ()* @func3, i8* null }, - { i32, void ()*, i8* } { i32 101, void ()* @func4, i8* null } + { i32, void ()*, i8* } { i32 101, void ()* @func4, i8* null }, + { i32, void ()*, i8* } { i32 4000, void ()* @externDtor, i8* null } ] -; RUN: wasm-ld --check-signatures %t.o %t.global-ctor-dtor.o -o %t.wasm +; RUN: wasm-ld --check-signatures --allow-undefined %t.o %t.global-ctor-dtor.o -o %t.wasm ; RUN: obj2yaml %t.wasm | FileCheck %s +; CHECK: - Type: IMPORT +; CHECK-NEXT: Imports: +; CHECK-NEXT: - Module: env +; CHECK-NEXT: Field: externDtor +; CHECK-NEXT: Kind: FUNCTION +; CHECK-NEXT: SigIndex: 0 +; CHECK-NEXT: - Module: env +; CHECK-NEXT: Field: externCtor +; CHECK-NEXT: Kind: FUNCTION +; CHECK-NEXT: SigIndex: 0 ; CHECK: - Type: ELEM ; CHECK-NEXT: Segments: ; CHECK-NEXT: - Offset: ; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Value: 1 -; CHECK-NEXT: Functions: [ 7, 9, 13, 15, 17 ] +; CHECK-NEXT: Functions: [ 9, 11, 13, 17, 19, 21 ] ; CHECK-NEXT: - Type: CODE ; CHECK-NEXT: Functions: -; CHECK-NEXT: - Index: 0 +; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: Locals: -; CHECK-NEXT: Body: 100110021008100B100E100B10101001100A100B10120B -; CHECK: - Index: 18 +; CHECK-NEXT: Body: 10031004100A100F1012100F10141003100C100F10161001100E0B +; CHECK: - Index: 22 ; CHECK-NEXT: Locals: -; CHECK-NEXT: Body: 024041858080800041004180888080001085808080000D000F0B00000B +; CHECK-NEXT: Body: 024041868080800041004180888080001087808080000D000F0B00000B ; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: Name: name ; CHECK-NEXT: FunctionNames: ; CHECK-NEXT: - Index: 0 -; CHECK-NEXT: Name: __wasm_call_ctors +; CHECK-NEXT: Name: externDtor ; CHECK-NEXT: - Index: 1 -; CHECK-NEXT: Name: func1 +; CHECK-NEXT: Name: externCtor ; CHECK-NEXT: - Index: 2 -; CHECK-NEXT: Name: func2 +; CHECK-NEXT: Name: __wasm_call_ctors ; CHECK-NEXT: - Index: 3 -; CHECK-NEXT: Name: func3 +; CHECK-NEXT: Name: func1 ; CHECK-NEXT: - Index: 4 -; CHECK-NEXT: Name: func4 +; CHECK-NEXT: Name: func2 ; CHECK-NEXT: - Index: 5 -; CHECK-NEXT: Name: __cxa_atexit +; CHECK-NEXT: Name: func3 ; CHECK-NEXT: - Index: 6 -; CHECK-NEXT: Name: _start +; CHECK-NEXT: Name: func4 ; CHECK-NEXT: - Index: 7 -; CHECK-NEXT: Name: .Lcall_dtors.101 +; CHECK-NEXT: Name: __cxa_atexit ; CHECK-NEXT: - Index: 8 -; CHECK-NEXT: Name: .Lregister_call_dtors.101 +; CHECK-NEXT: Name: _start ; CHECK-NEXT: - Index: 9 -; CHECK-NEXT: Name: .Lcall_dtors.1001 +; CHECK-NEXT: Name: .Lcall_dtors.101 ; CHECK-NEXT: - Index: 10 -; CHECK-NEXT: Name: .Lregister_call_dtors.1001 +; CHECK-NEXT: Name: .Lregister_call_dtors.101 ; CHECK-NEXT: - Index: 11 -; CHECK-NEXT: Name: myctor +; CHECK-NEXT: Name: .Lcall_dtors.1001 ; CHECK-NEXT: - Index: 12 -; CHECK-NEXT: Name: mydtor +; CHECK-NEXT: Name: .Lregister_call_dtors.1001 ; CHECK-NEXT: - Index: 13 -; CHECK-NEXT: Name: .Lcall_dtors.101 +; CHECK-NEXT: Name: .Lcall_dtors.4000 ; CHECK-NEXT: - Index: 14 -; CHECK-NEXT: Name: .Lregister_call_dtors.101 +; CHECK-NEXT: Name: .Lregister_call_dtors.4000 ; CHECK-NEXT: - Index: 15 -; CHECK-NEXT: Name: .Lcall_dtors.202 +; CHECK-NEXT: Name: myctor ; CHECK-NEXT: - Index: 16 -; CHECK-NEXT: Name: .Lregister_call_dtors.202 +; CHECK-NEXT: Name: mydtor ; CHECK-NEXT: - Index: 17 -; CHECK-NEXT: Name: .Lcall_dtors.2002 +; CHECK-NEXT: Name: .Lcall_dtors.101 ; CHECK-NEXT: - Index: 18 +; CHECK-NEXT: Name: .Lregister_call_dtors.101 +; CHECK-NEXT: - Index: 19 +; CHECK-NEXT: Name: .Lcall_dtors.202 +; CHECK-NEXT: - Index: 20 +; CHECK-NEXT: Name: .Lregister_call_dtors.202 +; CHECK-NEXT: - Index: 21 +; CHECK-NEXT: Name: .Lcall_dtors.2002 +; CHECK-NEXT: - Index: 22 ; CHECK-NEXT: Name: .Lregister_call_dtors.2002 ; CHECK-NEXT: ... @@ -114,42 +137,42 @@ ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: func1 ; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ] -; RELOC-NEXT: Function: 0 +; RELOC-NEXT: Function: 2 ; RELOC-NEXT: - Index: 1 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: func2 ; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ] -; RELOC-NEXT: Function: 1 +; RELOC-NEXT: Function: 3 ; RELOC-NEXT: - Index: 2 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: func3 ; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ] -; RELOC-NEXT: Function: 2 +; RELOC-NEXT: Function: 4 ; RELOC-NEXT: - Index: 3 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: func4 ; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ] -; RELOC-NEXT: Function: 3 +; RELOC-NEXT: Function: 5 ; RELOC-NEXT: - Index: 4 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: __cxa_atexit ; RELOC-NEXT: Flags: [ ] -; RELOC-NEXT: Function: 4 +; RELOC-NEXT: Function: 6 ; RELOC-NEXT: - Index: 5 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: _start ; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ] -; RELOC-NEXT: Function: 5 +; RELOC-NEXT: Function: 7 ; RELOC-NEXT: - Index: 6 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: .Lcall_dtors.101 ; RELOC-NEXT: Flags: [ BINDING_LOCAL ] -; RELOC-NEXT: Function: 6 +; RELOC-NEXT: Function: 8 ; RELOC-NEXT: - Index: 7 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: .Lregister_call_dtors.101 ; RELOC-NEXT: Flags: [ BINDING_LOCAL ] -; RELOC-NEXT: Function: 7 +; RELOC-NEXT: Function: 9 ; RELOC-NEXT: - Index: 8 ; RELOC-NEXT: Kind: DATA ; RELOC-NEXT: Name: __dso_handle @@ -158,57 +181,77 @@ ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: .Lcall_dtors.1001 ; RELOC-NEXT: Flags: [ BINDING_LOCAL ] -; RELOC-NEXT: Function: 8 +; RELOC-NEXT: Function: 10 ; RELOC-NEXT: - Index: 10 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: .Lregister_call_dtors.1001 ; RELOC-NEXT: Flags: [ BINDING_LOCAL ] -; RELOC-NEXT: Function: 9 +; RELOC-NEXT: Function: 11 ; RELOC-NEXT: - Index: 11 ; RELOC-NEXT: Kind: FUNCTION +; RELOC-NEXT: Name: .Lcall_dtors.4000 +; RELOC-NEXT: Flags: [ BINDING_LOCAL ] +; RELOC-NEXT: Function: 12 +; RELOC-NEXT: - Index: 12 +; RELOC-NEXT: Kind: FUNCTION +; RELOC-NEXT: Name: externDtor +; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN, UNDEFINED ] +; RELOC-NEXT: Function: 0 +; RELOC-NEXT: - Index: 13 +; RELOC-NEXT: Kind: FUNCTION +; RELOC-NEXT: Name: .Lregister_call_dtors.4000 +; RELOC-NEXT: Flags: [ BINDING_LOCAL ] +; RELOC-NEXT: Function: 13 +; RELOC-NEXT: - Index: 14 +; RELOC-NEXT: Kind: FUNCTION +; RELOC-NEXT: Name: externCtor +; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN, UNDEFINED ] +; RELOC-NEXT: Function: 1 +; RELOC-NEXT: - Index: 15 +; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: myctor ; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ] -; RELOC-NEXT: Function: 10 -; RELOC-NEXT: - Index: 12 +; RELOC-NEXT: Function: 14 +; RELOC-NEXT: - Index: 16 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: mydtor ; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ] -; RELOC-NEXT: Function: 11 -; RELOC-NEXT: - Index: 13 +; RELOC-NEXT: Function: 15 +; RELOC-NEXT: - Index: 17 ; RELOC-NEXT: Kind: GLOBAL ; RELOC-NEXT: Name: __stack_pointer ; RELOC-NEXT: Flags: [ UNDEFINED ] ; RELOC-NEXT: Global: 0 -; RELOC-NEXT: - Index: 14 +; RELOC-NEXT: - Index: 18 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: .Lcall_dtors.101 ; RELOC-NEXT: Flags: [ BINDING_LOCAL ] -; RELOC-NEXT: Function: 12 -; RELOC-NEXT: - Index: 15 +; RELOC-NEXT: Function: 16 +; RELOC-NEXT: - Index: 19 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: .Lregister_call_dtors.101 ; RELOC-NEXT: Flags: [ BINDING_LOCAL ] -; RELOC-NEXT: Function: 13 -; RELOC-NEXT: - Index: 16 +; RELOC-NEXT: Function: 17 +; RELOC-NEXT: - Index: 20 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: .Lcall_dtors.202 ; RELOC-NEXT: Flags: [ BINDING_LOCAL ] -; RELOC-NEXT: Function: 14 -; RELOC-NEXT: - Index: 17 +; RELOC-NEXT: Function: 18 +; RELOC-NEXT: - Index: 21 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: .Lregister_call_dtors.202 ; RELOC-NEXT: Flags: [ BINDING_LOCAL ] -; RELOC-NEXT: Function: 15 -; RELOC-NEXT: - Index: 18 +; RELOC-NEXT: Function: 19 +; RELOC-NEXT: - Index: 22 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: .Lcall_dtors.2002 ; RELOC-NEXT: Flags: [ BINDING_LOCAL ] -; RELOC-NEXT: Function: 16 -; RELOC-NEXT: - Index: 19 +; RELOC-NEXT: Function: 20 +; RELOC-NEXT: - Index: 23 ; RELOC-NEXT: Kind: FUNCTION ; RELOC-NEXT: Name: .Lregister_call_dtors.2002 ; RELOC-NEXT: Flags: [ BINDING_LOCAL ] -; RELOC-NEXT: Function: 17 +; RELOC-NEXT: Function: 21 ; RELOC-NEXT: InitFunctions: ; RELOC-NEXT: - Priority: 101 ; RELOC-NEXT: Symbol: 0 @@ -217,58 +260,70 @@ ; RELOC-NEXT: - Priority: 101 ; RELOC-NEXT: Symbol: 7 ; RELOC-NEXT: - Priority: 101 -; RELOC-NEXT: Symbol: 11 -; RELOC-NEXT: - Priority: 101 ; RELOC-NEXT: Symbol: 15 +; RELOC-NEXT: - Priority: 101 +; RELOC-NEXT: Symbol: 19 ; RELOC-NEXT: - Priority: 202 -; RELOC-NEXT: Symbol: 11 +; RELOC-NEXT: Symbol: 15 ; RELOC-NEXT: - Priority: 202 -; RELOC-NEXT: Symbol: 17 +; RELOC-NEXT: Symbol: 21 ; RELOC-NEXT: - Priority: 1001 ; RELOC-NEXT: Symbol: 0 ; RELOC-NEXT: - Priority: 1001 ; RELOC-NEXT: Symbol: 10 ; RELOC-NEXT: - Priority: 2002 -; RELOC-NEXT: Symbol: 11 +; RELOC-NEXT: Symbol: 15 ; RELOC-NEXT: - Priority: 2002 -; RELOC-NEXT: Symbol: 19 +; RELOC-NEXT: Symbol: 23 +; RELOC-NEXT: - Priority: 4000 +; RELOC-NEXT: Symbol: 14 +; RELOC-NEXT: - Priority: 4000 +; RELOC-NEXT: Symbol: 13 ; RELOC-NEXT: - Type: CUSTOM ; RELOC-NEXT: Name: name ; RELOC-NEXT: FunctionNames: ; RELOC-NEXT: - Index: 0 -; RELOC-NEXT: Name: func1 +; RELOC-NEXT: Name: externDtor ; RELOC-NEXT: - Index: 1 -; RELOC-NEXT: Name: func2 +; RELOC-NEXT: Name: externCtor ; RELOC-NEXT: - Index: 2 -; RELOC-NEXT: Name: func3 +; RELOC-NEXT: Name: func1 ; RELOC-NEXT: - Index: 3 -; RELOC-NEXT: Name: func4 +; RELOC-NEXT: Name: func2 ; RELOC-NEXT: - Index: 4 -; RELOC-NEXT: Name: __cxa_atexit +; RELOC-NEXT: Name: func3 ; RELOC-NEXT: - Index: 5 -; RELOC-NEXT: Name: _start +; RELOC-NEXT: Name: func4 ; RELOC-NEXT: - Index: 6 -; RELOC-NEXT: Name: .Lcall_dtors.101 +; RELOC-NEXT: Name: __cxa_atexit ; RELOC-NEXT: - Index: 7 -; RELOC-NEXT: Name: .Lregister_call_dtors.101 +; RELOC-NEXT: Name: _start ; RELOC-NEXT: - Index: 8 -; RELOC-NEXT: Name: .Lcall_dtors.1001 +; RELOC-NEXT: Name: .Lcall_dtors.101 ; RELOC-NEXT: - Index: 9 -; RELOC-NEXT: Name: .Lregister_call_dtors.1001 +; RELOC-NEXT: Name: .Lregister_call_dtors.101 ; RELOC-NEXT: - Index: 10 -; RELOC-NEXT: Name: myctor +; RELOC-NEXT: Name: .Lcall_dtors.1001 ; RELOC-NEXT: - Index: 11 -; RELOC-NEXT: Name: mydtor +; RELOC-NEXT: Name: .Lregister_call_dtors.1001 ; RELOC-NEXT: - Index: 12 -; RELOC-NEXT: Name: .Lcall_dtors.101 +; RELOC-NEXT: Name: .Lcall_dtors.4000 ; RELOC-NEXT: - Index: 13 -; RELOC-NEXT: Name: .Lregister_call_dtors.101 +; RELOC-NEXT: Name: .Lregister_call_dtors.4000 ; RELOC-NEXT: - Index: 14 -; RELOC-NEXT: Name: .Lcall_dtors.202 +; RELOC-NEXT: Name: myctor ; RELOC-NEXT: - Index: 15 -; RELOC-NEXT: Name: .Lregister_call_dtors.202 +; RELOC-NEXT: Name: mydtor ; RELOC-NEXT: - Index: 16 -; RELOC-NEXT: Name: .Lcall_dtors.2002 +; RELOC-NEXT: Name: .Lcall_dtors.101 ; RELOC-NEXT: - Index: 17 +; RELOC-NEXT: Name: .Lregister_call_dtors.101 +; RELOC-NEXT: - Index: 18 +; RELOC-NEXT: Name: .Lcall_dtors.202 +; RELOC-NEXT: - Index: 19 +; RELOC-NEXT: Name: .Lregister_call_dtors.202 +; RELOC-NEXT: - Index: 20 +; RELOC-NEXT: Name: .Lcall_dtors.2002 +; RELOC-NEXT: - Index: 21 ; RELOC-NEXT: Name: .Lregister_call_dtors.2002 ; RELOC-NEXT: ... Index: wasm/Writer.cpp =================================================================== --- wasm/Writer.cpp +++ wasm/Writer.cpp @@ -657,12 +657,11 @@ continue; DEBUG(dbgs() << "import: " << Sym->getName() << "\n"); - Sym->setOutputIndex(ImportedSymbols.size()); ImportedSymbols.emplace_back(Sym); if (isa(Sym)) - ++NumImportedFunctions; + Sym->setOutputIndex(NumImportedFunctions++); else - ++NumImportedGlobals; + Sym->setOutputIndex(NumImportedGlobals++); } }