From 741cd38fd6eef03c029726904668e2b6ed4321ae Mon Sep 17 00:00:00 2001
From: Douglas Raillard <douglas.raillard@arm.com>
Date: Sat, 23 Dec 2023 01:22:50 +0100
Subject: [PATCH] WIP

---
 tools/analysis/trace-tools/src/lib/parquet.rs | 2 +-
 tools/analysis/traceevent/src/cparser.rs      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/analysis/trace-tools/src/lib/parquet.rs b/tools/analysis/trace-tools/src/lib/parquet.rs
index 463fb05621..ae4b2ad6e7 100644
--- a/tools/analysis/trace-tools/src/lib/parquet.rs
+++ b/tools/analysis/trace-tools/src/lib/parquet.rs
@@ -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
                                                 },
 
diff --git a/tools/analysis/traceevent/src/cparser.rs b/tools/analysis/traceevent/src/cparser.rs
index 52453c2015..e119998512 100644
--- a/tools/analysis/traceevent/src/cparser.rs
+++ b/tools/analysis/traceevent/src/cparser.rs
@@ -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())
@@ -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);