# HG changeset patch # User Christian Brabandt # Date 1510950606 -3600 # Node ID 2893e4f08febc11e6e6c47238ef9f81ed1db7522 # Parent 4f187018884510289c02cebded1a10bc67a08730 patch 8.0.1306: ASAN error stack trace is not useful commit https://github.com/vim/vim/commit/9e27217c489c6eca2bd98d1c9fa89c1b652ed792 Author: Bram Moolenaar Date: Fri Nov 17 21:25:08 2017 +0100 patch 8.0.1306: ASAN error stack trace is not useful Problem: ASAN error stack trace is not useful. Solution: Add "asan_symbolize". (James McCoy, closes https://github.com/vim/vim/issues/2344) diff --git a/.travis.yml b/.travis.yml --- a/.travis.yml +++ b/.travis.yml @@ -67,6 +67,7 @@ addons: apt: packages: - autoconf + - clang - lcov - libperl-dev - python-dev @@ -102,9 +103,8 @@ script: - (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && if [ "$BUILD" = "yes" ]; then make -j$NPROC; fi) # Show Vim version and also if_xx versions. - if [ "$BUILD" = "yes" ]; then ${SRCDIR}/vim --version; ${SRCDIR}/vim --not-a-term -u NONE -S ${SRCDIR}/testdir/if_ver-1.vim -c quit > /dev/null; ${SRCDIR}/vim --not-a-term -u NONE -S ${SRCDIR}/testdir/if_ver-2.vim -c quit > /dev/null; cat if_ver.txt; fi - - if [ -n "$ASAN_OPTIONS" ]; then export PATH=/usr/lib/llvm-$(clang -v 2>&1 | sed -n 's/.*version \([1-9]\.[0-9][0-9]*\).*/\1/p')/bin:$PATH; fi - make $SHADOWOPT $TEST - - if [ -n "$ASAN_OPTIONS" ]; then for log in $(find -type f -name 'asan.*' -size +0); do cat "$log"; err=1; done; fi + - if [ -n "$ASAN_OPTIONS" ]; then for log in $(find -type f -name 'asan.*' -size +0); do asan_symbolize < "$log"; err=1; done; fi - if [ -n "$err" ]; then exit 1; fi after_success: diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1306, +/**/ 1305, /**/ 1304,