Skip to content

Commit

Permalink
Merge pull request #598 from wasmx/ci_clang_11
Browse files Browse the repository at this point in the history
ci: Upgrade build images, Clang to version 11
  • Loading branch information
chfast authored Oct 13, 2020
2 parents 7f86deb + 871e9b8 commit 6f05239
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Checks: >
google-global-names-in-headers,
google-runtime-int,
misc-*,
-misc-no-recursion,
-misc-non-private-member-variables-in-classes,
performance-*,
-performance-inefficient-string-concatenation,
Expand Down
13 changes: 5 additions & 8 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ parameters:
default: false

executors:
linux-gcc-9:
docker:
- image: ethereum/cpp-build-env:15-gcc-9
linux-gcc-latest:
docker:
- image: ethereum/cpp-build-env:15-gcc-10
- image: ethereum/cpp-build-env:16-gcc-10
linux-clang-latest:
docker:
- image: ethereum/cpp-build-env:15-clang-10
- image: ethereum/cpp-build-env:16-clang-11
macos:
macos:
xcode: 11.6.0
Expand Down Expand Up @@ -294,7 +291,7 @@ jobs:
- test

release-linux:
executor: linux-gcc-9
executor: linux-gcc-latest
steps:
- install_testfloat
- checkout
Expand Down Expand Up @@ -392,8 +389,8 @@ jobs:
- checkout
- build:
build_type: RelWithDebInfo
# TODO: pointer-compare produces failure in std::string operator+.
cmake_options: -DENABLE_ASSERTIONS=ON -DSANITIZE=address,pointer-subtract,undefined,nullability,implicit-unsigned-integer-truncation,implicit-signed-integer-truncation
# TODO: Enable pointer-compare and pointer-subtract only for libfizzy.
cmake_options: -DENABLE_ASSERTIONS=ON -DSANITIZE=address,undefined,nullability,implicit-unsigned-integer-truncation,implicit-signed-integer-truncation
- test
- benchmark:
min_time: "0.01"
Expand Down
2 changes: 1 addition & 1 deletion test/utils/fizzy_engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ValType translate_valtype(char input)

FuncType translate_signature(std::string_view signature)
{
const auto delimiter_pos = signature.find(":");
const auto delimiter_pos = signature.find(':');
assert(delimiter_pos != std::string_view::npos);
const auto inputs = signature.substr(0, delimiter_pos);
const auto outputs = signature.substr(delimiter_pos + 1);
Expand Down
4 changes: 2 additions & 2 deletions test/utils/wasm_engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ WasmEngine::~WasmEngine() noexcept = default;

void validate_function_signature(std::string_view signature)
{
if (signature.find_first_of(":") == std::string::npos)
if (signature.find_first_of(':') == std::string::npos)
throw std::runtime_error{"Missing ':' delimiter"};
if (signature.find_first_of(":") != signature.find_last_of(":"))
if (signature.find_first_of(':') != signature.find_last_of(':'))
throw std::runtime_error{"Multiple occurrences of ':' found in signature"};
// Only allow i (i32) I (i64) as types
if (signature.find_first_not_of(":iI") != std::string::npos)
Expand Down

0 comments on commit 6f05239

Please sign in to comment.