diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index ccad97579651a513dfbf2e6fd42f5dc3f5273073..17e174e061a1ed12ad59eb49783d54877197d3e7 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -1764,6 +1764,7 @@ findSubobject(EvalInfo &Info, const Expr *E, APValue &Obj, QualType ObjType,
   return handler.found(*O, ObjType);
 }
 
+namespace {
 struct ExtractSubobjectHandler {
   EvalInfo &Info;
   APValue &Obj;
@@ -1855,6 +1856,7 @@ struct ModifySubobjectHandler {
   }
 };
 const AccessKinds ModifySubobjectHandler::AccessKind;
+} // end anonymous namespace
 
 /// Update the designated sub-object of an rvalue to the given value.
 static bool modifySubobject(EvalInfo &Info, const Expr *E,