diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp
index 2e0b6a5..fff68b5 100644
--- a/lib/Parse/ParseExprCXX.cpp
+++ b/lib/Parse/ParseExprCXX.cpp
@@ -1022,7 +1022,7 @@
 
   if (Tok.is(tok::kw_decltype) && !FirstTypeName.isValid() && SS.isEmpty()) {
     DeclSpec DS(AttrFactory);
-    SourceLocation EndLoc = ParseDecltypeSpecifier(DS);
+    ParseDecltypeSpecifier(DS);
     if (DS.getTypeSpecType() == TST_error)
       return ExprError();
     return Actions.ActOnPseudoDestructorExpr(getCurScope(), Base, OpLoc, 
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 552d0e7..bc1e0a2 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -9262,7 +9262,8 @@
 
   if (!Folded || !AllowFold) {
     Diag(E->getSourceRange().getBegin(),
-         DiagID ? DiagID : diag::err_expr_not_ice) << E->getSourceRange();
+         DiagID ? DiagID : unsigned(diag::err_expr_not_ice))
+      << E->getSourceRange();
 
     // We only show the notes if they're not the usual "invalid subexpression"
     // or if they are actually in a subexpression.