This is an archive of the discontinued LLVM Phabricator instance.

Differential D44037

[WebAssembly] Avoid cast ExprType to wasm::ValType
ClosedPublic

Authored by sbc100 on Mar 2 2018, 11:38 AM.

Details

Reviewers
aheejin
Commits
rGbd1716aed120: [WebAssembly] Avoid cast ExprType to wasm::ValType
rL326618: [WebAssembly] Avoid cast ExprType to wasm::ValType
Summary

This cast cast causing invalid signatures to be written for libcall functions.

Add an MC test which includes a call to builtin memcpy.

Diff Detail

Repository
rL LLVM

Event Timeline

sbc100 created this revision.Mar 2 2018, 11:38 AM
Herald added subscribers: llvm-commits, sunfish, aheejin and 3 others. · View Herald TranscriptMar 2 2018, 11:38 AM
sbc100 added a reviewer: aheejin.Mar 2 2018, 11:38 AM
sbc100 mentioned this in D44034: Reland "[WebAssembly] More uses of uint8_t for single byte values".
Harbormaster completed remote builds in B15639: Diff 136820.Mar 2 2018, 11:39 AM
sbc100 updated this revision to Diff 136828.Mar 2 2018, 12:26 PM
  • add test
Harbormaster completed remote builds in B15641: Diff 136828.Mar 2 2018, 12:27 PM
sbc100 edited the summary of this revision. (Show Details)Mar 2 2018, 12:27 PM
aheejin accepted this revision.Mar 2 2018, 12:50 PM

Lgtm. Would we need enum class ValType : unsigned here as well?

This revision is now accepted and ready to land.Mar 2 2018, 12:50 PM
Closed by commit rL326618: [WebAssembly] Avoid cast ExprType to wasm::ValType (authored by sbc). · Explain WhyMar 2 2018, 1:35 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
Target/
WebAssembly/
61 lines
test/
MC/
WebAssembly/
30 lines

Diff 136839

llvm/trunk/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp

Show First 20 Lines • Show All 485 Lines • ▼ Show 20 Lines
void llvm::GetSignature(const WebAssemblySubtarget &Subtarget, void llvm::GetSignature(const WebAssemblySubtarget &Subtarget,
RTLIB::Libcall LC, SmallVectorImpl<wasm::ValType> &Rets, RTLIB::Libcall LC, SmallVectorImpl<wasm::ValType> &Rets,
SmallVectorImpl<wasm::ValType> &Params) { SmallVectorImpl<wasm::ValType> &Params) {
assert(Rets.empty()); assert(Rets.empty());
assert(Params.empty()); assert(Params.empty());
WebAssembly::ExprType iPTR = Subtarget.hasAddr64() ? wasm::ValType iPTR =
WebAssembly::ExprType::I64 : Subtarget.hasAddr64() ? wasm::ValType::I64 : wasm::ValType::I32;
WebAssembly::ExprType::I32;
auto& Table = RuntimeLibcallSignatures->Table; auto& Table = RuntimeLibcallSignatures->Table;
switch (Table[LC]) { switch (Table[LC]) {
case func: case func:
break; break;
case f32_func_f32: case f32_func_f32:
Rets.push_back(wasm::ValType::F32); Rets.push_back(wasm::ValType::F32);
Params.push_back(wasm::ValType::F32); Params.push_back(wasm::ValType::F32);
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines case i16_func_f32:
break; break;
case i8_func_i8_i8: case i8_func_i8_i8:
Rets.push_back(wasm::ValType::I32); Rets.push_back(wasm::ValType::I32);
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
break; break;
case func_f32_iPTR_iPTR: case func_f32_iPTR_iPTR:
Params.push_back(wasm::ValType::F32); Params.push_back(wasm::ValType::F32);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
break; break;
case func_f64_iPTR_iPTR: case func_f64_iPTR_iPTR:
Params.push_back(wasm::ValType::F64); Params.push_back(wasm::ValType::F64);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
break; break;
case i16_func_i16_i16: case i16_func_i16_i16:
Rets.push_back(wasm::ValType::I32); Rets.push_back(wasm::ValType::I32);
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
break; break;
case i32_func_f32_f32: case i32_func_f32_f32:
Rets.push_back(wasm::ValType::I32); Rets.push_back(wasm::ValType::I32);
Show All 15 Lines case i64_func_i64_i64:
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
break; break;
case i64_i64_func_f32: case i64_i64_func_f32:
#if 0 // TODO: Enable this when wasm gets multiple-return-value support. #if 0 // TODO: Enable this when wasm gets multiple-return-value support.
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
#else #else
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
#endif #endif
Params.push_back(wasm::ValType::F32); Params.push_back(wasm::ValType::F32);
break; break;
case i64_i64_func_f64: case i64_i64_func_f64:
#if 0 // TODO: Enable this when wasm gets multiple-return-value support. #if 0 // TODO: Enable this when wasm gets multiple-return-value support.
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
#else #else
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
#endif #endif
Params.push_back(wasm::ValType::F64); Params.push_back(wasm::ValType::F64);
break; break;
case i16_i16_func_i16_i16: case i16_i16_func_i16_i16:
#if 0 // TODO: Enable this when wasm gets multiple-return-value support. #if 0 // TODO: Enable this when wasm gets multiple-return-value support.
Rets.push_back(wasm::ValType::I32); Rets.push_back(wasm::ValType::I32);
Rets.push_back(wasm::ValType::I32); Rets.push_back(wasm::ValType::I32);
#else #else
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
#endif #endif
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
break; break;
case i32_i32_func_i32_i32: case i32_i32_func_i32_i32:
#if 0 // TODO: Enable this when wasm gets multiple-return-value support. #if 0 // TODO: Enable this when wasm gets multiple-return-value support.
Rets.push_back(wasm::ValType::I32); Rets.push_back(wasm::ValType::I32);
Rets.push_back(wasm::ValType::I32); Rets.push_back(wasm::ValType::I32);
#else #else
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
#endif #endif
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
break; break;
case i64_i64_func_i64_i64: case i64_i64_func_i64_i64:
#if 0 // TODO: Enable this when wasm gets multiple-return-value support. #if 0 // TODO: Enable this when wasm gets multiple-return-value support.
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
#else #else
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
#endif #endif
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
break; break;
case i64_i64_func_i64_i64_i64_i64: case i64_i64_func_i64_i64_i64_i64:
#if 0 // TODO: Enable this when wasm gets multiple-return-value support. #if 0 // TODO: Enable this when wasm gets multiple-return-value support.
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
#else #else
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
#endif #endif
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
break; break;
case i64_i64_i64_i64_func_i64_i64_i64_i64: case i64_i64_i64_i64_func_i64_i64_i64_i64:
#if 0 // TODO: Enable this when wasm gets multiple-return-value support. #if 0 // TODO: Enable this when wasm gets multiple-return-value support.
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
#else #else
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
#endif #endif
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
break; break;
case i64_i64_func_i64_i64_i32: case i64_i64_func_i64_i64_i32:
#if 0 // TODO: Enable this when wasm gets multiple-return-value support. #if 0 // TODO: Enable this when wasm gets multiple-return-value support.
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
#else #else
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
#endif #endif
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
break; break;
case iPTR_func_iPTR_i32_iPTR: case iPTR_func_iPTR_i32_iPTR:
Rets.push_back(wasm::ValType(iPTR)); Rets.push_back(iPTR);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
break; break;
case iPTR_func_iPTR_iPTR_iPTR: case iPTR_func_iPTR_iPTR_iPTR:
Rets.push_back(wasm::ValType(iPTR)); Rets.push_back(iPTR);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
break; break;
case f32_func_f32_f32_f32: case f32_func_f32_f32_f32:
Rets.push_back(wasm::ValType::F32); Rets.push_back(wasm::ValType::F32);
Params.push_back(wasm::ValType::F32); Params.push_back(wasm::ValType::F32);
Params.push_back(wasm::ValType::F32); Params.push_back(wasm::ValType::F32);
Params.push_back(wasm::ValType::F32); Params.push_back(wasm::ValType::F32);
break; break;
case f64_func_f64_f64_f64: case f64_func_f64_f64_f64:
Rets.push_back(wasm::ValType::F64); Rets.push_back(wasm::ValType::F64);
Params.push_back(wasm::ValType::F64); Params.push_back(wasm::ValType::F64);
Params.push_back(wasm::ValType::F64); Params.push_back(wasm::ValType::F64);
Params.push_back(wasm::ValType::F64); Params.push_back(wasm::ValType::F64);
break; break;
case func_i64_i64_iPTR_iPTR: case func_i64_i64_iPTR_iPTR:
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
break; break;
case func_iPTR_f32: case func_iPTR_f32:
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType::F32); Params.push_back(wasm::ValType::F32);
break; break;
case func_iPTR_f64: case func_iPTR_f64:
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType::F64); Params.push_back(wasm::ValType::F64);
break; break;
case func_iPTR_i32: case func_iPTR_i32:
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
break; break;
case func_iPTR_i64: case func_iPTR_i64:
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
break; break;
case func_iPTR_i64_i64: case func_iPTR_i64_i64:
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
break; break;
case func_iPTR_i64_i64_i64_i64: case func_iPTR_i64_i64_i64_i64:
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
break; break;
case func_iPTR_i64_i64_i64_i64_i64_i64: case func_iPTR_i64_i64_i64_i64_i64_i64:
Params.push_back(wasm::ValType(iPTR)); Params.push_back(iPTR);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
break; break;
case i32_func_i64_i64: case i32_func_i64_i64:
Show All 27 Lines

llvm/trunk/test/MC/WebAssembly/libcall.ll

; RUN: llc -filetype=obj %s -o - | obj2yaml | FileCheck %s
target triple = "wasm32-unknown-unknown-wasm"
define hidden void @call_memcpy(i8* align 4 %a, i8* align 4 %b) {
entry:
tail call void @llvm.memcpy.p0i8.p0i8.i32(i8* align 4 %a, i8* align 4 %b, i32 512, i1 false)
ret void
}
declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture writeonly, i8* nocapture readonly, i32, i1)
; CHECK: --- !WASM
; CHECK-NEXT: FileHeader:
; CHECK-NEXT: Version: 0x00000001
; CHECK-NEXT: Sections:
; CHECK-NEXT: - Type: TYPE
; CHECK-NEXT: Signatures:
; CHECK-NEXT: - Index: 0
; CHECK-NEXT: ReturnType: NORESULT
; CHECK-NEXT: ParamTypes:
; CHECK-NEXT: - I32
; CHECK-NEXT: - I32
; CHECK-NEXT: - Index: 1
; CHECK-NEXT: ReturnType: I32
; CHECK-NEXT: ParamTypes:
; CHECK-NEXT: - I32
; CHECK-NEXT: - I32
; CHECK-NEXT: - I32
; CHECK-NEXT: - Type: IMPORT