diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/binary-reader-linker.cc | 2 | ||||
| -rw-r--r-- | src/common.h | 9 | ||||
| -rw-r--r-- | src/tools/spectest-interp.cc | 2 | ||||
| -rw-r--r-- | src/tools/wasm-interp.cc | 2 | ||||
| -rw-r--r-- | src/tools/wasm-objdump.cc | 2 | ||||
| -rw-r--r-- | src/tools/wasm-opcodecnt.cc | 2 | ||||
| -rw-r--r-- | src/tools/wasm-validate.cc | 2 | ||||
| -rw-r--r-- | src/tools/wasm2wat.cc | 2 |
8 files changed, 7 insertions, 16 deletions
diff --git a/src/binary-reader-linker.cc b/src/binary-reader-linker.cc index aab17f1a..0af95304 100644 --- a/src/binary-reader-linker.cc +++ b/src/binary-reader-linker.cc @@ -289,7 +289,7 @@ Result ReadBinaryLinker(LinkerInputBinary* input_info, LinkOptions* options) { ReadBinaryOptions read_options; read_options.read_debug_names = true; read_options.log_stream = options->log_stream; - return ReadBinary(DataOrNull(input_info->data), input_info->data.size(), + return ReadBinary(input_info->data.data(), input_info->data.size(), &reader, &read_options); } diff --git a/src/common.h b/src/common.h index 1709e506..342316b2 100644 --- a/src/common.h +++ b/src/common.h @@ -126,15 +126,6 @@ void Destruct(T& placement) { placement.~T(); } -// Calls data() on vector, string, etc. but will return nullptr if the -// container is empty. -// TODO(binji): this should probably be removed when there is a more direct way -// to represent a memory slice (e.g. something similar to GSL's span) -template <typename T> -typename T::value_type* DataOrNull(T& container) { - return container.empty() ? nullptr : container.data(); -} - inline std::string WABT_PRINTF_FORMAT(1, 2) StringPrintf(const char* format, ...) { va_list args; diff --git a/src/tools/spectest-interp.cc b/src/tools/spectest-interp.cc index 8779f44f..c461b827 100644 --- a/src/tools/spectest-interp.cc +++ b/src/tools/spectest-interp.cc @@ -1081,7 +1081,7 @@ static wabt::Result ReadModule(const char* module_filename, const bool kStopOnFirstError = true; ReadBinaryOptions options(s_features, s_log_stream.get(), kReadDebugNames, kStopOnFirstError); - result = ReadBinaryInterp(env, DataOrNull(file_data), file_data.size(), + result = ReadBinaryInterp(env, file_data.data(), file_data.size(), &options, error_handler, out_module); if (Succeeded(result)) { diff --git a/src/tools/wasm-interp.cc b/src/tools/wasm-interp.cc index 82b455e0..0503e621 100644 --- a/src/tools/wasm-interp.cc +++ b/src/tools/wasm-interp.cc @@ -141,7 +141,7 @@ static wabt::Result ReadModule(const char* module_filename, const bool kStopOnFirstError = true; ReadBinaryOptions options(s_features, s_log_stream.get(), kReadDebugNames, kStopOnFirstError); - result = ReadBinaryInterp(env, DataOrNull(file_data), file_data.size(), + result = ReadBinaryInterp(env, file_data.data(), file_data.size(), &options, error_handler, out_module); if (Succeeded(result)) { diff --git a/src/tools/wasm-objdump.cc b/src/tools/wasm-objdump.cc index c8c8e7ad..28a059d7 100644 --- a/src/tools/wasm-objdump.cc +++ b/src/tools/wasm-objdump.cc @@ -72,7 +72,7 @@ Result dump_file(const char* filename) { std::vector<uint8_t> file_data; CHECK_RESULT(ReadFile(filename, &file_data)); - uint8_t* data = DataOrNull(file_data); + uint8_t* data = file_data.data(); size_t size = file_data.size(); // Perform serveral passed over the binary in order to print out different diff --git a/src/tools/wasm-opcodecnt.cc b/src/tools/wasm-opcodecnt.cc index fcd9d2fa..fd01f62b 100644 --- a/src/tools/wasm-opcodecnt.cc +++ b/src/tools/wasm-opcodecnt.cc @@ -158,7 +158,7 @@ int ProgramMain(int argc, char** argv) { if (Succeeded(result)) { OpcodeInfoCounts counts; - result = ReadBinaryOpcnt(DataOrNull(file_data), file_data.size(), + result = ReadBinaryOpcnt(file_data.data(), file_data.size(), &s_read_binary_options, &counts); if (Succeeded(result)) { stream.Writef("Opcode counts:\n"); diff --git a/src/tools/wasm-validate.cc b/src/tools/wasm-validate.cc index 919d0bf4..761d3c16 100644 --- a/src/tools/wasm-validate.cc +++ b/src/tools/wasm-validate.cc @@ -77,7 +77,7 @@ int ProgramMain(int argc, char** argv) { const bool kStopOnFirstError = true; ReadBinaryOptions options(s_features, s_log_stream.get(), s_read_debug_names, kStopOnFirstError); - result = ReadBinaryIr(s_infile.c_str(), DataOrNull(file_data), + result = ReadBinaryIr(s_infile.c_str(), file_data.data(), file_data.size(), &options, &error_handler, &module); if (Succeeded(result)) { WastLexer* lexer = nullptr; diff --git a/src/tools/wasm2wat.cc b/src/tools/wasm2wat.cc index a0105bbf..11f401c8 100644 --- a/src/tools/wasm2wat.cc +++ b/src/tools/wasm2wat.cc @@ -106,7 +106,7 @@ int ProgramMain(int argc, char** argv) { const bool kStopOnFirstError = true; ReadBinaryOptions options(s_features, s_log_stream.get(), s_read_debug_names, kStopOnFirstError); - result = ReadBinaryIr(s_infile.c_str(), DataOrNull(file_data), + result = ReadBinaryIr(s_infile.c_str(), file_data.data(), file_data.size(), &options, &error_handler, &module); if (Succeeded(result)) { if (Succeeded(result) && s_validate) { |