This is an archive of the discontinued LLVM Phabricator instance.

Differential D91635

[WebAssembly] Fix parsing of linking section for named global imports
ClosedPublic

Authored by wingo on Nov 17 2020, 7:59 AM.

Download Raw Diff

Details

Reviewers

sbc100

Commits

rG2a473db57391: [WebAssembly] Fix parsing of linking section for named global imports

Diff Detail

Repository: rG LLVM Github Monorepo

Unit TestsFailed

	Time	Test
	380 ms	linux > HWAddressSanitizer-x86_64.TestCases::sizes.cpp

Event Timeline

wingo created this revision.Nov 17 2020, 7:59 AM

Herald added a project: Restricted Project. · View Herald TranscriptNov 17 2020, 7:59 AM

Herald added subscribers: llvm-commits, ecnelises, sunfish and 4 others. · View Herald Transcript

wingo requested review of this revision.Nov 17 2020, 7:59 AM

Herald added a subscriber: aheejin. · View Herald TranscriptNov 17 2020, 7:59 AM

wingo added a reviewer: sbc100.Nov 17 2020, 7:59 AM

Did you run all of llvm/test/MC/WebAssembly and all of lld/test/wasm?

This revision is now accepted and ready to land.Nov 17 2020, 8:00 AM

In D91635#2400022, @sbc100 wrote:

Did you run all of llvm/test/MC/WebAssembly and all of lld/test/wasm?

All of MC/WebAssembly but not lld. Let me do that now.

In D91635#2400037, @wingo wrote:

In D91635#2400022, @sbc100 wrote:

Did you run all of llvm/test/MC/WebAssembly and all of lld/test/wasm?

All of MC/WebAssembly but not lld. Let me do that now.

Yep, lld/test/wasm tests pass.

This revision was landed with ongoing or failed builds.Nov 17 2020, 8:14 AM

Closed by commit rG2a473db57391: [WebAssembly] Fix parsing of linking section for named global imports (authored by wingo, committed by sbc100). · Explain Why

This revision was automatically updated to reflect the committed changes.

sbc100 added a commit: rG2a473db57391: [WebAssembly] Fix parsing of linking section for named global imports.

Harbormaster completed remote builds in B79128: Diff 305798.Nov 17 2020, 9:26 AM

wingo mentioned this in D91637: [WebAssembly] Only emit indirect function table import if needed.Nov 25 2020, 1:49 AM

Revision Contents

Path

Size

llvm/

lib/

Object/

WasmObjectFile.cpp

1 line

test/

MC/

WebAssembly/

debug-info.ll

1 line

debug-info64.ll

1 line

Diff 305798

llvm/lib/Object/WasmObjectFile.cpp

Show First 20 Lines • Show All 556 Lines • ▼ Show 20 Lines	case wasm::WASM_SYMBOL_TYPE_GLOBAL:
wasm::WasmImport &Import = *ImportedGlobals[Info.ElementIndex];		wasm::WasmImport &Import = *ImportedGlobals[Info.ElementIndex];
if ((Info.Flags & wasm::WASM_SYMBOL_EXPLICIT_NAME) != 0) {		if ((Info.Flags & wasm::WASM_SYMBOL_EXPLICIT_NAME) != 0) {
Info.Name = readString(Ctx);		Info.Name = readString(Ctx);
Info.ImportName = Import.Field;		Info.ImportName = Import.Field;
} else {		} else {
Info.Name = Import.Field;		Info.Name = Import.Field;
}		}
GlobalType = &Import.Global;		GlobalType = &Import.Global;
Info.ImportName = Import.Field;
if (!Import.Module.empty()) {		if (!Import.Module.empty()) {
Info.ImportModule = Import.Module;		Info.ImportModule = Import.Module;
}		}
}		}
break;		break;

case wasm::WASM_SYMBOL_TYPE_TABLE:		case wasm::WASM_SYMBOL_TYPE_TABLE:
Info.ElementIndex = readVaruint32(Ctx);		Info.ElementIndex = readVaruint32(Ctx);
▲ Show 20 Lines • Show All 1,240 Lines • Show Last 20 Lines

llvm/test/MC/WebAssembly/debug-info.ll

	Show First 20 Lines • Show All 213 Lines • ▼ Show 20 Lines
	; CHECK-NEXT: ElementIndex: 0x8			; CHECK-NEXT: ElementIndex: 0x8
	; CHECK-NEXT: }			; CHECK-NEXT: }
	; CHECK-NEXT: Symbol {			; CHECK-NEXT: Symbol {
	; CHECK-NEXT: Name: __stack_pointer			; CHECK-NEXT: Name: __stack_pointer
	; CHECK-NEXT: Type: GLOBAL (0x2)			; CHECK-NEXT: Type: GLOBAL (0x2)
	; CHECK-NEXT: Flags [ (0x10)			; CHECK-NEXT: Flags [ (0x10)
	; CHECK-NEXT: UNDEFINED (0x10)			; CHECK-NEXT: UNDEFINED (0x10)
	; CHECK-NEXT: ]			; CHECK-NEXT: ]
	; CHECK-NEXT: ImportName: __stack_pointer
	; CHECK-NEXT: ImportModule: env			; CHECK-NEXT: ImportModule: env
	; CHECK-NEXT: ElementIndex: 0x0			; CHECK-NEXT: ElementIndex: 0x0
	; CHECK-NEXT: }			; CHECK-NEXT: }
	; CHECK-NEXT: Symbol {			; CHECK-NEXT: Symbol {
	; CHECK-NEXT: Name: .debug_str			; CHECK-NEXT: Name: .debug_str
	; CHECK-NEXT: Type: SECTION (0x3)			; CHECK-NEXT: Type: SECTION (0x3)
	; CHECK-NEXT: Flags [ (0x2)			; CHECK-NEXT: Flags [ (0x2)
	; CHECK-NEXT: BINDING_LOCAL (0x2)			; CHECK-NEXT: BINDING_LOCAL (0x2)
	▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines

llvm/test/MC/WebAssembly/debug-info64.ll

	Show First 20 Lines • Show All 213 Lines • ▼ Show 20 Lines
	; CHECK-NEXT: ElementIndex: 0x8			; CHECK-NEXT: ElementIndex: 0x8
	; CHECK-NEXT: }			; CHECK-NEXT: }
	; CHECK-NEXT: Symbol {			; CHECK-NEXT: Symbol {
	; CHECK-NEXT: Name: __stack_pointer			; CHECK-NEXT: Name: __stack_pointer
	; CHECK-NEXT: Type: GLOBAL (0x2)			; CHECK-NEXT: Type: GLOBAL (0x2)
	; CHECK-NEXT: Flags [ (0x10)			; CHECK-NEXT: Flags [ (0x10)
	; CHECK-NEXT: UNDEFINED (0x10)			; CHECK-NEXT: UNDEFINED (0x10)
	; CHECK-NEXT: ]			; CHECK-NEXT: ]
	; CHECK-NEXT: ImportName: __stack_pointer
	; CHECK-NEXT: ImportModule: env			; CHECK-NEXT: ImportModule: env
	; CHECK-NEXT: ElementIndex: 0x0			; CHECK-NEXT: ElementIndex: 0x0
	; CHECK-NEXT: }			; CHECK-NEXT: }
	; CHECK-NEXT: Symbol {			; CHECK-NEXT: Symbol {
	; CHECK-NEXT: Name: .debug_str			; CHECK-NEXT: Name: .debug_str
	; CHECK-NEXT: Type: SECTION (0x3)			; CHECK-NEXT: Type: SECTION (0x3)
	; CHECK-NEXT: Flags [ (0x2)			; CHECK-NEXT: Flags [ (0x2)
	; CHECK-NEXT: BINDING_LOCAL (0x2)			; CHECK-NEXT: BINDING_LOCAL (0x2)
	▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines

This is an archive of the discontinued LLVM Phabricator instance.

[WebAssembly] Fix parsing of linking section for named global importsClosedPublic

Details

Diff Detail

Unit TestsFailed

Event Timeline

Revision Contents

Diff 305798

llvm/lib/Object/WasmObjectFile.cpp

llvm/test/MC/WebAssembly/debug-info.ll

llvm/test/MC/WebAssembly/debug-info64.ll

[WebAssembly] Fix parsing of linking section for named global imports
ClosedPublic