!fixup use combineMetadataForCSE.

Author: fhahn

llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp

@@ -84,6 +84,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
+#include "llvm/Transforms/Utils/Local.h"
 
 using namespace llvm;
 
@@ -256,14 +257,7 @@ void MergedLoadStoreMotion::sinkStoresAndGEPs(BasicBlock *BB, StoreInst *S0,
   // Intersect optional metadata.
   S0->andIRFlags(S1);
 
-  // Keep metadata present on both instructions.
-  SmallVector<std::pair<unsigned, MDNode *>> MDs;
-  S0->getAllMetadataOtherThanDebugLoc(MDs);
-  SmallVector<unsigned> CommonMDs;
-  for (const auto &[Kind, MD] : MDs)
-    if (S1->getMetadata(Kind) == MD)
-      CommonMDs.push_back(Kind);
-  S0->dropUnknownNonDebugMetadata(CommonMDs);
+  combineMetadataForCSE(S0, S1, true);
   S0->applyMergedLocation(S0->getDebugLoc(), S1->getDebugLoc());
   S0->mergeDIAssignID(S1);