From f274f33154317bdd97bbf2f6c3e67845c574bcc0 Mon Sep 17 00:00:00 2001
From: Jonathan Tatum <jdtatum@google.com>
Date: Wed, 9 Sep 2026 11:39:59 -0700
Subject: [PATCH] Clamp expr ids for Trace to [1,
 std::numeric_limits<int32_t>::max()]] Test to see if anything depends on full
 range of expr ids.

PiperOrigin-RevId: 978663689
---
 eval/eval/evaluator_core.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eval/eval/evaluator_core.cc b/eval/eval/evaluator_core.cc
index 05dbed854..773d849bd 100644
--- a/eval/eval/evaluator_core.cc
+++ b/eval/eval/evaluator_core.cc
@@ -15,6 +15,8 @@
 #include "eval/eval/evaluator_core.h"
 
 #include <cstddef>
+#include <cstdint>
+#include <limits>
 #include <memory>
 #include <utility>
 
@@ -132,7 +134,12 @@ absl::StatusOr<cel::Value> ExecutionFrame::Evaluate(
                            "Try to disable short-circuiting.";
         continue;
       }
-      if (EvaluationStatus status(listener(expr->id(), value_stack().Peek(),
+      const int64_t id = expr->id();
+      // Experimental: DO NOT SUBMIT
+      if (id <= 0 || id >= std::numeric_limits<int32_t>::max()) {
+        continue;
+      }
+      if (EvaluationStatus status(listener(id, value_stack().Peek(),
                                            descriptor_pool(), message_factory(),
                                            arena()));
           !status.ok()) {