Address comment

Signed-off-by: Mikhail R. Gadelha <[email protected]>

Author: mikhailramalho

llvm/include/llvm/CodeGen/TargetLowering.h

@@ -3522,7 +3522,7 @@ class TargetLoweringBase {
 
   /// Returns true if it's profitable to allow merging store of loads when there
   /// are functions calls between the load and the store.
-  virtual bool shouldMergeStoreOfLoadsOverCall(EVT) const { return true; }
+  virtual bool shouldMergeStoreOfLoadsOverCall(EVT, EVT) const { return true; }
 
   //===----------------------------------------------------------------------===//
   //  GlobalISel Hooks

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

@@ -21647,7 +21647,7 @@ bool DAGCombiner::tryStoreMergeOfLoads(SmallVectorImpl<MemOpLink> &StoreNodes,
     }
 
     // Check if there is a call in the load/store chain.
-    if (!TLI.shouldMergeStoreOfLoadsOverCall(JointMemOpVT) &&
+    if (!TLI.shouldMergeStoreOfLoadsOverCall(MemVT, JointMemOpVT) &&
         hasCallInLdStChain(StoreNodes, LoadNodes, NumElem)) {
       StoreNodes.erase(StoreNodes.begin(), StoreNodes.begin() + NumElem);
       LoadNodes.erase(LoadNodes.begin(), LoadNodes.begin() + NumElem);

llvm/lib/Target/RISCV/RISCVISelLowering.h

@@ -1073,8 +1073,8 @@ class RISCVTargetLowering : public TargetLowering {
   /// Disables storing and loading vectors by default when there are function
   /// calls between the load and store, since these are more expensive than just
   /// using scalars
-  bool shouldMergeStoreOfLoadsOverCall(EVT VT) const override {
-    return VT.isScalarInteger();
+  bool shouldMergeStoreOfLoadsOverCall(EVT SrcVT, EVT MergedVT) const override {
+    return SrcVT.isScalarInteger() == MergedVT.isScalarInteger();
   }
 
   /// For available scheduling models FDIV + two independent FMULs are much