1 files changed, 3 insertions, 4 deletions
diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index c47827153d..a994133afe 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -812,10 +812,9 @@ bool Sema::isExprCallable(const Expr &E, QualType &ZeroArgCallReturnTy,
   // but we can at least check if the type is "function of 0 arguments".
   QualType ExprTy = E.getType();
   const FunctionType *FunTy = NULL;
-  if (const PointerType *Ptr = ExprTy->getAs<PointerType>())
-    FunTy = Ptr->getPointeeType()->getAs<FunctionType>();
-  else if (const ReferenceType *Ref = ExprTy->getAs<ReferenceType>())
-    FunTy = Ref->getPointeeType()->getAs<FunctionType>();
+  QualType PointeeTy = ExprTy->getPointeeType();
+  if (!PointeeTy.isNull())
+    FunTy = PointeeTy->getAs<FunctionType>();
   if (!FunTy)
     FunTy = ExprTy->getAs<FunctionType>();
   if (!FunTy && ExprTy == Context.BoundMemberTy) {