Merge remote-tracking branch 'origin/topic/bbannier/issue-1611'

zeek · Dec 8, 2023 · 2ddc329 · 2ddc329
2 parents 0d4960b + afd3293
commit 2ddc329
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+1.10.0-dev.46 | 2023-12-08 09:56:14 +0100
+
+  * Remove redundant forward decl. (Benjamin Bannier, Corelight)
+
+  * GH-1611: Silence ASAN warning. (Benjamin Bannier, Corelight)
+
 1.10.0-dev.43 | 2023-12-08 09:55:13 +0100
 
   * Allocate Vector::_control lazily. (Arne Welzel, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.10.0-dev.43
+1.10.0-dev.46
diff --git a/hilti/runtime/include/fiber-check-stack.h b/hilti/runtime/include/fiber-check-stack.h
@@ -10,9 +10,6 @@
 
 namespace hilti::rt::detail {
 
-/** Helper recording global stack resource usage. */
-extern void trackStack();
-
 /**
  * Checks that the current fiber has sufficient stack space left for executing
  * a function body. This is called often and should reduce overhead as much as

diff --git a/hilti/runtime/src/fiber.cc b/hilti/runtime/src/fiber.cc
@@ -363,7 +363,7 @@ void ASAN_NO_OPTIMIZE detail::Fiber::_finishSwitchFiber(const char* tag) {
 #endif
 }
 
-void detail::Fiber::_executeSwitch(const char* tag, detail::Fiber* from, detail::Fiber* to) {
+void ASAN_NO_OPTIMIZE detail::Fiber::_executeSwitch(const char* tag, detail::Fiber* from, detail::Fiber* to) {
     HILTI_RT_FIBER_DEBUG(tag, fmt("executing fiber switch from %s to %s", *from, *to));
 
     detail::Fiber::_startSwitchFiber(tag, to);