Skip to content

[WebAssembly] support getVT from externref and funcref #97080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HerrCai0907 wants to merge 5 commits into from
Closed

[WebAssembly] support getVT from externref and funcref #97080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b497375
[WebAssembly] support getVT from wasm externref and funcref
Jun 28, 2024
feb29be
Merge branch 'main' into fix69894
HerrCai0907 Jun 29, 2024
20d847e
update test
Jun 30, 2024
ea536f8
Merge branch 'fix69894' of https://github.com/HerrCai0907/llvm-projec…
Jun 30, 2024
b8eae93
Merge branch 'main' of https://github.com/llvm/llvm-project into fix6…
Jun 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions clang/test/CodeGen/WebAssembly/wasm-externref-novec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// RUN: %clang -O2 --target=wasm32 -S -emit-llvm -mreference-types -o - %s | FileCheck %s

// Issue: https://github.com/llvm/llvm-project/issues/69894

__externref_t foo(void);
// CHECK: declare ptr addrspace(10) @foo()

void bar(__externref_t);
// CHECK: declare void @bar(ptr addrspace(10))

void test(int flag, __externref_t ref1, __externref_t ref2) {
if (flag) {
ref1 = foo();
ref2 = foo();
}
bar(ref1);
bar(ref2);
}
2 changes: 2 additions & 0 deletions llvm/include/llvm/IR/Type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,8 @@ class Type {
}
static Type *getFloatingPointTy(LLVMContext &C, const fltSemantics &S);

static constexpr unsigned WasmExternrefAddressSpace = 10;
static constexpr unsigned WasmFuncrefAddressSpace = 20;
//===--------------------------------------------------------------------===//
// Convenience methods for getting pointer types.
//
Expand Down
9 changes: 9 additions & 0 deletions llvm/lib/CodeGen/ValueTypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,15 @@ MVT MVT::getVT(Type *Ty, bool HandleUnknown){
getVT(VTy->getElementType(), /*HandleUnknown=*/ false),
VTy->getElementCount());
}
case Type::PointerTyID: {
if (Ty->getPointerAddressSpace() == Type::WasmExternrefAddressSpace)
return MVT(MVT::externref);
if (Ty->getPointerAddressSpace() == Type::WasmFuncrefAddressSpace)
return MVT(MVT::funcref);
if (HandleUnknown)
return MVT(MVT::Other);
llvm_unreachable("Unknown pointer type!");
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/IR/Type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,13 @@ IntegerType *Type::getIntNTy(LLVMContext &C, unsigned N) {

Type *Type::getWasm_ExternrefTy(LLVMContext &C) {
// opaque pointer in addrspace(10)
static PointerType *Ty = PointerType::get(C, 10);
static PointerType *Ty = PointerType::get(C, WasmExternrefAddressSpace);
return Ty;
}

Type *Type::getWasm_FuncrefTy(LLVMContext &C) {
// opaque pointer in addrspace(20)
static PointerType *Ty = PointerType::get(C, 20);
static PointerType *Ty = PointerType::get(C, WasmFuncrefAddressSpace);
return Ty;
}

Expand Down