Importing rustc-1.51.0

Change-Id: Ie4f520eabee71971211e4637a45cbc9bf4a91e95
diff --git a/src/llvm-project/llvm/lib/MCA/HardwareUnits/LSUnit.cpp b/src/llvm-project/llvm/lib/MCA/HardwareUnits/LSUnit.cpp
index e945e8c..4594368 100644
--- a/src/llvm-project/llvm/lib/MCA/HardwareUnits/LSUnit.cpp
+++ b/src/llvm-project/llvm/lib/MCA/HardwareUnits/LSUnit.cpp
@@ -243,6 +243,8 @@
       CurrentStoreGroupID = 0;
     if (GroupID == CurrentLoadBarrierGroupID)
       CurrentLoadBarrierGroupID = 0;
+    if (GroupID == CurrentStoreBarrierGroupID)
+      CurrentStoreBarrierGroupID = 0;
   }
 }