From e3c38c14e7dd9c115da960daafd109d2687f1a08 Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Sun, 10 Jan 2016 10:49:59 -0800 Subject: Add Travis builds with sanitizers This triggers 5 independent build / test runs: - clang, no sanitizer; - clang, UB sanitizer; - clang, address sanitizer (disabled for now); - clang, thread sanitizer (disabled for now); - GCC. Enabling UBSan led to these changes: - Fix a bunch of undefined behavior throughout the code base. - Fix some tests that relied on that undefined behavior. - Make some of the tests easier to debug by printing their command line. - Add ubsan blacklist to work around libstdc++ bug. - Example testcase also needs sanitizer because libsupport.a uses it. --- src/support/safe_integer.cpp | 70 ++++++++++++++++++++++++++++++++++++++++++++ src/support/safe_integer.h | 34 +++++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 src/support/safe_integer.cpp create mode 100644 src/support/safe_integer.h (limited to 'src/support') diff --git a/src/support/safe_integer.cpp b/src/support/safe_integer.cpp new file mode 100644 index 000000000..46057cede --- /dev/null +++ b/src/support/safe_integer.cpp @@ -0,0 +1,70 @@ +/* + * Copyright 2016 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 +#include + +#include "support/safe_integer.h" + +using namespace wasm; + +bool wasm::isInteger(double x) { return fmod(x, 1) == 0; } + +bool wasm::isUInteger32(double x) { + return isInteger(x) && x >= 0 && x <= std::numeric_limits::max(); +} + +bool wasm::isSInteger32(double x) { + return isInteger(x) && x >= std::numeric_limits::min() && + x <= std::numeric_limits::max(); +} + +uint32_t wasm::toUInteger32(double x) { + return x < std::numeric_limits::max() + ? x + : std::numeric_limits::max(); +} + +int32_t wasm::toSInteger32(double x) { + return x > std::numeric_limits::min() && + x < std::numeric_limits::max() + ? x + : (x < 0 ? std::numeric_limits::min() + : std::numeric_limits::max()); +} + +bool wasm::isUInteger64(double x) { + return isInteger(x) && x >= 0 && x <= std::numeric_limits::max(); +} + +bool wasm::isSInteger64(double x) { + return isInteger(x) && x >= std::numeric_limits::min() && + x <= std::numeric_limits::max(); +} + +uint64_t wasm::toUInteger64(double x) { + return x < (double)std::numeric_limits::max() + ? (uint64_t)x + : std::numeric_limits::max(); +} + +int64_t wasm::toSInteger64(double x) { + return x > (double)std::numeric_limits::min() && + x < (double)std::numeric_limits::max() + ? (int64_t)x + : (x < 0 ? std::numeric_limits::min() + : std::numeric_limits::max()); +} diff --git a/src/support/safe_integer.h b/src/support/safe_integer.h new file mode 100644 index 000000000..f240644c8 --- /dev/null +++ b/src/support/safe_integer.h @@ -0,0 +1,34 @@ +/* + * Copyright 2016 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. + */ + +#ifndef wasm_safe_integer_h +#define wasm_safe_integer_h + +#include + +namespace wasm { +bool isInteger(double x); +bool isUInteger32(double x); +bool isSInteger32(double x); +uint32_t toUInteger32(double x); +int32_t toSInteger32(double x); +bool isUInteger64(double x); +bool isSInteger64(double x); +uint64_t toUInteger64(double x); +int64_t toSInteger64(double x); +} // namespace wasm + +#endif // wasm_safe_integer_h -- cgit v1.2.3 From eb0444e0870052b8ea8021eb50563a9f4d957486 Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Sun, 10 Jan 2016 19:56:36 -0800 Subject: Safe integer: assert before converting double to integer. --- src/support/safe_integer.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/support') diff --git a/src/support/safe_integer.cpp b/src/support/safe_integer.cpp index 46057cede..dbe62ca52 100644 --- a/src/support/safe_integer.cpp +++ b/src/support/safe_integer.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include #include @@ -33,12 +34,14 @@ bool wasm::isSInteger32(double x) { } uint32_t wasm::toUInteger32(double x) { + assert(isUInteger32(x)); return x < std::numeric_limits::max() ? x : std::numeric_limits::max(); } int32_t wasm::toSInteger32(double x) { + assert(isSInteger32(x)); return x > std::numeric_limits::min() && x < std::numeric_limits::max() ? x @@ -56,12 +59,14 @@ bool wasm::isSInteger64(double x) { } uint64_t wasm::toUInteger64(double x) { + assert(isUInteger64(x)); return x < (double)std::numeric_limits::max() ? (uint64_t)x : std::numeric_limits::max(); } int64_t wasm::toSInteger64(double x) { + assert(isSInteger64(x)); return x > (double)std::numeric_limits::min() && x < (double)std::numeric_limits::max() ? (int64_t)x -- cgit v1.2.3