From 94a2f1f8fe00444926d6cbd5233091228806d234 Mon Sep 17 00:00:00 2001
From: Alfred Huang <ahuang@futurewei.com>
Date: Tue, 20 Jul 2021 10:25:52 -0700
Subject: [PATCH] Fix merge error in aarch64_abi.cpp for vector array

---
 .../maple_be/src/cg/aarch64/aarch64_abi.cpp   | 32 +------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/src/mapleall/maple_be/src/cg/aarch64/aarch64_abi.cpp b/src/mapleall/maple_be/src/cg/aarch64/aarch64_abi.cpp
index 78c4f7b0e2..111b65a0e1 100644
--- a/src/mapleall/maple_be/src/cg/aarch64/aarch64_abi.cpp
+++ b/src/mapleall/maple_be/src/cg/aarch64/aarch64_abi.cpp
@@ -516,37 +516,7 @@ int32 ParmLocator::LocateNextParm(MIRType &mirType, PLocInfo &pLoc, bool isFirst
      */
     /* case PTY_agg */
     case PTY_agg: {
-      int size = 0;
-      PrimType pTy = AArch64Abi::IsVectorArrayType(&mirType, size);
-      if (pTy != PTY_void) {
-        switch (size) {
-          case k1ByteSize: {
-            pLoc.reg0 = AllocateSIMDFPRegister();
-            break;
-          }
-          case k2ByteSize: {
-            pLoc.reg0 = AllocateSIMDFPRegister();
-            pLoc.reg1 = AllocateSIMDFPRegister();
-            break;
-          }
-          case k3ByteSize: {
-            pLoc.reg0 = AllocateSIMDFPRegister();
-            pLoc.reg1 = AllocateSIMDFPRegister();
-            pLoc.reg2 = AllocateSIMDFPRegister();
-            break;
-          }
-          case k4ByteSize: {
-            pLoc.reg0 = AllocateSIMDFPRegister();
-            pLoc.reg1 = AllocateSIMDFPRegister();
-            pLoc.reg2 = AllocateSIMDFPRegister();
-            pLoc.reg3 = AllocateSIMDFPRegister();
-            break;
-          }
-          default: CHECK_FATAL(0, "Invalid vector array size");
-        }
-      } else {
-        aggCopySize = ProcessPtyAggWhenLocateNextParm(mirType, pLoc, typeSize, typeAlign);
-      }
+      aggCopySize = ProcessPtyAggWhenLocateNextParm(mirType, pLoc, typeSize, typeAlign);
       break;
     }
     default:
-- 
Gitee