reorg

neovim · Jun 3, 2016 · f421757 · f421757
1 parent abe47d5
commit f421757
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -119,7 +119,7 @@ install: | nvim
 	+$(BUILD_CMD) -C build install
 
 clint:
-	cmake -DLINT_PRG=./clint.py \
+	cmake -DLINT_PRG=./src/clint.py \
 		-DLINT_DIR=src \
 		-DLINT_SUPPRESS_URL="$(DOC_DOWNLOAD_URL_BASE)$(CLINT_ERRORS_FILE_PATH)" \
 		-P cmake/RunLint.cmake

diff --git a/neovim.rb b/neovim.rb
diff --git a/.asan-blacklist → src/.asan-blacklist b/.asan-blacklist → src/.asan-blacklist
diff --git a/.valgrind.supp → src/.valgrind.supp b/.valgrind.supp → src/.valgrind.supp
diff --git a/Doxyfile → src/Doxyfile b/Doxyfile → src/Doxyfile
diff --git a/clint.py → src/clint.py b/clint.py → src/clint.py
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
@@ -269,7 +269,7 @@ if(CLANG_ASAN_UBSAN)
     set(SANITIZE_RECOVER -fno-sanitize-recover)         # Clang 3.5-
   endif()
   set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-DEXITFREE ")
-  set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "${SANITIZE_RECOVER} -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address -fsanitize=undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/.asan-blacklist")
+  set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "${SANITIZE_RECOVER} -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address -fsanitize=undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/src/.asan-blacklist")
   set_property(TARGET nvim APPEND_STRING PROPERTY LINK_FLAGS "-fsanitize=address -fsanitize=undefined ")
 elseif(CLANG_MSAN)
   message(STATUS "Enabling Clang memory sanitizer for nvim.")

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
@@ -22111,9 +22111,8 @@ bool eval_has_provider(char *name)
   return false;
 }
 
-// Compute the `DictWatcher` address from a QUEUE node. This only exists because
-// ASAN doesn't handle `QUEUE_DATA` pointer arithmetic, and we blacklist this
-// function on .asan-blacklist.
+// Compute the `DictWatcher` address from a QUEUE node. This only exists for
+// .asan-blacklist (ASAN doesn't handle QUEUE_DATA pointer arithmetic).
 static DictWatcher *dictwatcher_node_data(QUEUE *q)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET
 {

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
@@ -60,7 +60,7 @@ ifdef USE_VALGRIND
 	TOOL := valgrind -q                                     \
 	                 -q                                     \
 	                 $(VALGRIND_TOOL)                       \
-	                 --suppressions=../../../.valgrind.supp \
+	                 --suppressions=../../.valgrind.supp \
 	                 --error-exitcode=123                   \
 	                 --log-file=valgrind.\%p.$*             \
 	                 $(VGDB)                                \