This is an archive of the discontinued LLVM Phabricator instance.

Differential D63955

[WebAssembly] Allow @object in .type directives.
ClosedPublic

Authored by aardappel on Jun 28 2019, 1:47 PM.

Details

Reviewers
sbc100
Commits
rG35bcba4fae8a: [WebAssembly] Allow @object in .type directives.
rL364688: [WebAssembly] Allow @object in .type directives.

Diff Detail

Event Timeline

aardappel created this revision.Jun 28 2019, 1:47 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 28 2019, 1:47 PM
Herald added subscribers: llvm-commits, sunfish, aheejin and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B34093: Diff 207141.Jun 28 2019, 1:48 PM
sbc100 accepted this revision.Jun 28 2019, 1:56 PM
This revision is now accepted and ready to land.Jun 28 2019, 1:56 PM
Closed by commit rL364688: [WebAssembly] Allow @object in .type directives. (authored by aardappel). · Explain WhyJun 28 2019, 2:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

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

Diff 207141

lib/MC/MCParser/WasmAsmParser.cpp

Show First 20 Lines • Show All 181 Lines • ▼ Show 20 Lines bool parseDirectiveType(StringRef, SMLoc) {
if (!(isNext(AsmToken::Comma) && isNext(AsmToken::At) && if (!(isNext(AsmToken::Comma) && isNext(AsmToken::At) &&
Lexer->is(AsmToken::Identifier))) Lexer->is(AsmToken::Identifier)))
return error("Expected label,@type declaration, got: ", Lexer->getTok()); return error("Expected label,@type declaration, got: ", Lexer->getTok());
auto TypeName = Lexer->getTok().getString(); auto TypeName = Lexer->getTok().getString();
if (TypeName == "function") if (TypeName == "function")
WasmSym->setType(wasm::WASM_SYMBOL_TYPE_FUNCTION); WasmSym->setType(wasm::WASM_SYMBOL_TYPE_FUNCTION);
else if (TypeName == "global") else if (TypeName == "global")
WasmSym->setType(wasm::WASM_SYMBOL_TYPE_GLOBAL); WasmSym->setType(wasm::WASM_SYMBOL_TYPE_GLOBAL);
else if (TypeName == "object")
WasmSym->setType(wasm::WASM_SYMBOL_TYPE_DATA);
else else
return error("Unknown WASM symbol type: ", Lexer->getTok()); return error("Unknown WASM symbol type: ", Lexer->getTok());
Lex(); Lex();
return expect(AsmToken::EndOfStatement, "EOL"); return expect(AsmToken::EndOfStatement, "EOL");
} }
// FIXME: Shared with ELF. // FIXME: Shared with ELF.
/// ParseDirectiveIdent /// ParseDirectiveIdent
▲ Show 20 Lines • Show All 53 Lines • Show Last 20 Lines

test/MC/WebAssembly/basic-assembly.s

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Lines.LBB0_4:
throw 0 throw 0
.LBB0_5: .LBB0_5:
#i32.trunc_sat_f32_s #i32.trunc_sat_f32_s
global.get __stack_pointer global.get __stack_pointer
end_function end_function
.section .rodata..L.str,"",@ .section .rodata..L.str,"",@
.hidden .L.str .hidden .L.str
.type .L.str,@object
.L.str: .L.str:
.int8 'H' .int8 'H'
.asciz "ello, World!" .asciz "ello, World!"
.size .L.str, 14 .size .L.str, 14
.ident "clang version 9.0.0 (trunk 364502) (llvm/trunk 364571)" .ident "clang version 9.0.0 (trunk 364502) (llvm/trunk 364571)"
.globaltype __stack_pointer, i32 .globaltype __stack_pointer, i32
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines