commit 523a8ab0354a1b32604adf53ea2cc4ced9c2c385
author Sam Clegg <sbc@chromium.org> Thu Nov 01 01:08:37 2018 +0000
committer Sam Clegg <sbc@chromium.org> Thu Nov 01 01:08:37 2018 +0000
tree aaf2765ee50f1e248390e085278d432bd1bfe8b6
parent 2d18b6d390a6a6be5053aaa31f9e2d15669c46c0

[WebAssembly] Remove duplicate function. NFC.

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

git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@345806 91177308-0d34-0410-b5e6-96231b3b80d8

test/wasm/lto/signature-mismatch.ll

diff --git a/test/wasm/lto/signature-mismatch.ll b/test/wasm/lto/signature-mismatch.ll
index 4b6b3b8..e48bb39 100644
--- a/test/wasm/lto/signature-mismatch.ll
+++ b/test/wasm/lto/signature-mismatch.ll
@@ -15,5 +15,5 @@
   ret void
 }
 
-; CHECK: >>> defined as (I32) -> void in {{.*}}signature-mismatch.ll.tmp1.o
+; CHECK: >>> defined as (i32) -> void in {{.*}}signature-mismatch.ll.tmp1.o
 ; CHECK: >>> defined as () -> void in lto.tmp

test/wasm/signature-mismatch-weak.ll

diff --git a/test/wasm/signature-mismatch-weak.ll b/test/wasm/signature-mismatch-weak.ll
index dbf73d1..4d2b02c 100644
--- a/test/wasm/signature-mismatch-weak.ll
+++ b/test/wasm/signature-mismatch-weak.ll
@@ -14,5 +14,5 @@
 }
 
 ; CHECK: warning: function signature mismatch: weakFn
-; 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 () -> i32 in {{.*}}signature-mismatch-weak.ll.tmp.o
+; CHECK-NEXT: >>> defined as () -> i64 in {{.*}}signature-mismatch-weak.ll.tmp.strong.o

test/wasm/signature-mismatch.ll

diff --git a/test/wasm/signature-mismatch.ll b/test/wasm/signature-mismatch.ll
index d750d4f..8f13d64 100644
--- a/test/wasm/signature-mismatch.ll
+++ b/test/wasm/signature-mismatch.ll
@@ -18,9 +18,9 @@
 declare i32 @ret32(i32, i64, i32) local_unnamed_addr #1
 
 ; CHECK: error: function signature mismatch: ret32
-; CHECK-NEXT: >>> defined as (I32, I64, I32) -> I32 in {{.*}}.main.o
-; CHECK-NEXT: >>> defined as (F32) -> I32 in {{.*}}.ret32.o
+; CHECK-NEXT: >>> defined as (i32, i64, i32) -> i32 in {{.*}}.main.o
+; CHECK-NEXT: >>> defined as (f32) -> i32 in {{.*}}.ret32.o
 
 ; REVERSE: error: function signature mismatch: ret32
-; REVERSE-NEXT: >>> defined as (F32) -> I32 in {{.*}}.ret32.o
-; REVERSE-NEXT: >>> defined as (I32, I64, I32) -> I32 in {{.*}}.main.o
+; REVERSE-NEXT: >>> defined as (f32) -> i32 in {{.*}}.ret32.o
+; REVERSE-NEXT: >>> defined as (i32, i64, i32) -> i32 in {{.*}}.main.o

wasm/WriterUtils.cpp

diff --git a/wasm/WriterUtils.cpp b/wasm/WriterUtils.cpp
index a92da74..6de48d9 100644
--- a/wasm/WriterUtils.cpp
+++ b/wasm/WriterUtils.cpp
@@ -19,21 +19,6 @@
 using namespace llvm::wasm;
 using namespace lld::wasm;
 
-static const char *valueTypeToString(ValType Type) {
-  switch (Type) {
-  case wasm::ValType::I32:
-    return "i32";
-  case wasm::ValType::I64:
-    return "i64";
-  case wasm::ValType::F32:
-    return "f32";
-  case wasm::ValType::F64:
-    return "f64";
-  default:
-    llvm_unreachable("invalid value type");
-  }
-}
-
 namespace lld {
 
 void wasm::debugWrite(uint64_t Offset, const Twine &Msg) {
@@ -75,7 +60,7 @@
 
 void wasm::writeValueType(raw_ostream &OS, ValType Type, const Twine &Msg) {
   writeU8(OS, static_cast<uint8_t>(Type),
-          Msg + "[type: " + valueTypeToString(Type) + "]");
+          Msg + "[type: " + toString(Type) + "]");
 }
 
 void wasm::writeSig(raw_ostream &OS, const WasmSignature &Sig) {
@@ -178,15 +163,15 @@
 std::string lld::toString(ValType Type) {
   switch (Type) {
   case ValType::I32:
-    return "I32";
+    return "i32";
   case ValType::I64:
-    return "I64";
+    return "i64";
   case ValType::F32:
-    return "F32";
+    return "f32";
   case ValType::F64:
-    return "F64";
+    return "f64";
   case ValType::V128:
-    return "V128";
+    return "v128";
   case ValType::EXCEPT_REF:
     return "except_ref";
   }