Revert the flags change for now, I have a better idea for this.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80255 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index 2c8c731..dde5c28 100644
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -408,11 +408,10 @@
/// If @p ForceRValue, then overloading is performed as if From was an rvalue,
/// no matter its actual lvalueness.
ImplicitConversionSequence
-Sema::TryImplicitConversion(Expr* From, QualType ToType, unsigned Flags) {
- bool SuppressUserConversions = Flags & ORF_SuppressUserConversions;
- bool AllowExplicit = Flags & ORF_AllowExplicit;
- bool ForceRValue = Flags & ORF_ForceRValue;
-
+Sema::TryImplicitConversion(Expr* From, QualType ToType,
+ bool SuppressUserConversions,
+ bool AllowExplicit, bool ForceRValue)
+{
ImplicitConversionSequence ICS;
if (IsStandardConversion(From, ToType, ICS.Standard))
ICS.ConversionKind = ImplicitConversionSequence::StandardConversion;
@@ -1930,11 +1929,8 @@
/*AllowExplicit=*/false, ForceRValue);
return ICS;
} else {
- unsigned Flags = ORF_None;
- if (SuppressUserConversions) Flags |= ORF_SuppressUserConversions;
- if (ForceRValue) Flags |= ORF_ForceRValue;
-
- return TryImplicitConversion(From, ToType, Flags);
+ return TryImplicitConversion(From, ToType, SuppressUserConversions,
+ ForceRValue);
}
}
@@ -2068,7 +2064,7 @@
/// TryContextuallyConvertToBool - Attempt to contextually convert the
/// expression From to bool (C++0x [conv]p3).
ImplicitConversionSequence Sema::TryContextuallyConvertToBool(Expr *From) {
- return TryImplicitConversion(From, Context.BoolTy, ORF_AllowExplicit);
+ return TryImplicitConversion(From, Context.BoolTy, false, true);
}
/// PerformContextuallyConvertToBool - Perform a contextual conversion