ArrayRef passed by value. Added test, may remove another later.

Author: Aidan

llvm/include/llvm/CodeGen/SDPatternMatch.h

@@ -565,19 +565,18 @@ template <typename T0, typename T1, typename T2> struct SDShuffle_match {
     return false;
   }
 };
-
 struct m_Mask {
-  ArrayRef<int> &MaskRef;
-  m_Mask(ArrayRef<int> &MaskRef) : MaskRef(MaskRef) {}
+  ArrayRef<int> MaskRef;
+  m_Mask(ArrayRef<int> MaskRef) : MaskRef(MaskRef) {}
   bool match(ArrayRef<int> Mask) {
     MaskRef = Mask;
     return true;
   }
 };
 
 struct m_SpecificMask {
-  ArrayRef<int> &MaskRef;
-  m_SpecificMask(ArrayRef<int> &MaskRef) : MaskRef(MaskRef) {}
+  ArrayRef<int> MaskRef;
+  m_SpecificMask(ArrayRef<int> MaskRef) : MaskRef(MaskRef) {}
   bool match(ArrayRef<int> Mask) { return MaskRef == Mask; }
 };
 

llvm/unittests/CodeGen/SelectionDAGPatternMatchTest.cpp

@@ -125,8 +125,7 @@ TEST_F(SelectionDAGPatternMatchTest, matchVecShuffle) {
   auto VInt32VT = EVT::getVectorVT(Context, Int32VT, 4);
   const std::array<int, 4> MaskData = {2, 0, 3, 1};
   const std::array<int, 4> OtherMaskData = {1, 2, 3, 4};
-  ArrayRef<int> Mask(MaskData);
-  ArrayRef<int> CapturedMask;
+  ArrayRef<int> CapturedMask(MaskData);
 
   SDValue V0 = DAG->getCopyFromReg(DAG->getEntryNode(), DL, 1, VInt32VT);
   SDValue V1 = DAG->getCopyFromReg(DAG->getEntryNode(), DL, 2, VInt32VT);
@@ -137,8 +136,12 @@ TEST_F(SelectionDAGPatternMatchTest, matchVecShuffle) {
   EXPECT_TRUE(sd_match(VecShuffleWithMask, m_Shuffle(m_Value(), m_Value())));
   EXPECT_TRUE(sd_match(VecShuffleWithMask,
                        m_Shuffle(m_Value(), m_Value(), m_Mask(CapturedMask))));
-  EXPECT_TRUE(sd_match(VecShuffleWithMask,
-                       m_Shuffle(m_Value(), m_Value(), m_SpecificMask(Mask))));
+  EXPECT_TRUE(
+      sd_match(VecShuffleWithMask,
+               m_Shuffle(m_Value(), m_Value(), m_SpecificMask(MaskData))));
+  EXPECT_FALSE(
+      sd_match(VecShuffleWithMask,
+               m_Shuffle(m_Value(), m_Value(), m_SpecificMask(OtherMaskData))));
   EXPECT_TRUE(std::equal(MaskData.begin(), MaskData.end(), CapturedMask.begin(),
                          CapturedMask.end()));
   EXPECT_FALSE(std::equal(OtherMaskData.begin(), OtherMaskData.end(),