diff --git a/lib/IR/Function.cpp b/lib/IR/Function.cpp
index 13747cafec9..9e622bdc99b 100644
--- a/lib/IR/Function.cpp
+++ b/lib/IR/Function.cpp
@@ -474,7 +474,7 @@ std::string Intrinsic::getName(ID id, ArrayRef<Type*> Tys) {
 ///
 /// NOTE: This must be kept in synch with the copy in TblGen/IntrinsicEmitter!
 enum IIT_Info {
-  // Common values should be encoded with 0-16.
+  // Common values should be encoded with 0-15.
   IIT_Done = 0,
   IIT_I1   = 1,
   IIT_I8   = 2,
@@ -489,11 +489,11 @@ enum IIT_Info {
   IIT_V8   = 11,
   IIT_V16  = 12,
   IIT_V32  = 13,
-  IIT_V64  = 14,
-  IIT_PTR  = 15,
-  IIT_ARG  = 16,
+  IIT_PTR  = 14,
+  IIT_ARG  = 15,
 
-  // Values from 17+ are only encodable with the inefficient encoding.
+  // Values from 16+ are only encodable with the inefficient encoding.
+  IIT_V64  = 16,
   IIT_MMX  = 17,
   IIT_METADATA = 18,
   IIT_EMPTYSTRUCT = 19,
diff --git a/utils/TableGen/IntrinsicEmitter.cpp b/utils/TableGen/IntrinsicEmitter.cpp
index 406a5f606b7..37f6de057da 100644
--- a/utils/TableGen/IntrinsicEmitter.cpp
+++ b/utils/TableGen/IntrinsicEmitter.cpp
@@ -225,7 +225,7 @@ EmitIntrinsicToOverloadTable(const std::vector<CodeGenIntrinsic> &Ints,
 
 // NOTE: This must be kept in synch with the copy in lib/VMCore/Function.cpp!
 enum IIT_Info {
-  // Common values should be encoded with 0-16.
+  // Common values should be encoded with 0-15.
   IIT_Done = 0,
   IIT_I1   = 1,
   IIT_I8   = 2,
@@ -240,11 +240,11 @@ enum IIT_Info {
   IIT_V8   = 11,
   IIT_V16  = 12,
   IIT_V32  = 13,
-  IIT_V64  = 14,
-  IIT_PTR  = 15,
-  IIT_ARG  = 16,
+  IIT_PTR  = 14,
+  IIT_ARG  = 15,
 
-  // Values from 17+ are only encodable with the inefficient encoding.
+  // Values from 16+ are only encodable with the inefficient encoding.
+  IIT_V64  = 16,
   IIT_MMX  = 17,
   IIT_METADATA = 18,
   IIT_EMPTYSTRUCT = 19,