diff --git a/SPIRV/spvIR.h b/SPIRV/spvIR.h
index 1501e6bb..98f4971b 100755
--- a/SPIRV/spvIR.h
+++ b/SPIRV/spvIR.h
@@ -70,7 +70,17 @@ const Id NoType = 0;
 
 const unsigned int BadValue = 0xFFFFFFFF;
 const Decoration NoPrecision = (Decoration)BadValue;
-const MemorySemanticsMask MemorySemanticsAllMemory = (MemorySemanticsMask)0x3FF;
+const MemorySemanticsMask MemorySemanticsAllMemory = 
+                (MemorySemanticsMask)(MemorySemanticsAcquireMask |
+                                      MemorySemanticsReleaseMask |
+                                      MemorySemanticsAcquireReleaseMask |
+                                      MemorySemanticsSequentiallyConsistentMask |
+                                      MemorySemanticsUniformMemoryMask |
+                                      MemorySemanticsSubgroupMemoryMask |
+                                      MemorySemanticsWorkgroupMemoryMask |
+                                      MemorySemanticsCrossWorkgroupMemoryMask |
+                                      MemorySemanticsAtomicCounterMemoryMask |
+                                      MemorySemanticsImageMemoryMask);
 
 //
 // SPIR-V IR instruction.
diff --git a/Test/baseResults/spv.310.comp.out b/Test/baseResults/spv.310.comp.out
index 93e49b51..1a34d087 100755
--- a/Test/baseResults/spv.310.comp.out
+++ b/Test/baseResults/spv.310.comp.out
@@ -45,7 +45,7 @@ Linked compute stage:
                3:             TypeFunction 2
                6:             TypeInt 32 0
                7:      6(int) Constant 1
-               8:      6(int) Constant 1023
+               8:      6(int) Constant 4062
                9:      6(int) Constant 0
               10:             TypeFloat 32
               11:             TypeVector 10(float) 3
diff --git a/Test/baseResults/spv.400.tesc.out b/Test/baseResults/spv.400.tesc.out
index 02c7a6cf..6905c4a0 100755
--- a/Test/baseResults/spv.400.tesc.out
+++ b/Test/baseResults/spv.400.tesc.out
@@ -71,7 +71,7 @@ Linked tessellation control stage:
                3:             TypeFunction 2
                6:             TypeInt 32 0
                7:      6(int) Constant 1
-               8:      6(int) Constant 1023
+               8:      6(int) Constant 4062
                9:      6(int) Constant 0
               10:             TypeInt 32 1
               11:             TypePointer Function 10(int)