various updates to match r54873 on mainline.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54874 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index a069460..906255e 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2252,7 +2252,7 @@
       V.extend(InitVal.getBitWidth());
       if (V != InitVal)
         Diag(ECD->getLocation(), diag::ext_enum_value_not_int,
-             InitVal.toString());
+             InitVal.toString(10));
     }
     
     // Keep track of the size of positive and negative values.