This is an archive of the discontinued LLVM Phabricator instance.

Differential D43919

Use Twine rather than StringRef for logging messages. NFC.
ClosedPublic

Authored by sbc100 on Feb 28 2018, 4:25 PM.

Details

Reviewers
ruiu
Commits
rGea397f67e32d: [WebAssembly] Use Twine rather than StringRef for logging messages
rL326398: [WebAssembly] Use Twine rather than StringRef for logging messages
rLLD326398: [WebAssembly] Use Twine rather than StringRef for logging messages
Summary

Also add missing tracing to writeU8.

Diff Detail

Repository
rLLD LLVM Linker

Event Timeline

sbc100 created this revision.Feb 28 2018, 4:25 PM
Herald added subscribers: llvm-commits, aheejin. · View Herald TranscriptFeb 28 2018, 4:25 PM
sbc100 retitled this revision from Use Twine rather than StringRef for logging messages Also restore tracing to writeU8. to Use Twine rather than StringRef for logging messages. NFC..Feb 28 2018, 4:26 PM
sbc100 edited the summary of this revision. (Show Details)
sbc100 added a reviewer: ruiu.
ruiu accepted this revision.Feb 28 2018, 4:38 PM

LGTM

This revision is now accepted and ready to land.Feb 28 2018, 4:38 PM
Closed by commit rLLD326398: [WebAssembly] Use Twine rather than StringRef for logging messages (authored by sbc). · Explain WhyFeb 28 2018, 4:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
wasm/
15 lines
19 lines

Diff 136432

wasm/WriterUtils.h

Show All 38 Linesinline bool operator!=(const llvm::wasm::WasmGlobalType &LHS,
return !(LHS == RHS); return !(LHS == RHS);
} }
namespace lld { namespace lld {
namespace wasm { namespace wasm {
void debugWrite(uint64_t Offset, const Twine &Msg); void debugWrite(uint64_t Offset, const Twine &Msg);
void writeUleb128(raw_ostream &OS, uint32_t Number, StringRef Msg); void writeUleb128(raw_ostream &OS, uint32_t Number, const Twine &Msg);
void writeSleb128(raw_ostream &OS, int32_t Number, StringRef Msg); void writeSleb128(raw_ostream &OS, int32_t Number, const Twine &Msg);
void writeBytes(raw_ostream &OS, const char *Bytes, size_t count, StringRef Msg); void writeBytes(raw_ostream &OS, const char *Bytes, size_t count,
const Twine &Msg);
void writeStr(raw_ostream &OS, StringRef String, StringRef Msg); void writeStr(raw_ostream &OS, StringRef String, const Twine &Msg);
void writeU8(raw_ostream &OS, uint8_t byte, StringRef Msg); void writeU8(raw_ostream &OS, uint8_t byte, const Twine &Msg);
void writeU32(raw_ostream &OS, uint32_t Number, StringRef Msg); void writeU32(raw_ostream &OS, uint32_t Number, const Twine &Msg);
void writeValueType(raw_ostream &OS, int32_t Type, StringRef Msg); void writeValueType(raw_ostream &OS, int32_t Type, const Twine &Msg);
void writeSig(raw_ostream &OS, const llvm::wasm::WasmSignature &Sig); void writeSig(raw_ostream &OS, const llvm::wasm::WasmSignature &Sig);
void writeInitExpr(raw_ostream &OS, const llvm::wasm::WasmInitExpr &InitExpr); void writeInitExpr(raw_ostream &OS, const llvm::wasm::WasmInitExpr &InitExpr);
void writeLimits(raw_ostream &OS, const llvm::wasm::WasmLimits &Limits); void writeLimits(raw_ostream &OS, const llvm::wasm::WasmLimits &Limits);
void writeGlobalType(raw_ostream &OS, const llvm::wasm::WasmGlobalType &Type); void writeGlobalType(raw_ostream &OS, const llvm::wasm::WasmGlobalType &Type);
Show All 16 Lines

wasm/WriterUtils.cpp

Show All 34 Lines
} }
namespace lld { namespace lld {
void wasm::debugWrite(uint64_t Offset, const Twine &Msg) { void wasm::debugWrite(uint64_t Offset, const Twine &Msg) {
DEBUG(dbgs() << format(" | %08lld: ", Offset) << Msg << "\n"); DEBUG(dbgs() << format(" | %08lld: ", Offset) << Msg << "\n");
} }
void wasm::writeUleb128(raw_ostream &OS, uint32_t Number, StringRef Msg) { void wasm::writeUleb128(raw_ostream &OS, uint32_t Number, const Twine &Msg) {
debugWrite(OS.tell(), Msg + "[" + utohexstr(Number) + "]"); debugWrite(OS.tell(), Msg + "[" + utohexstr(Number) + "]");
encodeULEB128(Number, OS); encodeULEB128(Number, OS);
} }
void wasm::writeSleb128(raw_ostream &OS, int32_t Number, StringRef Msg) { void wasm::writeSleb128(raw_ostream &OS, int32_t Number, const Twine &Msg) {
debugWrite(OS.tell(), Msg + "[" + utohexstr(Number) + "]"); debugWrite(OS.tell(), Msg + "[" + utohexstr(Number) + "]");
encodeSLEB128(Number, OS); encodeSLEB128(Number, OS);
} }
void wasm::writeBytes(raw_ostream &OS, const char *Bytes, size_t Count, void wasm::writeBytes(raw_ostream &OS, const char *Bytes, size_t Count,
StringRef Msg) { const Twine &Msg) {
debugWrite(OS.tell(), Msg + " [data[" + Twine(Count) + "]]"); debugWrite(OS.tell(), Msg + " [data[" + Twine(Count) + "]]");
OS.write(Bytes, Count); OS.write(Bytes, Count);
} }
void wasm::writeStr(raw_ostream &OS, StringRef String, StringRef Msg) { void wasm::writeStr(raw_ostream &OS, StringRef String, const Twine &Msg) {
debugWrite(OS.tell(), debugWrite(OS.tell(),
Msg + " [str[" + Twine(String.size()) + "]: " + String + "]"); Msg + " [str[" + Twine(String.size()) + "]: " + String + "]");
encodeULEB128(String.size(), OS); encodeULEB128(String.size(), OS);
OS.write(String.data(), String.size()); OS.write(String.data(), String.size());
} }
void wasm::writeU8(raw_ostream &OS, uint8_t Byte, StringRef Msg) { OS << Byte; } void wasm::writeU8(raw_ostream &OS, uint8_t Byte, const Twine &Msg) {
debugWrite(OS.tell(), Msg + " [0x" + utohexstr(Byte) + "]");
OS << Byte;
}
void wasm::writeU32(raw_ostream &OS, uint32_t Number, StringRef Msg) { void wasm::writeU32(raw_ostream &OS, uint32_t Number, const Twine &Msg) {
debugWrite(OS.tell(), Msg + "[" + utohexstr(Number) + "]"); debugWrite(OS.tell(), Msg + "[0x" + utohexstr(Number) + "]");
support::endian::Writer<support::little>(OS).write(Number); support::endian::Writer<support::little>(OS).write(Number);
} }
void wasm::writeValueType(raw_ostream &OS, int32_t Type, StringRef Msg) { void wasm::writeValueType(raw_ostream &OS, int32_t Type, const Twine &Msg) {
debugWrite(OS.tell(), Msg + "[type: " + valueTypeToString(Type) + "]"); debugWrite(OS.tell(), Msg + "[type: " + valueTypeToString(Type) + "]");
encodeSLEB128(Type, OS); encodeSLEB128(Type, OS);
} }
void wasm::writeSig(raw_ostream &OS, const WasmSignature &Sig) { void wasm::writeSig(raw_ostream &OS, const WasmSignature &Sig) {
writeSleb128(OS, WASM_TYPE_FUNC, "signature type"); writeSleb128(OS, WASM_TYPE_FUNC, "signature type");
writeUleb128(OS, Sig.ParamTypes.size(), "param Count"); writeUleb128(OS, Sig.ParamTypes.size(), "param Count");
for (int32_t ParamType : Sig.ParamTypes) { for (int32_t ParamType : Sig.ParamTypes) {
▲ Show 20 Lines • Show All 118 Lines • Show Last 20 Lines