wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[WebAssembly] Update function signature mismatch error message. NFC. 

We don't start our error messages with capital letters.

Split out from https://reviews.llvm.org/D48394

Differential Revision: https://reviews.llvm.org/D48400

llvm-svn: 335186
This commit is contained in:
Sam Clegg 2018-06-20 22:45:03 +00:00
parent 0f111dd704
commit ddaab86972
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/test/wasm/fatal-warnings.ll
View File

@ -3,8 +3,8 @@
; RUN: lld -flavor wasm -o %t.wasm %t.main.o %t.ret32.o 2>&1 | FileCheck %s -check-prefix=CHECK-WARN ; RUN: lld -flavor wasm -o %t.wasm %t.main.o %t.ret32.o 2>&1 | FileCheck %s -check-prefix=CHECK-WARN
; RUN: not lld -flavor wasm --fatal-warnings -o %t.wasm %t.main.o %t.ret32.o 2>&1 | FileCheck %s -check-prefix=CHECK-FATAL ; RUN: not lld -flavor wasm --fatal-warnings -o %t.wasm %t.main.o %t.ret32.o 2>&1 | FileCheck %s -check-prefix=CHECK-FATAL
; CHECK-WARN: warning: Function type mismatch: ret32 ; CHECK-WARN: warning: function signature mismatch: ret32
; CHECK-FATAL: error: Function type mismatch: ret32 ; CHECK-FATAL: error: function signature mismatch: ret32
target triple = "wasm32-unknown-unknown" target triple = "wasm32-unknown-unknown"

2
lld/test/wasm/signature-mismatch-weak.ll
View File

@ -13,6 +13,6 @@ entry:
ret void ret void
} }
; CHECK: warning: Function type mismatch: weakFn ; CHECK: warning: function signature mismatch: weakFn
; CHECK-NEXT: >>> defined as () -> I32 in {{.*}}signature-mismatch-weak.ll.tmp.o ; CHECK-NEXT: >>> defined as () -> I32 in {{.*}}signature-mismatch-weak.ll.tmp.o
; CHECK-NEXT: >>> defined as () -> I64 in {{.*}}signature-mismatch-weak.ll.tmp.strong.o ; CHECK-NEXT: >>> defined as () -> I64 in {{.*}}signature-mismatch-weak.ll.tmp.strong.o

4
lld/test/wasm/signature-mismatch.ll
View File

@ -17,10 +17,10 @@ entry:
declare i32 @ret32(i32, i64, i32) local_unnamed_addr #1 declare i32 @ret32(i32, i64, i32) local_unnamed_addr #1
; CHECK: error: Function type mismatch: ret32 ; CHECK: error: function signature mismatch: ret32
; CHECK-NEXT: >>> defined as (I32, I64, I32) -> I32 in {{.*}}.main.o ; CHECK-NEXT: >>> defined as (I32, I64, I32) -> I32 in {{.*}}.main.o
; CHECK-NEXT: >>> defined as (F32) -> I32 in {{.*}}.ret32.o ; CHECK-NEXT: >>> defined as (F32) -> I32 in {{.*}}.ret32.o
; REVERSE: error: Function type mismatch: ret32 ; REVERSE: error: function signature mismatch: ret32
; REVERSE-NEXT: >>> defined as (F32) -> I32 in {{.*}}.ret32.o ; REVERSE-NEXT: >>> defined as (F32) -> I32 in {{.*}}.ret32.o
; REVERSE-NEXT: >>> defined as (I32, I64, I32) -> I32 in {{.*}}.main.o ; REVERSE-NEXT: >>> defined as (I32, I64, I32) -> I32 in {{.*}}.main.o

2
lld/wasm/SymbolTable.cpp
View File

@ -116,7 +116,7 @@ static void checkFunctionType(const Symbol *Existing, const InputFile *File,
const WasmSignature *OldSig = ExistingFunction->getFunctionType(); const WasmSignature *OldSig = ExistingFunction->getFunctionType();
if (OldSig && NewSig && *NewSig != *OldSig) { if (OldSig && NewSig && *NewSig != *OldSig) {
warn("Function type mismatch: " + Existing->getName() + warn("function signature mismatch: " + Existing->getName() +
"\n>>> defined as " + toString(*OldSig) + " in " + "\n>>> defined as " + toString(*OldSig) + " in " +
toString(Existing->getFile()) + "\n>>> defined as " + toString(Existing->getFile()) + "\n>>> defined as " +
toString(*NewSig) + " in " + toString(File)); toString(*NewSig) + " in " + toString(File));