From: Dan Gohman Date: Mon, 29 Apr 2019 21:09:44 +0000 (+0000) Subject: [WebAssembly] Define the signature for __stack_chk_fail X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f53d5f4e7d58b6dcaae045884b91f5c5695a481;p=llvm [WebAssembly] Define the signature for __stack_chk_fail The WebAssembly backend needs to know the signatures of all runtime libcall functions. This adds the signature for __stack_chk_fail which was previously missing. Also, make the error message for a missing libcall include the name of the function. Differential Revision: https://reviews.llvm.org/D59521 Reviewed By: sbc100 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@359505 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp b/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp index fbdf9c576a9..215c63c1233 100644 --- a/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp +++ b/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp @@ -309,6 +309,9 @@ struct RuntimeLibcallSignatureTable { Table[RTLIB::MEMSET] = iPTR_func_iPTR_i32_iPTR; Table[RTLIB::MEMMOVE] = iPTR_func_iPTR_iPTR_iPTR; + // __stack_chk_fail + Table[RTLIB::STACKPROTECTOR_CHECK_FAIL] = func; + // Element-wise Atomic memory // TODO: Fix these when we implement atomic support Table[RTLIB::MEMCPY_ELEMENT_UNORDERED_ATOMIC_1] = unsupported; @@ -837,6 +840,11 @@ void llvm::getLibcallSignature(const WebAssemblySubtarget &Subtarget, SmallVectorImpl &Params) { auto &Map = LibcallNameMap->Map; auto Val = Map.find(Name); - assert(Val != Map.end() && "unexpected runtime library name"); +#ifndef NDEBUG + if (Val == Map.end()) { + errs() << "runtime library name: " << Name << "\n"; + llvm_unreachable("unexpected runtime library name"); + } +#endif return getLibcallSignature(Subtarget, Val->second, Rets, Params); } diff --git a/test/CodeGen/WebAssembly/stack-protector.ll b/test/CodeGen/WebAssembly/stack-protector.ll new file mode 100644 index 00000000000..ef0bf94fcec --- /dev/null +++ b/test/CodeGen/WebAssembly/stack-protector.ll @@ -0,0 +1,30 @@ +; RUN: llc -verify-machineinstrs -mtriple=wasm32-unknown-unknown < %s | FileCheck -check-prefix=WASM32 %s + +; WASM32: i32.load 28 +; WASM32-NEXT: i32.sub +; WASM32-NEXT: br_if 0 + +; WASM32: __stack_chk_fail + +@"\01LC" = internal constant [11 x i8] c"buf == %s\0A\00" ; <[11 x i8]*> [#uses=1] + +define void @test(i8* %a) nounwind ssp { +entry: + %a_addr = alloca i8* ; [#uses=2] + %buf = alloca [8 x i8] ; <[8 x i8]*> [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store i8* %a, i8** %a_addr + %buf1 = bitcast [8 x i8]* %buf to i8* ; [#uses=1] + %0 = load i8*, i8** %a_addr, align 4 ; [#uses=1] + %1 = call i8* @strcpy(i8* %buf1, i8* %0) nounwind ; [#uses=0] + %buf2 = bitcast [8 x i8]* %buf to i8* ; [#uses=1] + %2 = call i32 (i8*, ...) @printf(i8* getelementptr ([11 x i8], [11 x i8]* @"\01LC", i32 0, i32 0), i8* %buf2) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +declare i8* @strcpy(i8*, i8*) nounwind + +declare i32 @printf(i8*, ...) nounwind