[PATCH] D68690: AMDGPU/SILoadStoreOptimizer: fix a likely bug introduced recently

[Nicolai Hähnle via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGd8f7c68e28bd: AMDGPU/SILoadStoreOptimizer: fix a likely bug introduced recently (authored by nhaehnle).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D68690/new/

https://reviews.llvm.org/D68690

Files:
  llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp


Index: llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp
===================================================================
--- llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp
+++ llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp
@@ -1665,8 +1665,8 @@
 void SILoadStoreOptimizer::addInstToMergeableList(const CombineInfo &CI,
                  std::list<std::list<CombineInfo> > &MergeableInsts) const {
   for (std::list<CombineInfo> &AddrList : MergeableInsts) {
-    if (AddrList.front().hasSameBaseAddress(*CI.I) &&
-        AddrList.front().InstClass == CI.InstClass) {
+    if (AddrList.front().InstClass == CI.InstClass &&
+        AddrList.front().hasSameBaseAddress(*CI.I)) {
       AddrList.emplace_back(CI);
       return;
     }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D68690.229684.patch
Type: text/x-patch
Size: 738 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191116/8e117d35/attachment.bin>