Fix an unused variable warning in release builds and make the

assert-less codepath marginally more efficient.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@128472 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index 8125ce10862365827703b298f9bfa18b865971ec..c023cd3b2a4f1486b5221673b0dedb6cc696b46f 100644 (file)
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -1074,9 +1074,9 @@ static bool IsStandardConversion(Sema &S, Expr* From, QualType ToType,
         const Type *ClassType
           = S.Context.getTypeDeclType(Method->getParent()).getTypePtr();
         FromType = S.Context.getMemberPointerType(FromType, ClassType);
-      } else if (UnaryOperator *UnOp
-                 = dyn_cast<UnaryOperator>(From->IgnoreParens())) {
-        assert(UnOp->getOpcode() == UO_AddrOf &&
+      } else if (isa<UnaryOperator>(From->IgnoreParens())) {
+        assert(cast<UnaryOperator>(From->IgnoreParens())->getOpcode() ==
+               UO_AddrOf &&
                "Non-address-of operator for overloaded function expression");
         FromType = S.Context.getPointerType(FromType);
       }