Validate unique local names, and use validation in wasm2js. Fixes #1885 (#1886)

* Also fixes some bugs in wasm2js tests that did not validate.
* Rename FeatureOptions => ToolOptions, as they now contain all the basic stuff each tool needs for commandline options (validation yes or no, and which features if so).

1 files changed, 99 insertions, 0 deletions

diff --git a/src/tools/tool-options.h b/src/tools/tool-options.h
new file mode 100644
index 000000000..9aff8e619
--- /dev/null
+++ b/src/tools/tool-options.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2018 WebAssembly Community Group participants
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "support/command-line.h"
+#include "pass.h"
+
+//
+// Shared optimization options for commandline tools
+//
+
+namespace wasm {
+
+struct ToolOptions : public Options {
+  PassOptions passOptions;
+
+  ToolOptions(const std::string& command, const std::string& description)
+      : Options(command, description) {
+    (*this)
+        .add("--mvp-features", "-mvp", "Disable all non-MVP features",
+             Options::Arguments::Zero,
+             [this](Options *o, const std::string& arguments) {
+               passOptions.features = FeatureSet::MVP;
+             })
+        .add("--all-features", "-all", "Enable all features (default)",
+             Options::Arguments::Zero,
+             [this](Options *o, const std::string& arguments) {
+               passOptions.features = FeatureSet::All;
+             })
+        .add("--enable-threads", "", "Enable atomic operations",
+             Options::Arguments::Zero,
+             [this](Options *o, const std::string& arguments) {
+               passOptions.features.setAtomics();
+             })
+        .add("--disable-threads", "", "Disable atomic operations",
+             Options::Arguments::Zero,
+             [this](Options *o, const std::string& arguments) {
+               passOptions.features.setAtomics(false);
+             })
+        .add("--enable-mutable-globals", "", "Enable mutable globals",
+             Options::Arguments::Zero,
+             [this](Options *o, const std::string& arguments) {
+               passOptions.features.setMutableGlobals();
+             })
+        .add("--disable-mutable-globals", "", "Disable mutable globals",
+             Options::Arguments::Zero,
+             [this](Options *o, const std::string& arguments) {
+               passOptions.features.setMutableGlobals(false);
+             })
+        .add("--enable-nontrapping-float-to-int", "",
+             "Enable nontrapping float-to-int operations",
+             Options::Arguments::Zero,
+             [this](Options *o, const std::string& arguments) {
+               passOptions.features.setTruncSat();
+             })
+        .add("--disable-nontrapping-float-to-int", "",
+             "Disable nontrapping float-to-int operations",
+             Options::Arguments::Zero,
+             [this](Options *o, const std::string& arguments) {
+               passOptions.features.setTruncSat(false);
+             })
+        .add("--enable-simd", "",
+             "Enable nontrapping float-to-int operations",
+             Options::Arguments::Zero,
+             [this](Options *o, const std::string& arguments) {
+               passOptions.features.setSIMD();
+             })
+        .add("--disable-simd", "",
+             "Disable nontrapping float-to-int operations",
+             Options::Arguments::Zero,
+             [this](Options *o, const std::string& arguments) {
+               passOptions.features.setSIMD(false);
+             })
+        .add("--no-validation", "-n", "Disables validation, assumes inputs are correct",
+             Options::Arguments::Zero,
+             [this](Options* o, const std::string& argument) {
+               passOptions.validate = false;
+             });
+        ;
+  }
+
+  FeatureSet getFeatures() const {
+    return passOptions.features;
+  }
+};
+
+} // namespace wasm