difftreelog
feat detect infinite recursion in object evaluation
in: master
3 files changed
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -106,7 +106,7 @@
#[error("stack overflow, try to reduce recursion, or set --max-stack to bigger value")]
StackOverflow,
#[error("infinite recursion detected")]
- RecursiveLazyValueEvaluation,
+ InfiniteRecursionDetected,
#[error("tried to index by fractional value")]
FractionalIndex,
#[error("attempted to divide by zero")]
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -1,3 +1,4 @@
+use crate::error::LocError;
use crate::function::CallLocation;
use crate::gc::{GcHashMap, GcHashSet, TraceBox};
use crate::operator::evaluate_add_op;
@@ -28,6 +29,15 @@
// Field => This
type CacheKey = (IStr, WeakObjValue);
+
+#[derive(Trace)]
+enum CacheValue {
+ Cached(Val),
+ NotFound,
+ Pending,
+ Errored(LocError),
+}
+
#[derive(Trace)]
#[force_tracking]
pub struct ObjValueInternals {
@@ -36,7 +46,7 @@
assertions_ran: RefCell<GcHashSet<ObjValue>>,
this_obj: Option<ObjValue>,
this_entries: Cc<GcHashMap<IStr, ObjMember>>,
- value_cache: RefCell<GcHashMap<CacheKey, Option<Val>>>,
+ value_cache: RefCell<GcHashMap<CacheKey, CacheValue>>,
}
#[derive(Clone, Trace)]
@@ -234,8 +244,17 @@
let cache_key = (key.clone(), WeakObjValue(real_this.0.downgrade()));
if let Some(v) = self.0.value_cache.borrow().get(&cache_key) {
- return Ok(v.clone());
+ return Ok(match v {
+ CacheValue::Cached(v) => Some(v.clone()),
+ CacheValue::NotFound => None,
+ CacheValue::Pending => throw!(InfiniteRecursionDetected),
+ CacheValue::Errored(e) => return Err(e.clone()),
+ });
}
+ self.0
+ .value_cache
+ .borrow_mut()
+ .insert(cache_key.clone(), CacheValue::Pending);
let value = match (self.0.this_entries.get(&key), &self.0.super_obj) {
(Some(k), None) => Ok(Some(self.evaluate_this(k, real_this)?)),
(Some(k), Some(s)) => {
@@ -251,11 +270,24 @@
}
(None, Some(s)) => s.get_raw(key, Some(real_this)),
(None, None) => Ok(None),
- }?;
- self.0
- .value_cache
- .borrow_mut()
- .insert(cache_key, value.clone());
+ };
+ let value = match value {
+ Ok(v) => v,
+ Err(e) => {
+ self.0
+ .value_cache
+ .borrow_mut()
+ .insert(cache_key, CacheValue::Errored(e.clone()));
+ return Err(e);
+ }
+ };
+ self.0.value_cache.borrow_mut().insert(
+ cache_key,
+ match &value {
+ Some(v) => CacheValue::Cached(v.clone()),
+ None => CacheValue::NotFound,
+ },
+ );
Ok(value)
}
fn evaluate_this(&self, v: &ObjMember, real_this: &Self) -> Result<Val> {
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth1use crate::{2 builtin::manifest::{3 manifest_json_ex, manifest_yaml_ex, ManifestJsonOptions, ManifestType, ManifestYamlOptions,4 },5 cc_ptr_eq,6 error::{Error::*, LocError},7 evaluate,8 function::{9 parse_default_function_call, parse_function_call, ArgsLike, Builtin, CallLocation,10 StaticBuiltin,11 },12 gc::TraceBox,13 throw, Context, ObjValue, Result,14};15use gcmodule::{Cc, Trace};16use jrsonnet_interner::IStr;17use jrsonnet_parser::{LocExpr, ParamsDesc};18use jrsonnet_types::ValType;19use std::{cell::RefCell, fmt::Debug, rc::Rc};2021pub trait LazyValValue: Trace {22 fn get(self: Box<Self>) -> Result<Val>;23}2425#[derive(Trace)]26enum LazyValInternals {27 Computed(Val),28 Errored(LocError),29 Waiting(TraceBox<dyn LazyValValue>),30 Pending,31}3233#[derive(Clone, Trace)]34pub struct LazyVal(Cc<RefCell<LazyValInternals>>);35impl LazyVal {36 pub fn new(f: TraceBox<dyn LazyValValue>) -> Self {37 Self(Cc::new(RefCell::new(LazyValInternals::Waiting(f))))38 }39 pub fn new_resolved(val: Val) -> Self {40 Self(Cc::new(RefCell::new(LazyValInternals::Computed(val))))41 }42 pub fn force(&self) -> Result<()> {43 self.evaluate()?;44 Ok(())45 }46 pub fn evaluate(&self) -> Result<Val> {47 match &*self.0.borrow() {48 LazyValInternals::Computed(v) => return Ok(v.clone()),49 LazyValInternals::Errored(e) => return Err(e.clone()),50 LazyValInternals::Pending => return Err(RecursiveLazyValueEvaluation.into()),51 _ => (),52 };53 let value = if let LazyValInternals::Waiting(value) =54 std::mem::replace(&mut *self.0.borrow_mut(), LazyValInternals::Pending)55 {56 value57 } else {58 unreachable!()59 };60 let new_value = match value.0.get() {61 Ok(v) => v,62 Err(e) => {63 *self.0.borrow_mut() = LazyValInternals::Errored(e.clone());64 return Err(e);65 }66 };67 *self.0.borrow_mut() = LazyValInternals::Computed(new_value.clone());68 Ok(new_value)69 }70}7172impl Debug for LazyVal {73 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {74 write!(f, "Lazy")75 }76}77impl PartialEq for LazyVal {78 fn eq(&self, other: &Self) -> bool {79 cc_ptr_eq(&self.0, &other.0)80 }81}8283#[derive(Debug, PartialEq, Trace)]84pub struct FuncDesc {85 pub name: IStr,86 pub ctx: Context,87 pub params: ParamsDesc,88 pub body: LocExpr,89}90impl FuncDesc {91 /// Create body context, but fill arguments without defaults with lazy error92 pub fn default_body_context(&self) -> Context {93 parse_default_function_call(self.ctx.clone(), &self.params)94 }9596 /// Create context, with which body code will run97 pub fn call_body_context(98 &self,99 call_ctx: Context,100 args: &dyn ArgsLike,101 tailstrict: bool,102 ) -> Result<Context> {103 parse_function_call(call_ctx, self.ctx.clone(), &self.params, args, tailstrict)104 }105}106107#[derive(Trace, Clone)]108pub enum FuncVal {109 /// Plain function implemented in jsonnet110 Normal(Cc<FuncDesc>),111 /// Standard library function112 StaticBuiltin(#[skip_trace] &'static dyn StaticBuiltin),113 /// User-provided function114 Builtin(Cc<TraceBox<dyn Builtin>>),115}116117impl Debug for FuncVal {118 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {119 match self {120 Self::Normal(arg0) => f.debug_tuple("Normal").field(arg0).finish(),121 Self::StaticBuiltin(arg0) => {122 f.debug_tuple("StaticBuiltin").field(&arg0.name()).finish()123 }124 Self::Builtin(arg0) => f.debug_tuple("Builtin").field(&arg0.name()).finish(),125 }126 }127}128129impl FuncVal {130 pub fn args_len(&self) -> usize {131 match self {132 Self::Normal(n) => n.params.iter().filter(|p| p.1.is_none()).count(),133 Self::StaticBuiltin(i) => i.params().iter().filter(|p| !p.has_default).count(),134 Self::Builtin(i) => i.params().iter().filter(|p| !p.has_default).count(),135 }136 }137 pub fn name(&self) -> IStr {138 match self {139 Self::Normal(normal) => normal.name.clone(),140 Self::StaticBuiltin(builtin) => builtin.name().into(),141 Self::Builtin(builtin) => builtin.name().into(),142 }143 }144 pub fn evaluate(145 &self,146 call_ctx: Context,147 loc: CallLocation,148 args: &dyn ArgsLike,149 tailstrict: bool,150 ) -> Result<Val> {151 match self {152 Self::Normal(func) => {153 let body_ctx = func.call_body_context(call_ctx, args, tailstrict)?;154 evaluate(body_ctx, &func.body)155 }156 Self::StaticBuiltin(b) => b.call(call_ctx, loc, args),157 Self::Builtin(b) => b.call(call_ctx, loc, args),158 }159 }160 pub fn evaluate_simple(&self, args: &dyn ArgsLike) -> Result<Val> {161 self.evaluate(Context::default(), CallLocation::native(), args, true)162 }163}164165#[derive(Clone)]166pub enum ManifestFormat {167 YamlStream(Box<ManifestFormat>),168 Yaml(usize),169 Json(usize),170 ToString,171 String,172}173174#[derive(Debug, Clone, Trace)]175#[force_tracking]176pub enum ArrValue {177 Bytes(#[skip_trace] Rc<[u8]>),178 Lazy(Cc<Vec<LazyVal>>),179 Eager(Cc<Vec<Val>>),180 Extended(Box<(Self, Self)>),181 Range(i32, i32),182 Reversed(Box<Self>),183}184impl ArrValue {185 pub fn new_eager() -> Self {186 Self::Eager(Cc::new(Vec::new()))187 }188 pub fn new_range(a: i32, b: i32) -> Self {189 assert!(a <= b);190 Self::Range(a, b)191 }192193 pub fn len(&self) -> usize {194 match self {195 Self::Bytes(i) => i.len(),196 Self::Lazy(l) => l.len(),197 Self::Eager(e) => e.len(),198 Self::Extended(v) => v.0.len() + v.1.len(),199 Self::Range(a, b) => a.abs_diff(*b) as usize,200 Self::Reversed(i) => i.len(),201 }202 }203204 pub fn is_empty(&self) -> bool {205 self.len() == 0206 }207208 pub fn get(&self, index: usize) -> Result<Option<Val>> {209 match self {210 Self::Bytes(i) => i211 .get(index)212 .map_or(Ok(None), |v| Ok(Some(Val::Num(*v as f64)))),213 Self::Lazy(vec) => {214 if let Some(v) = vec.get(index) {215 Ok(Some(v.evaluate()?))216 } else {217 Ok(None)218 }219 }220 Self::Eager(vec) => Ok(vec.get(index).cloned()),221 Self::Extended(v) => {222 let a_len = v.0.len();223 if a_len > index {224 v.0.get(index)225 } else {226 v.1.get(index - a_len)227 }228 }229 Self::Range(a, _) => {230 if index >= self.len() {231 return Ok(None);232 }233 Ok(Some(Val::Num(((*a as isize) + index as isize) as f64)))234 }235 Self::Reversed(v) => {236 let len = v.len();237 if index >= len {238 return Ok(None);239 }240 v.get(len - index - 1)241 }242 }243 }244245 pub fn get_lazy(&self, index: usize) -> Option<LazyVal> {246 match self {247 Self::Bytes(i) => i248 .get(index)249 .map(|b| LazyVal::new_resolved(Val::Num(*b as f64))),250 Self::Lazy(vec) => vec.get(index).cloned(),251 Self::Eager(vec) => vec.get(index).cloned().map(LazyVal::new_resolved),252 Self::Extended(v) => {253 let a_len = v.0.len();254 if a_len > index {255 v.0.get_lazy(index)256 } else {257 v.1.get_lazy(index - a_len)258 }259 }260 Self::Range(a, _) => {261 if index >= self.len() {262 return None;263 }264 Some(LazyVal::new_resolved(Val::Num(265 ((*a as isize) + index as isize) as f64,266 )))267 }268 Self::Reversed(v) => {269 let len = v.len();270 if index >= len {271 return None;272 }273 v.get_lazy(len - index - 1)274 }275 }276 }277278 pub fn evaluated(&self) -> Result<Cc<Vec<Val>>> {279 Ok(match self {280 Self::Bytes(i) => {281 let mut out = Vec::with_capacity(i.len());282 for v in i.iter() {283 out.push(Val::Num(*v as f64));284 }285 Cc::new(out)286 }287 Self::Lazy(vec) => {288 let mut out = Vec::with_capacity(vec.len());289 for item in vec.iter() {290 out.push(item.evaluate()?);291 }292 Cc::new(out)293 }294 Self::Eager(vec) => vec.clone(),295 Self::Extended(_v) => {296 let mut out = Vec::with_capacity(self.len());297 for item in self.iter() {298 out.push(item?);299 }300 Cc::new(out)301 }302 Self::Range(a, b) => {303 let mut out = Vec::with_capacity(self.len());304 for i in *a..*b {305 out.push(Val::Num(i as f64));306 }307 Cc::new(out)308 }309 Self::Reversed(r) => {310 let mut r = r.evaluated()?;311 Cc::update_with(&mut r, |v| v.reverse());312 r313 }314 })315 }316317 pub fn iter(&self) -> impl DoubleEndedIterator<Item = Result<Val>> + '_ {318 // if let Self::Reversed(v) = self {319 // return v.iter().rev();320 // }321 let len = self.len();322 (0..len).map(move |idx| match self {323 Self::Bytes(b) => Ok(Val::Num(b[idx] as f64)),324 Self::Lazy(l) => l[idx].evaluate(),325 Self::Eager(e) => Ok(e[idx].clone()),326 Self::Extended(_) => self.get(idx).map(|e| e.unwrap()),327 Self::Range(..) => self.get(idx).map(|e| e.unwrap()),328 Self::Reversed(..) => self.get(len - idx - 1).map(|e| e.unwrap()),329 })330 }331332 pub fn iter_lazy(&self) -> impl DoubleEndedIterator<Item = LazyVal> + '_ {333 let len = self.len();334 (0..len).map(move |idx| match self {335 Self::Bytes(b) => LazyVal::new_resolved(Val::Num(b[idx] as f64)),336 Self::Lazy(l) => l[idx].clone(),337 Self::Eager(e) => LazyVal::new_resolved(e[idx].clone()),338 Self::Extended(_) => self.get_lazy(idx).unwrap(),339 Self::Range(..) => self.get_lazy(idx).unwrap(),340 Self::Reversed(..) => self.get_lazy(len - idx - 1).unwrap(),341 })342 }343344 pub fn reversed(self) -> Self {345 Self::Reversed(Box::new(self))346 }347348 pub fn map(self, mapper: impl Fn(Val) -> Result<Val>) -> Result<Self> {349 let mut out = Vec::with_capacity(self.len());350351 for value in self.iter() {352 out.push(mapper(value?)?);353 }354355 Ok(Self::Eager(Cc::new(out)))356 }357358 pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {359 let mut out = Vec::with_capacity(self.len());360361 for value in self.iter() {362 let value = value?;363 if filter(&value)? {364 out.push(value);365 }366 }367368 Ok(Self::Eager(Cc::new(out)))369 }370371 pub fn ptr_eq(a: &Self, b: &Self) -> bool {372 match (a, b) {373 (Self::Lazy(a), Self::Lazy(b)) => cc_ptr_eq(a, b),374 (Self::Eager(a), Self::Eager(b)) => cc_ptr_eq(a, b),375 _ => false,376 }377 }378}379380impl From<Vec<LazyVal>> for ArrValue {381 fn from(v: Vec<LazyVal>) -> Self {382 Self::Lazy(Cc::new(v))383 }384}385386impl From<Vec<Val>> for ArrValue {387 fn from(v: Vec<Val>) -> Self {388 Self::Eager(Cc::new(v))389 }390}391392pub enum IndexableVal {393 Str(IStr),394 Arr(ArrValue),395}396397#[derive(Debug, Clone, Trace)]398pub enum Val {399 Bool(bool),400 Null,401 Str(IStr),402 Num(f64),403 Arr(ArrValue),404 Obj(ObjValue),405 Func(FuncVal),406}407408impl Val {409 pub const fn as_bool(&self) -> Option<bool> {410 match self {411 Val::Bool(v) => Some(*v),412 _ => None,413 }414 }415 pub const fn as_null(&self) -> Option<()> {416 match self {417 Val::Null => Some(()),418 _ => None,419 }420 }421 pub fn as_str(&self) -> Option<IStr> {422 match self {423 Val::Str(s) => Some(s.clone()),424 _ => None,425 }426 }427 pub const fn as_num(&self) -> Option<f64> {428 match self {429 Val::Num(n) => Some(*n),430 _ => None,431 }432 }433 pub fn as_arr(&self) -> Option<ArrValue> {434 match self {435 Val::Arr(a) => Some(a.clone()),436 _ => None,437 }438 }439 pub fn as_obj(&self) -> Option<ObjValue> {440 match self {441 Val::Obj(o) => Some(o.clone()),442 _ => None,443 }444 }445 pub fn as_func(&self) -> Option<FuncVal> {446 match self {447 Val::Func(f) => Some(f.clone()),448 _ => None,449 }450 }451452 /// Creates `Val::Num` after checking for numeric overflow.453 /// As numbers are `f64`, we can just check for their finity.454 pub fn new_checked_num(num: f64) -> Result<Self> {455 if num.is_finite() {456 Ok(Self::Num(num))457 } else {458 throw!(RuntimeError("overflow".into()))459 }460 }461462 pub fn try_cast_nullable_num(self, context: &'static str) -> Result<Option<f64>> {463 Ok(match self {464 Val::Null => None,465 Val::Num(num) => Some(num),466 _ => throw!(TypeMismatch(467 context,468 vec![ValType::Null, ValType::Num],469 self.value_type()470 )),471 })472 }473 pub const fn value_type(&self) -> ValType {474 match self {475 Self::Str(..) => ValType::Str,476 Self::Num(..) => ValType::Num,477 Self::Arr(..) => ValType::Arr,478 Self::Obj(..) => ValType::Obj,479 Self::Bool(_) => ValType::Bool,480 Self::Null => ValType::Null,481 Self::Func(..) => ValType::Func,482 }483 }484485 pub fn to_string(&self) -> Result<IStr> {486 Ok(match self {487 Self::Bool(true) => "true".into(),488 Self::Bool(false) => "false".into(),489 Self::Null => "null".into(),490 Self::Str(s) => s.clone(),491 v => manifest_json_ex(492 v,493 &ManifestJsonOptions {494 padding: "",495 mtype: ManifestType::ToString,496 newline: "\n",497 key_val_sep: ": ",498 },499 )?500 .into(),501 })502 }503504 /// Expects value to be object, outputs (key, manifested value) pairs505 pub fn manifest_multi(&self, ty: &ManifestFormat) -> Result<Vec<(IStr, IStr)>> {506 let obj = match self {507 Self::Obj(obj) => obj,508 _ => throw!(MultiManifestOutputIsNotAObject),509 };510 let keys = obj.fields();511 let mut out = Vec::with_capacity(keys.len());512 for key in keys {513 let value = obj514 .get(key.clone())?515 .expect("item in object")516 .manifest(ty)?;517 out.push((key, value));518 }519 Ok(out)520 }521522 /// Expects value to be array, outputs manifested values523 pub fn manifest_stream(&self, ty: &ManifestFormat) -> Result<Vec<IStr>> {524 let arr = match self {525 Self::Arr(a) => a,526 _ => throw!(StreamManifestOutputIsNotAArray),527 };528 let mut out = Vec::with_capacity(arr.len());529 for i in arr.iter() {530 out.push(i?.manifest(ty)?);531 }532 Ok(out)533 }534535 pub fn manifest(&self, ty: &ManifestFormat) -> Result<IStr> {536 Ok(match ty {537 ManifestFormat::YamlStream(format) => {538 let arr = match self {539 Self::Arr(a) => a,540 _ => throw!(StreamManifestOutputIsNotAArray),541 };542 let mut out = String::new();543544 match format as &ManifestFormat {545 ManifestFormat::YamlStream(_) => throw!(StreamManifestOutputCannotBeRecursed),546 ManifestFormat::String => throw!(StreamManifestCannotNestString),547 _ => {}548 };549550 if !arr.is_empty() {551 for v in arr.iter() {552 out.push_str("---\n");553 out.push_str(&v?.manifest(format)?);554 out.push('\n');555 }556 out.push_str("...");557 }558559 out.into()560 }561 ManifestFormat::Yaml(padding) => self.to_yaml(*padding)?,562 ManifestFormat::Json(padding) => self.to_json(*padding)?,563 ManifestFormat::ToString => self.to_string()?,564 ManifestFormat::String => match self {565 Self::Str(s) => s.clone(),566 _ => throw!(StringManifestOutputIsNotAString),567 },568 })569 }570571 /// For manifestification572 pub fn to_json(&self, padding: usize) -> Result<IStr> {573 manifest_json_ex(574 self,575 &ManifestJsonOptions {576 padding: &" ".repeat(padding),577 mtype: if padding == 0 {578 ManifestType::Minify579 } else {580 ManifestType::Manifest581 },582 newline: "\n",583 key_val_sep: ": ",584 },585 )586 .map(|s| s.into())587 }588589 /// Calls `std.manifestJson`590 pub fn to_std_json(&self, padding: usize) -> Result<Rc<str>> {591 manifest_json_ex(592 self,593 &ManifestJsonOptions {594 padding: &" ".repeat(padding),595 mtype: ManifestType::Std,596 newline: "\n",597 key_val_sep: ": ",598 },599 )600 .map(|s| s.into())601 }602603 pub fn to_yaml(&self, padding: usize) -> Result<IStr> {604 let padding = &" ".repeat(padding);605 manifest_yaml_ex(606 self,607 &ManifestYamlOptions {608 padding,609 arr_element_padding: padding,610 quote_keys: false,611 },612 )613 .map(|s| s.into())614 }615 pub fn into_indexable(self) -> Result<IndexableVal> {616 Ok(match self {617 Val::Str(s) => IndexableVal::Str(s),618 Val::Arr(arr) => IndexableVal::Arr(arr),619 _ => throw!(ValueIsNotIndexable(self.value_type())),620 })621 }622}623624const fn is_function_like(val: &Val) -> bool {625 matches!(val, Val::Func(_))626}627628/// Native implementation of `std.primitiveEquals`629pub fn primitive_equals(val_a: &Val, val_b: &Val) -> Result<bool> {630 Ok(match (val_a, val_b) {631 (Val::Bool(a), Val::Bool(b)) => a == b,632 (Val::Null, Val::Null) => true,633 (Val::Str(a), Val::Str(b)) => a == b,634 (Val::Num(a), Val::Num(b)) => (a - b).abs() <= f64::EPSILON,635 (Val::Arr(_), Val::Arr(_)) => throw!(RuntimeError(636 "primitiveEquals operates on primitive types, got array".into(),637 )),638 (Val::Obj(_), Val::Obj(_)) => throw!(RuntimeError(639 "primitiveEquals operates on primitive types, got object".into(),640 )),641 (a, b) if is_function_like(a) && is_function_like(b) => {642 throw!(RuntimeError("cannot test equality of functions".into()))643 }644 (_, _) => false,645 })646}647648/// Native implementation of `std.equals`649pub fn equals(val_a: &Val, val_b: &Val) -> Result<bool> {650 if val_a.value_type() != val_b.value_type() {651 return Ok(false);652 }653 match (val_a, val_b) {654 (Val::Arr(a), Val::Arr(b)) => {655 if ArrValue::ptr_eq(a, b) {656 return Ok(true);657 }658 if a.len() != b.len() {659 return Ok(false);660 }661 for (a, b) in a.iter().zip(b.iter()) {662 if !equals(&a?, &b?)? {663 return Ok(false);664 }665 }666 Ok(true)667 }668 (Val::Obj(a), Val::Obj(b)) => {669 if ObjValue::ptr_eq(a, b) {670 return Ok(true);671 }672 let fields = a.fields();673 if fields != b.fields() {674 return Ok(false);675 }676 for field in fields {677 if !equals(&a.get(field.clone())?.unwrap(), &b.get(field)?.unwrap())? {678 return Ok(false);679 }680 }681 Ok(true)682 }683 (a, b) => Ok(primitive_equals(a, b)?),684 }685}