fix(build): disable problematic marktree assert in RelWithDebInfo builds

bfredl · justinmk · commit 16ca7ceaed75 · 2025-11-15T14:31:43.000-05:00
Workaround (not a fix) for #27196 and for #33067 Asserts are meant to apply to debug builds but not release builds for users. However the intermediate RelWithDebInfo build type is quite often used by end users, so we might want to disable certain problematic asserts there, while still preserving them in Debug mode for CI.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -151,8 +151,8 @@ set(NVIM_API_PRERELEASE false)
 
 # We _want_ assertions in RelWithDebInfo build-type.
 if(CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES DNDEBUG)
-  string(REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-  string(REPLACE "/DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  string(REPLACE "-DNDEBUG" "-DRELDEBUG" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  string(REPLACE "/DNDEBUG" "/DRELDEBUG" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
   string(REPLACE "  " " " CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") # Remove duplicate whitespace
 endif()
 
diff --git a/src/nvim/decoration.c b/src/nvim/decoration.c
@@ -1068,7 +1068,10 @@ void buf_signcols_count_range(buf_T *buf, int row1, int row2, int add, TriState
     int prevwidth = MIN(SIGN_SHOW_MAX, count[i] - add);
     if (clear != kNone && prevwidth > 0) {
       buf->b_signcols.count[prevwidth - 1]--;
+#ifndef RELDEBUG
+      // TODO(bfredl): correct marktree splicing so that this doesn't fail
       assert(buf->b_signcols.count[prevwidth - 1] >= 0);
+#endif
     }
     int width = MIN(SIGN_SHOW_MAX, count[i]);
     if (clear != kTrue && width > 0) {
diff --git a/src/nvim/marktree.c b/src/nvim/marktree.c
@@ -372,7 +372,13 @@ static void unintersect_node(MarkTree *b, MTNode *x, uint64_t id, bool strict)
     }
   }
   if (strict) {
+#ifndef RELDEBUG
+    // TODO(bfredl): This assert has been seen to fail for end users
+    // using RelWithDebInfo builds. While indicating an invalid state for
+    // the marktree, this error doesn't need to be fatal. The assert still
+    // needs to present in Debug builds to be able to detect regressions in tests.
     assert(seen);
+#endif
   }
 
   if (seen) {

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,13 @@ static void unintersect_node(MarkTree b, MTNode x, uint64_t id, bool strict)`
`372`	`372`	`}`
`373`	`373`	`}`
`374`	`374`	`if (strict) {`
	`375`	`+#ifndef RELDEBUG`
	`376`	`+ // TODO(bfredl): This assert has been seen to fail for end users`
	`377`	`+ // using RelWithDebInfo builds. While indicating an invalid state for`
	`378`	`+ // the marktree, this error doesn't need to be fatal. The assert still`
	`379`	`+ // needs to present in Debug builds to be able to detect regressions in tests.`
`375`	`380`	`assert(seen);`
	`381`	`+#endif`
`376`	`382`	`}`
`377`	`383`
`378`	`384`	`if (seen) {`