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/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp
index c0499fa..4042604 100644
--- a/lib/Lex/PPExpressions.cpp
+++ b/lib/Lex/PPExpressions.cpp
@@ -470,11 +470,13 @@
if (ValueLive && Res.isUnsigned()) {
if (!LHS.isUnsigned() && LHS.Val.isNegative())
PP.Diag(OpLoc, diag::warn_pp_convert_lhs_to_positive,
- LHS.Val.toStringSigned() + " to "+LHS.Val.toStringUnsigned(),
+ LHS.Val.toString(10, true) + " to " +
+ LHS.Val.toString(10, false),
LHS.getRange(), RHS.getRange());
if (!RHS.isUnsigned() && RHS.Val.isNegative())
PP.Diag(OpLoc, diag::warn_pp_convert_rhs_to_positive,
- RHS.Val.toStringSigned() + " to "+RHS.Val.toStringUnsigned(),
+ RHS.Val.toString(10, true) + " to " +
+ RHS.Val.toString(10, false),
LHS.getRange(), RHS.getRange());
}
LHS.Val.setIsUnsigned(Res.isUnsigned());