5 files changed, 14 insertions, 14 deletions
diff --git a/lib/AST/ASTImporter.cpp b/lib/AST/ASTImporter.cpp
index 5feaa22be4..f63df46f52 100644
--- a/lib/AST/ASTImporter.cpp
+++ b/lib/AST/ASTImporter.cpp
@@ -2947,7 +2947,7 @@ Expr *ASTNodeImporter::VisitImplicitCastExpr(ImplicitCastExpr *E) {
     return 0;
 
   return ImplicitCastExpr::Create(Importer.getToContext(), T, E->getCastKind(),
-                                  SubExpr, &BasePath, E->getCategory());
+                                  SubExpr, &BasePath, E->getValueKind());
 }
 
 Expr *ASTNodeImporter::VisitCStyleCastExpr(CStyleCastExpr *E) {
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 1399e00467..5efc6675f7 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -802,12 +802,12 @@ void CastExpr::setCastPath(const CXXCastPath &Path) {
 ImplicitCastExpr *ImplicitCastExpr::Create(ASTContext &C, QualType T,
                                            CastKind Kind, Expr *Operand,
                                            const CXXCastPath *BasePath,
-                                           ResultCategory Cat) {
+                                           ExprValueKind VK) {
   unsigned PathSize = (BasePath ? BasePath->size() : 0);
   void *Buffer =
     C.Allocate(sizeof(ImplicitCastExpr) + PathSize * sizeof(CXXBaseSpecifier*));
   ImplicitCastExpr *E =
-    new (Buffer) ImplicitCastExpr(T, Kind, Operand, PathSize, Cat);
+    new (Buffer) ImplicitCastExpr(T, Kind, Operand, PathSize, VK);
   if (PathSize) E->setCastPath(*BasePath);
   return E;
 }
@@ -1600,7 +1600,7 @@ FieldDecl *Expr::getBitField() {
   Expr *E = this->IgnoreParens();
 
   while (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(E)) {
-    if (ICE->getCategory() != ImplicitCastExpr::RValue &&
+    if (ICE->getValueKind() != VK_RValue &&
         ICE->getCastKind() == CastExpr::CK_NoOp)
       E = ICE->getSubExpr()->IgnoreParens();
     else
@@ -1623,7 +1623,7 @@ bool Expr::refersToVectorElement() const {
   const Expr *E = this->IgnoreParens();
   
   while (const ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(E)) {
-    if (ICE->getCategory() != ImplicitCastExpr::RValue &&
+    if (ICE->getValueKind() != VK_RValue &&
         ICE->getCastKind() == CastExpr::CK_NoOp)
       E = ICE->getSubExpr()->IgnoreParens();
     else
diff --git a/lib/AST/ExprClassification.cpp b/lib/AST/ExprClassification.cpp
index 429366ee89..80e07c5f08 100644
--- a/lib/AST/ExprClassification.cpp
+++ b/lib/AST/ExprClassification.cpp
@@ -134,13 +134,13 @@ static Cl::Kinds ClassifyInternal(ASTContext &Ctx, const Expr *E) {
     // Implicit casts are lvalues if they're lvalue casts. Other than that, we
     // only specifically record class temporaries.
   case Expr::ImplicitCastExprClass:
-    switch (cast<ImplicitCastExpr>(E)->getCategory()) {
-    case ImplicitCastExpr::RValue:
+    switch (cast<ImplicitCastExpr>(E)->getValueKind()) {
+    case VK_RValue:
       return Lang.CPlusPlus && E->getType()->isRecordType() ?
         Cl::CL_ClassTemporary : Cl::CL_PRValue;
-    case ImplicitCastExpr::LValue:
+    case VK_LValue:
       return Cl::CL_LValue;
-    case ImplicitCastExpr::XValue:
+    case VK_XValue:
       return Cl::CL_XValue;
     }
     llvm_unreachable("Invalid value category of implicit cast.");
diff --git a/lib/AST/StmtDumper.cpp b/lib/AST/StmtDumper.cpp
index 3707b61848..44601e0bdf 100644
--- a/lib/AST/StmtDumper.cpp
+++ b/lib/AST/StmtDumper.cpp
@@ -340,14 +340,14 @@ void StmtDumper::VisitCastExpr(CastExpr *Node) {
 
 void StmtDumper::VisitImplicitCastExpr(ImplicitCastExpr *Node) {
   VisitCastExpr(Node);
-  switch (Node->getCategory()) {
-  case ImplicitCastExpr::LValue:
+  switch (Node->getValueKind()) {
+  case VK_LValue:
     OS << " lvalue";
     break;
-  case ImplicitCastExpr::XValue:
+  case VK_XValue:
     OS << " xvalue";
     break;
-  default:
+  case VK_RValue:
     break;
   }
 }
diff --git a/lib/AST/StmtProfile.cpp b/lib/AST/StmtProfile.cpp
index e7aa9db7e7..4e8fc5fe70 100644
--- a/lib/AST/StmtProfile.cpp
+++ b/lib/AST/StmtProfile.cpp
@@ -325,7 +325,7 @@ void StmtProfiler::VisitCastExpr(CastExpr *S) {
 
 void StmtProfiler::VisitImplicitCastExpr(ImplicitCastExpr *S) {
   VisitCastExpr(S);
-  ID.AddInteger(S->getCategory());
+  ID.AddInteger(S->getValueKind());
 }
 
 void StmtProfiler::VisitExplicitCastExpr(ExplicitCastExpr *S) {