This is an archive of the discontinued LLVM Phabricator instance.

Differential D52911

[WebAssembly] Fixed missing "global" symbol type in AsmParser.
ClosedPublic

Authored by aardappel on Oct 4 2018, 3:31 PM.

Details

Reviewers
aheejin
dschuff
Commits
rG15a50e2cdd34: [WebAssembly] Fixed missing "global" symbol type in AsmParser.
rL343830: [WebAssembly] Fixed missing "global" symbol type in AsmParser.
Summary

These are emitted by the wasm backend for e.g.
__stack_pointer@GLOBAL which previously wasn't accepted by the
assembler.

Diff Detail

Event Timeline

aardappel created this revision.Oct 4 2018, 3:31 PM
Herald added subscribers: llvm-commits, jgravelle-google, sbc100. · View Herald TranscriptOct 4 2018, 3:31 PM
Harbormaster completed remote builds in B23485: Diff 168393.Oct 4 2018, 3:32 PM
aheejin added a comment.Oct 4 2018, 4:14 PM

Thank you! Can we have a llvm-mc test case that shows this works?

aardappel updated this revision to Diff 168410.Oct 4 2018, 4:46 PM

Added simple test.

Harbormaster completed remote builds in B23491: Diff 168410.Oct 4 2018, 4:46 PM
aardappel updated this revision to Diff 168412.Oct 4 2018, 4:47 PM

tab -> spaces

Harbormaster completed remote builds in B23493: Diff 168412.Oct 4 2018, 4:47 PM
aheejin added inline comments.Oct 4 2018, 4:47 PM
test/MC/WebAssembly/basic-assembly.s
50

Indentation looks weird here..?

50

Oh you fixed it already

aardappel marked an inline comment as done.Oct 4 2018, 4:48 PM
aardappel added inline comments.
test/MC/WebAssembly/basic-assembly.s
50

just fixed :)

aheejin accepted this revision.Oct 4 2018, 4:48 PM
This revision is now accepted and ready to land.Oct 4 2018, 4:48 PM
Closed by commit rL343830: [WebAssembly] Fixed missing "global" symbol type in AsmParser. (authored by aardappel). · Explain WhyOct 4 2018, 4:50 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
MC/
1 line
test/
MC/
WebAssembly/
2 lines

Diff 168410

lib/MC/MCExpr.cpp

Show First 20 Lines • Show All 413 Lines • ▼ Show 20 Lines return StringSwitch<VariantKind>(Name.lower())
.Case("target2", VK_ARM_TARGET2) .Case("target2", VK_ARM_TARGET2)
.Case("prel31", VK_ARM_PREL31) .Case("prel31", VK_ARM_PREL31)
.Case("sbrel", VK_ARM_SBREL) .Case("sbrel", VK_ARM_SBREL)
.Case("tlsldo", VK_ARM_TLSLDO) .Case("tlsldo", VK_ARM_TLSLDO)
.Case("lo8", VK_AVR_LO8) .Case("lo8", VK_AVR_LO8)
.Case("hi8", VK_AVR_HI8) .Case("hi8", VK_AVR_HI8)
.Case("hlo8", VK_AVR_HLO8) .Case("hlo8", VK_AVR_HLO8)
.Case("function", VK_WebAssembly_FUNCTION) .Case("function", VK_WebAssembly_FUNCTION)
.Case("global", VK_WebAssembly_GLOBAL)
.Case("typeindex", VK_WebAssembly_TYPEINDEX) .Case("typeindex", VK_WebAssembly_TYPEINDEX)
.Case("gotpcrel32@lo", VK_AMDGPU_GOTPCREL32_LO) .Case("gotpcrel32@lo", VK_AMDGPU_GOTPCREL32_LO)
.Case("gotpcrel32@hi", VK_AMDGPU_GOTPCREL32_HI) .Case("gotpcrel32@hi", VK_AMDGPU_GOTPCREL32_HI)
.Case("rel32@lo", VK_AMDGPU_REL32_LO) .Case("rel32@lo", VK_AMDGPU_REL32_LO)
.Case("rel32@hi", VK_AMDGPU_REL32_HI) .Case("rel32@hi", VK_AMDGPU_REL32_HI)
.Case("rel64", VK_AMDGPU_REL64) .Case("rel64", VK_AMDGPU_REL64)
.Default(VK_Invalid); .Default(VK_Invalid);
} }
▲ Show 20 Lines • Show All 464 Lines • Show Last 20 Lines

test/MC/WebAssembly/basic-assembly.s

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines.LBB0_2:
get_local 4 get_local 4
get_local 5 get_local 5
f32x4.add f32x4.add
# Test correct parsing of instructions with / and : in them: # Test correct parsing of instructions with / and : in them:
# TODO: enable once instruction has been added. # TODO: enable once instruction has been added.
#i32x4.trunc_s/f32x4:sat #i32x4.trunc_s/f32x4:sat
i32.trunc_s/f32 i32.trunc_s/f32
#i32.trunc_s:sat/f32 #i32.trunc_s:sat/f32
get_global __stack_pointer@GLOBAL
aheejinUnsubmitted
Done
ReplyInline Actions

Indentation looks weird here..?

aheejin: Indentation looks weird here..?
aheejinUnsubmitted
Not Done
ReplyInline Actions

Oh you fixed it already

aheejin: Oh you fixed it already
aardappelAuthorUnsubmitted
Not Done
ReplyInline Actions

just fixed :)

aardappel: just fixed :)
end_function end_function
# CHECK: .text # CHECK: .text
# CHECK-LABEL: test0: # CHECK-LABEL: test0:
# CHECK-NEXT: .param i32, i64 # CHECK-NEXT: .param i32, i64
# CHECK-NEXT: .local f32, f64 # CHECK-NEXT: .local f32, f64
# CHECK-NEXT: get_local 2 # CHECK-NEXT: get_local 2
Show All 24 Lines
# CHECK-NEXT: br_if 0 # 0: up to label1 # CHECK-NEXT: br_if 0 # 0: up to label1
# CHECK-NEXT: .LBB0_2: # CHECK-NEXT: .LBB0_2:
# CHECK-NEXT: end_loop # CHECK-NEXT: end_loop
# CHECK-NEXT: end_block # label0: # CHECK-NEXT: end_block # label0:
# CHECK-NEXT: get_local 4 # CHECK-NEXT: get_local 4
# CHECK-NEXT: get_local 5 # CHECK-NEXT: get_local 5
# CHECK-NEXT: f32x4.add # CHECK-NEXT: f32x4.add
# CHECK-NEXT: i32.trunc_s/f32 # CHECK-NEXT: i32.trunc_s/f32
# CHECK-NEXT: get_global __stack_pointer@GLOBAL
# CHECK-NEXT: end_function # CHECK-NEXT: end_function