From d47eb1c41fed647e453f81aa6e38961440a61084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 2 Jan 2023 13:29:41 +0100
Subject: [PATCH] Update to new variable storage in Rizin (#3062)

---
 rizin                         |  2 +-
 src/core/Cutter.cpp           | 13 +------------
 src/core/CutterDescriptions.h |  3 +--
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/rizin b/rizin
index 3f077bce..d9950f74 160000
--- a/rizin
+++ b/rizin
@@ -1 +1 @@
-Subproject commit 3f077bce4a0a7c6323b31d06c6a3a631a988fa5f
+Subproject commit d9950f74792c1dfb565ac491cc7ef706b80e6044
diff --git a/src/core/Cutter.cpp b/src/core/Cutter.cpp
index ce9d4cdb..b21a1e03 100644
--- a/src/core/Cutter.cpp
+++ b/src/core/Cutter.cpp
@@ -1793,18 +1793,7 @@ QList<VariableDescription> CutterCore::getVariables(RVA at)
     }
     for (auto var : CutterPVector<RzAnalysisVar>(&fcn->vars)) {
         VariableDescription desc;
-        switch (var->kind) {
-        case RZ_ANALYSIS_VAR_KIND_BPV:
-            desc.refType = VariableDescription::RefType::BP;
-            break;
-        case RZ_ANALYSIS_VAR_KIND_SPV:
-            desc.refType = VariableDescription::RefType::SP;
-            break;
-        case RZ_ANALYSIS_VAR_KIND_REG:
-        default:
-            desc.refType = VariableDescription::RefType::Reg;
-            break;
-        }
+        desc.storageType = var->storage.type;
         if (!var->name || !var->type) {
             continue;
         }
diff --git a/src/core/CutterDescriptions.h b/src/core/CutterDescriptions.h
index a56f7186..aed9b508 100644
--- a/src/core/CutterDescriptions.h
+++ b/src/core/CutterDescriptions.h
@@ -355,8 +355,7 @@ struct RefDescription
 
 struct VariableDescription
 {
-    enum class RefType { SP, BP, Reg };
-    RefType refType;
+    RzAnalysisVarStorageType storageType;
     QString name;
     QString type;
 };