Revert the flags change for now, I have a better idea for this.

llvm-svn: 80255

1 files changed, 3 insertions, 8 deletions

diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 1d05008cbe9..85924948da7 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -881,19 +881,14 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType,
                                 const char *Flavor, bool AllowExplicit,
                                 bool Elidable)
 {
-  unsigned Flags = ORF_None;
-  if (AllowExplicit)
-    Flags |= ORF_AllowExplicit;
-  
   ImplicitConversionSequence ICS;
   ICS.ConversionKind = ImplicitConversionSequence::BadConversion;
   if (Elidable && getLangOptions().CPlusPlus0x) {
-    Flags |= ORF_ForceRValue;
-
-    ICS = TryImplicitConversion(From, ToType, Flags);
+    ICS = TryImplicitConversion(From, ToType, /*SuppressUserConversions*/false,
+                                AllowExplicit, /*ForceRValue*/true);
   }
   if (ICS.ConversionKind == ImplicitConversionSequence::BadConversion) {
-    ICS = TryImplicitConversion(From, ToType, Flags);
+    ICS = TryImplicitConversion(From, ToType, false, AllowExplicit);
   }
   return PerformImplicitConversion(From, ToType, ICS, Flavor);
 }