Index: lib/CodeGen/MachineVerifier.cpp
===================================================================
--- lib/CodeGen/MachineVerifier.cpp
+++ lib/CodeGen/MachineVerifier.cpp
@@ -1031,6 +1031,13 @@
         if (ValTy.getSizeInBytes() < MMO.getSize())
           report("store memory size cannot exceed value size", MI);
       }
+
+      if (MMO.isAtomic()) {
+        if (MMO.getAlignment() == 0)
+          report("Atomics must have explicit alignment", MI);
+        if (ValTy.isVector())
+          report("atomic operations can't have vector type", MI);
+      }
     }
 
     break;