Comments

Author: DoeringChristian

src/internal.h

@@ -853,10 +853,6 @@ struct State {
     /// A flat list of variable data structures, including unused one
     std::vector<Variable> variables;
 
-#ifndef NDEBUG
-    PointerMap ptr_to_variable;
-#endif
-
     /// A priority queue of indices into 'variables' that are currently unused
     UnusedPQ unused_variables;
 
@@ -933,6 +929,13 @@ struct State {
     uint32_t optix_default_sbt_index = 0;
 #endif
 
+#ifndef NDEBUG
+    /// Mapping from pointers that are managed by variables to their variable
+    /// indices. This is used for debugging purposes in frozen functions.
+    PointerMap ptr_to_variable;
+#endif
+
+
     State() {
         variables.resize(1);
         extra.resize(1);

src/var.cpp

@@ -313,6 +313,8 @@ JIT_NOINLINE void jitc_var_free(uint32_t index, Variable *v) noexcept {
                 jitc_free(v->data);
 
 #ifndef NDEBUG
+                // This warning should never be thrown, except if we forgot to
+                // populate the mapping
                 if (!state.ptr_to_variable.contains(v->data))
                     jitc_log(
                         LogLevel::Warn,