From 16f59a36ff14ba8a451ebcfb7a1ec5303a4440e2 Mon Sep 17 00:00:00 2001
From: Teng Zhang <rahxephon89@163.com>
Date: Tue, 18 Jun 2024 00:51:56 -0700
Subject: [PATCH] fix package test

---
 .../move/move-compiler/src/expansion/translate.rs      | 10 +++++++---
 third_party/move/move-compiler/src/parser/ast.rs       |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/third_party/move/move-compiler/src/expansion/translate.rs b/third_party/move/move-compiler/src/expansion/translate.rs
index dcbafebf665cd..2fd6f8b8ae8c5 100644
--- a/third_party/move/move-compiler/src/expansion/translate.rs
+++ b/third_party/move/move-compiler/src/expansion/translate.rs
@@ -2512,7 +2512,11 @@ fn call_to_vector_borrow(
     let borrow_fun = if mutable { "borrow_mut" } else { "borrow" };
     let access = E::ModuleAccess::new(
         *loc,
-        E::ModuleAccess_::ModuleAccess(sp(*loc, ident), Name::new(*loc, Symbol::from(borrow_fun))),
+        E::ModuleAccess_::ModuleAccess(
+            sp(*loc, ident),
+            Name::new(*loc, Symbol::from(borrow_fun)),
+            None,
+        ),
     );
     let vector_var = exp_(context, e.clone());
     sp(
@@ -2791,7 +2795,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
         PE::Borrow(mut_, pr) => {
             if let PE::Index(ref e, ref i) = pr.value {
                 // handling `&_[_]` or `&mut _[_]`
-                if context.env.flags().v2() {
+                if context.env.flags().compiler_v2() {
                     if let PE::Name(sp!(_, ref ptn), _) = e.value {
                         let name = ptn.name();
                         if is_struct_in_current_module(context, name) {
@@ -2829,7 +2833,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
         },
         PE::Cast(e, ty) => EE::Cast(exp(context, *e), type_(context, ty)),
         PE::Index(e, i) => {
-            if context.env.flags().v2() {
+            if context.env.flags().compiler_v2() {
                 // handling `_[_]` or `_[_]` (without `&` or `&mut`)
                 if let PE::Name(sp!(_, ref ptn), _) = e.value {
                     let name = ptn.name();
diff --git a/third_party/move/move-compiler/src/parser/ast.rs b/third_party/move/move-compiler/src/parser/ast.rs
index 90944e5b0b643..67e0854a30cd3 100644
--- a/third_party/move/move-compiler/src/parser/ast.rs
+++ b/third_party/move/move-compiler/src/parser/ast.rs
@@ -473,6 +473,7 @@ impl NameAccessChain_ {
             NameAccessChain_::One(x) => x,
             NameAccessChain_::Two(_, x) => x,
             NameAccessChain_::Three(_, x) => x,
+            NameAccessChain_::Four(_, x, _) => x,
         }
     }
 }