Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
douglas-raillard-arm committed Dec 23, 2023
1 parent 79538d0 commit 741cd38
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tools/analysis/trace-tools/src/lib/parquet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ where

manual:
(FieldArray::Str(xs), x) => {
xs.push(x.to_str());
xs.push(x.deref_ptr(&visitor.buffer_env())?.to_str());
xs
},

Expand Down
3 changes: 2 additions & 1 deletion tools/analysis/traceevent/src/cparser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ fn resolve_extension_macro(name: &str, abi: &Abi) -> Result<ExtensionMacroKind,
Box::new(move |env| {
Ok(cdelim
.eval(env)?
.deref_ptr(env)?
.to_str()
.ok_or(EvalError::IllegalType)?
.into())
Expand Down Expand Up @@ -1089,7 +1090,7 @@ fn resolve_extension_macro(name: &str, abi: &Abi) -> Result<ExtensionMacroKind,
let prefix_str: Option<String> = match cprefix_str.eval(env)? {
Value::U64Scalar(0) => None,
Value::I64Scalar(0) => None,
val => Some(val.to_str().ok_or(EvalError::IllegalType)?.into()),
val => Some(val.deref_ptr(env)?.to_str().ok_or(EvalError::IllegalType)?.into()),
};

let prefix_type = eval_int!(cprefix_type);
Expand Down

0 comments on commit 741cd38

Please sign in to comment.