From 54d68665f25280e7c84874f36b4cae3c16789a19 Mon Sep 17 00:00:00 2001
From: Clemens Hammacher <clemensh@chromium.org>
Date: Wed, 8 Nov 2017 11:25:14 +0100
Subject: [PATCH] [wasm] [fuzzer] [cleanup] Reuse helper method

We already have a helper method for generating a sequence of values.
Reuse this instead of reimplementing the same thing two more times.

R=ahaas@chromium.org
CC=eholk@chromium.org

Change-Id: Ifbbe1324173951156c1ec9bba84fd1aa4bcb2adb
Reviewed-on: https://chromium-review.googlesource.com/758365
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49216}
---
 test/fuzzer/wasm-compile.cc | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/test/fuzzer/wasm-compile.cc b/test/fuzzer/wasm-compile.cc
index a598a68763..eca7c316d4 100644
--- a/test/fuzzer/wasm-compile.cc
+++ b/test/fuzzer/wasm-compile.cc
@@ -106,22 +106,13 @@ class WasmGenerator {
     blocks_.pop_back();
   }
 
-  template <WasmOpcode memory_op, ValueType arg_type = kWasmStmt>
+  template <WasmOpcode memory_op, ValueType... arg_types>
   void memop(DataRange data) {
     const auto align = data.get<uint32_t>();
     const auto offset = data.get<uint32_t>();
 
-    if (arg_type == kWasmStmt) {
-      // Generate the index
-      Generate<kWasmI32>(data);
-    } else {
-      const auto parts = data.split();
-
-      // Generate the index
-      Generate<kWasmI32>(parts.first);
-      // Generate the value
-      Generate<arg_type>(parts.second);
-    }
+    // Generate the index and the arguments, if any.
+    Generate<kWasmI32, arg_types...>(data);
 
     builder_->Emit(memory_op);
     builder_->EmitU32V(align);
@@ -130,9 +121,7 @@ class WasmGenerator {
 
   template <ValueType T1, ValueType T2>
   void sequence(DataRange data) {
-    const auto parts = data.split();
-    Generate<T1>(parts.first);
-    Generate<T2>(parts.second);
+    Generate<T1, T2>(data);
   }
 
   void current_memory(DataRange data) {