diff --git a/lib/CliftImportModel/ImportDescriptiveInfo.cpp b/lib/CliftImportModel/ImportDescriptiveInfo.cpp
index 182e4e226..fdb2b5e2c 100644
--- a/lib/CliftImportModel/ImportDescriptiveInfo.cpp
+++ b/lib/CliftImportModel/ImportDescriptiveInfo.cpp
@@ -625,7 +625,11 @@ public:
     return mlir::success();
   }
 
-  mlir::LogicalResult visitGlobalVariableOp(clift::GlobalVariableOp Op) {
+  // Record the descriptive info for the given global variable op. Mirrors
+  // recordFunctionOpName: contains no per-function state and is therefore
+  // safe to call from any visit context (module level or while walking a
+  // function body following a clift::UseOp).
+  mlir::LogicalResult recordGlobalVariableOpName(clift::GlobalVariableOp Op) {
     if (const model::Segment *Segment = getModelSegment(Op)) {
       Symbols.record(Op, NameBuilder.name(Model, *Segment));
 
@@ -640,6 +644,10 @@ public:
     revng_abort("Invalid global variable handle");
   }
 
+  mlir::LogicalResult visitGlobalVariableOp(clift::GlobalVariableOp Op) {
+    return recordGlobalVariableOpName(Op);
+  }
+
   //===-------------------------- Comment import --------------------------===//
 
   mlir::LogicalResult visitStatementOp(clift::StatementOpInterface Op) {