Revert for real.

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

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 2a83aae4f0b76cf616008950a5f83aca3daacb02..a6bf82b590ba2829283364e2012e7266688c9f36 100644 (file)
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -991,11 +991,9 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType,
       if (CastArg.isInvalid())
         return true;
       
-      QualType CastArgType = ((Expr *)CastArg.get())->getType();
-      From = 
-        new (Context) ImplicitCastExpr(CastArgType, CastKind, 
-                                       CastArg.takeAs<Expr>(), 
-                                       CastArgType->isLValueReferenceType());      
+      From = new (Context) ImplicitCastExpr(ToType.getNonReferenceType(),
+                                            CastKind, CastArg.takeAs<Expr>(), 
+                                            ToType->isLValueReferenceType());
       return false;
     }