diff --git a/include/llvm/CodeGen/ValueTypes.h b/include/llvm/CodeGen/ValueTypes.h
index e75eb8cdae9..5cfb211c6dc 100644
--- a/include/llvm/CodeGen/ValueTypes.h
+++ b/include/llvm/CodeGen/ValueTypes.h
@@ -14,18 +14,22 @@
 ///
 namespace MVT {  // MVT = Machine Value Types
   enum ValueType {
-    Other          =   0 << 0,   // This is a non-standard value
-    i1             =   1 << 0,   // This is a 1 bit integer value
-    i8             =   1 << 1,   // This is an 8 bit integer value
-    i16            =   1 << 2,   // This is a 16 bit integer value
-    i32            =   1 << 3,   // This is a 32 bit integer value
-    i64            =   1 << 4,   // This is a 64 bit integer value
-    i128           =   1 << 5,   // This is a 128 bit integer value
+    // If you change this numbering, you must change the values in Target.td as
+    // well!
+    Other          =   0,   // This is a non-standard value
+    i1             =   1,   // This is a 1 bit integer value
+    i8             =   2,   // This is an 8 bit integer value
+    i16            =   3,   // This is a 16 bit integer value
+    i32            =   4,   // This is a 32 bit integer value
+    i64            =   5,   // This is a 64 bit integer value
+    i128           =   6,   // This is a 128 bit integer value
 
-    f32             =   1 << 6,   // This is a 32 bit floating point value
-    f64             =   1 << 7,   // This is a 64 bit floating point value
-    f80             =   1 << 8,   // This is a 80 bit floating point value
-    f128            =   1 << 9,   // This is a 128 bit floating point value
+    f32             =  7,   // This is a 32 bit floating point value
+    f64             =  8,   // This is a 64 bit floating point value
+    f80             =  9,   // This is a 80 bit floating point value
+    f128            = 10,   // This is a 128 bit floating point value
+
+    isVoid          = 11,   // This has no value
   };
 };