Include the processor atomic operations in the OperIsStore category

THe atomic operations are GT_CMPXCHG, GT_LOCKADD, GT_XCHG, GT_XADD

Commit migrated from https://github.com/dotnet/coreclr/commit/8747e2dc98d46d8fbc3c0677cf5d40c05533b3ce

diff --git a/src/coreclr/src/jit/gentree.h b/src/coreclr/src/jit/gentree.h
index 3078b77..3bddf61 100644 (file)
--- a/src/coreclr/src/jit/gentree.h
+++ b/src/coreclr/src/jit/gentree.h
@@ -1463,25 +1463,25 @@ public:
 
     bool OperIsImplicitIndir() const;
 
-    bool OperIsStore() const
+    static bool OperIsAtomicOp(genTreeOps gtOper)
     {
-        return OperIsStore(gtOper);
+        return (gtOper == GT_XADD || gtOper == GT_XCHG || gtOper == GT_LOCKADD || gtOper == GT_CMPXCHG);
     }
 
-    static bool OperIsStore(genTreeOps gtOper)
+    bool OperIsAtomicOp() const
     {
-        return (gtOper == GT_STOREIND || gtOper == GT_STORE_LCL_VAR || gtOper == GT_STORE_LCL_FLD ||
-                gtOper == GT_STORE_BLK || gtOper == GT_STORE_OBJ || gtOper == GT_STORE_DYN_BLK);
+        return OperIsAtomicOp(gtOper);
     }
 
-    static bool OperIsAtomicOp(genTreeOps gtOper)
+    bool OperIsStore() const
     {
-        return (gtOper == GT_XADD || gtOper == GT_XCHG || gtOper == GT_LOCKADD || gtOper == GT_CMPXCHG);
+        return OperIsStore(gtOper);
     }
 
-    bool OperIsAtomicOp() const
+    static bool OperIsStore(genTreeOps gtOper)
     {
-        return OperIsAtomicOp(gtOper);
+        return (gtOper == GT_STOREIND || gtOper == GT_STORE_LCL_VAR || gtOper == GT_STORE_LCL_FLD ||
+                OperIsStoreBlk(gtOper) || OperIsAtomicOp(gtOper));
     }
 
     // This is here for cleaner FEATURE_SIMD #ifdefs.

diff --git a/src/coreclr/src/jit/sideeffects.cpp b/src/coreclr/src/jit/sideeffects.cpp
index 931ee6f..6821ab5 100644 (file)
--- a/src/coreclr/src/jit/sideeffects.cpp
+++ b/src/coreclr/src/jit/sideeffects.cpp
@@ -165,7 +165,7 @@ AliasSet::NodeInfo::NodeInfo(Compiler* compiler, GenTree* node)
         isWrite = true;
         node    = node->gtGetOp1();
     }
-    else if (node->OperIsStore() || node->OperIsAtomicOp())
+    else if (node->OperIsStore())
     {
         isWrite = true;
     }