diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index fce2289..78f2a8a 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -387,6 +387,7 @@
     // alignment requirements: getPointerInfo should take an AddrSpace.
     return getTypeInfo(QualType(cast<ExtQualType>(T)->getBaseType(), 0));
   case Type::ObjCQualifiedId:
+  case Type::ObjCQualifiedClass:
     Width = Target.getPointerWidth(0);
     Align = Target.getPointerAlign(0);
     break;
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 103bc37..8f43700 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -279,9 +279,15 @@
 };
 } // end anonymous namespace
 
+static bool HasPointerEvalType(const Expr* E) {
+  return E->getType()->isPointerType()
+         || E->getType()->isBlockPointerType()
+         || E->getType()->isObjCQualifiedIdType()
+         || E->getType()->isObjCQualifiedClassType();
+}
+
 static bool EvaluatePointer(const Expr* E, APValue& Result, EvalInfo &Info) {
-  if (!E->getType()->isPointerType()
-      && !E->getType()->isBlockPointerType())
+  if (!HasPointerEvalType(E))
     return false;
   Result = PointerExprEvaluator(Info).Visit(const_cast<Expr*>(E));
   return Result.isLValue();
@@ -1519,8 +1525,7 @@
   } else if (getType()->isIntegerType()) {
     if (!IntExprEvaluator(Info, Result.Val).Visit(const_cast<Expr*>(this)))
       return false;
-  } else if (getType()->isPointerType()
-             || getType()->isBlockPointerType()) {
+  } else if (HasPointerEvalType(this)) {
     if (!EvaluatePointer(this, Result.Val, Info))
       return false;
   } else if (getType()->isRealFloatingType()) {