fix-12116

Author: rahxephon89

third_party/move/move-compiler-v2/src/bytecode_generator.rs

@@ -229,7 +229,7 @@ impl<'env> Generator<'env> {
             self.error(
                 id,
                 format!("cannot assign tuple type `{}` to single variable (use `(a, b, ..) = ..` instead)",
-                        ty.display(&self.env().get_type_display_ctx()))
+                        ty.display(&self.func_env.get_type_display_ctx()))
             )
         }
         self.new_temp(ty)
@@ -379,7 +379,7 @@ impl<'env> Generator<'env> {
                         format!(
                             "expected `&mut` but found `{}`",
                             self.temp_type(lhs_temp)
-                                .display(&self.env().get_type_display_ctx()),
+                                .display(&self.func_env.get_type_display_ctx()),
                         ),
                     );
                 }
@@ -588,12 +588,12 @@ impl<'env> Generator<'env> {
             {
                 let err_loc = self.env().get_node_loc(id);
                 let mut reasons: Vec<(Loc, String)> = Vec::new();
-                let reason_msg = format!("Invalid call to {}.", op.display(self.env(), id));
+                let reason_msg = format!("Invalid call to {}.", op.display_with_fun_env(self.env(), &self.func_env, id));
                 reasons.push((err_loc.clone(), reason_msg.clone()));
                 let err_msg  = format!(
                             "Expected a struct type. Global storage operations are restricted to struct types declared in the current module. \
                             Found: '{}'",
-                            self.env().get_node_instantiation(id)[0].display(&self.env().get_type_display_ctx())
+                            self.env().get_node_instantiation(id)[0].display(&self.func_env.get_type_display_ctx())
                 );
                 self.env()
                     .diag_with_labels(Severity::Error, &err_loc, &err_msg, reasons)
@@ -1067,7 +1067,7 @@ impl<'env> Generator<'env> {
                 format!(
                     "expected `&mut` but found `{}`",
                     self.temp_type(oper_temp)
-                        .display(&self.env().get_type_display_ctx())
+                        .display(&self.func_env.get_type_display_ctx())
                 ),
             )
         }

third_party/move/move-compiler-v2/tests/bytecode-generator/v1-typing/global_invalid.exp

@@ -17,26 +17,26 @@ module 0x42::m {
 
 
 Diagnostics:
-error: Expected a struct type. Global storage operations are restricted to struct types declared in the current module. Found: '#0'
+error: Expected a struct type. Global storage operations are restricted to struct types declared in the current module. Found: 'T'
   ┌─ tests/bytecode-generator/v1-typing/global_invalid.move:4:17
   │
 4 │         assert!(exists<T>(addr), 0);
   │                 ^^^^^^^^^^^^^^^
   │                 │
-  │                 Invalid call to exists<#0>.
+  │                 Invalid call to exists<T>.
 
-error: Expected a struct type. Global storage operations are restricted to struct types declared in the current module. Found: '#0'
+error: Expected a struct type. Global storage operations are restricted to struct types declared in the current module. Found: 'T'
   ┌─ tests/bytecode-generator/v1-typing/global_invalid.move:5:17
   │
 5 │         let _ = borrow_global<T>(addr);
   │                 ^^^^^^^^^^^^^^^^^^^^^^
   │                 │
-  │                 Invalid call to BorrowGlobal(Immutable)<#0>.
+  │                 Invalid call to BorrowGlobal(Immutable)<T>.
 
-error: Expected a struct type. Global storage operations are restricted to struct types declared in the current module. Found: '#0'
+error: Expected a struct type. Global storage operations are restricted to struct types declared in the current module. Found: 'T'
   ┌─ tests/bytecode-generator/v1-typing/global_invalid.move:6:9
   │
 6 │         move_from<T>(addr);
   │         ^^^^^^^^^^^^^^^^^^
   │         │
-  │         Invalid call to MoveFrom<#0>.
+  │         Invalid call to MoveFrom<T>.

third_party/move/move-model/src/ast.rs

@@ -2076,16 +2076,26 @@ impl<'a> ExpDisplay<'a> {
 }
 
 impl Operation {
-    /// Creates a display of an operation which can be used in formatting.
-    pub fn display<'a>(&'a self, env: &'a GlobalEnv, node_id: NodeId) -> OperationDisplay<'a> {
+
+    fn display_with_context<'a>(&'a self, env: &'a GlobalEnv, node_id: NodeId, tctx: TypeDisplayContext<'a>) -> OperationDisplay<'a> {
         OperationDisplay {
             env,
             oper: self,
             node_id,
-            tctx: TypeDisplayContext::new(env),
+            tctx,
         }
     }
 
+    /// Creates a display of an operation which can be used in formatting.
+    pub fn display<'a>(&'a self, env: &'a GlobalEnv, node_id: NodeId) -> OperationDisplay<'a> {
+        self.display_with_context(env, node_id, env.get_type_display_ctx())
+    }
+
+    /// Creates a display of an operation using the type display ctx from the function.
+    pub fn display_with_fun_env<'a>(&'a self, env: &'a GlobalEnv, fun_env : &'a FunctionEnv, node_id: NodeId) -> OperationDisplay<'a> {
+        self.display_with_context(env, node_id, fun_env.get_type_display_ctx())
+    }
+
     fn display_for_exp<'a>(
         &'a self,
         exp_display: &'a ExpDisplay,