diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-09-06 12:52:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-06 12:52:37 -0400 |
| commit | d6b280799fb873dfc40b8012d40d0bb54bc9d588 (patch) | |
| tree | e375e6659e9426c51420cd944c01d9be72e8b3c3 /src | |
| parent | c3e6b6119cbcd1dc49a398074fa57b7467245c5e (diff) | |
| parent | 83a7b1b5db99be8017dfd4f84d995035dd3b414e (diff) | |
| download | rneovim-d6b280799fb873dfc40b8012d40d0bb54bc9d588.tar.gz rneovim-d6b280799fb873dfc40b8012d40d0bb54bc9d588.tar.bz2 rneovim-d6b280799fb873dfc40b8012d40d0bb54bc9d588.zip | |
Merge pull request #12802 from jamessan/travis-ubuntu-bump
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/nvim/spell.c | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 7b4438b896..2d98f1a659 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -624,9 +624,19 @@ if(CLANG_ASAN_UBSAN) message(STATUS "Enabling Clang address sanitizer and undefined behavior sanitizer for nvim.") check_c_compiler_flag(-fno-sanitize-recover=all SANITIZE_RECOVER_ALL) if(SANITIZE_RECOVER_ALL) - set(SANITIZE_RECOVER -fno-sanitize-recover=all) # Clang 3.6+ + if(TRAVIS_CI_BUILD) + # Try to recover from all sanitize issues so we get reports about all failures + set(SANITIZE_RECOVER -fsanitize-recover=all) # Clang 3.6+ + else() + set(SANITIZE_RECOVER -fno-sanitize-recover=all) # Clang 3.6+ + endif() else() - set(SANITIZE_RECOVER -fno-sanitize-recover) # Clang 3.5- + if(TRAVIS_CI_BUILD) + # Try to recover from all sanitize issues so we get reports about all failures + set(SANITIZE_RECOVER -fsanitize-recover) # Clang 3.5- + else() + set(SANITIZE_RECOVER -fno-sanitize-recover) # Clang 3.5- + endif() endif() set_property(TARGET nvim APPEND PROPERTY COMPILE_DEFINITIONS EXITFREE) set_property(TARGET nvim APPEND PROPERTY COMPILE_OPTIONS ${SANITIZE_RECOVER} -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address -fsanitize=undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/src/.asan-blacklist) diff --git a/src/nvim/spell.c b/src/nvim/spell.c index 05bb501fa2..dc1bfe25b4 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -4405,8 +4405,6 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so } break; - FALLTHROUGH; - case STATE_INS: // Insert one byte. Repeat this for each possible byte at this // node. |