[cfe-commits] r150163 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td include/clang/Sema/Sema.h lib/Sema/SemaExpr.cpp lib/Sema/SemaLambda.cpp test/CXX/expr/expr.prim/expr.prim.lambda/p2.cpp

[Douglas Gregor]

On Feb 9, 2012, at 3:18 AM, Dmitri Gribenko wrote:

> On Thu, Feb 9, 2012 at 10:14 AM, Douglas Gregor <dgregor at apple.com> wrote:
>> Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=150163&r1=150162&r2=150163&view=diff
>> ==============================================================================
>> --- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
>> +++ cfe/trunk/lib/Sema/SemaExpr.cpp Thu Feb  9 02:14:43 2012
> [...]
>> @@ -9318,6 +9347,8 @@
>>     CleanupVarDeclMarking();
>>     std::swap(MaybeODRUseExprs, Rec.SavedMaybeODRUseExprs);
>> 
>> +    if (Rec.Context == Unevaluated) {
>> +    }
>>   // Otherwise, merge the contexts together.
>>   } else {
>>     ExprNeedsCleanups |= Rec.ParentNeedsCleanups;
> 
> Was that really intended to be a no-op if?

It was left over from a prior attempt. Fixed in r150255, thanks!

	- Doug