Commit 3f065cca authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r227368: 

------------------------------------------------------------------------
r227368 | rikka | 2015-01-28 13:10:46 -0800 (Wed, 28 Jan 2015) | 9 lines

Revert a change from r222797 that is no longer needed and can cause
infinite recursion.

Also guard against said infinite recursion by adding an assert that will
trigger if CorrectDelayedTyposInExpr is called before a previous call to
CorrectDelayedTyposInExpr returns (i.e. if the TreeTransform run by
CorrectDelayedTyposInExpr calls a sequence of methods that
end up calling CorrectDelayedTyposInExpr, as the new test case had done
prior to this commit). Fixes PR22292.
------------------------------------------------------------------------

llvm-svn: 227375
parent 25a335d8

clang/lib/Sema/SemaExpr.cpp

+2 −6
Original line number Diff line number Diff line
@@ -4762,12 +4762,8 @@ Sema::BuildResolvedCallExpr(Expr *Fn, NamedDecl *NDecl, 
                                     VK_RValue, RParenLoc);















  // Bail out early if calling a builtin with custom typechecking.













  if (BuiltinID && Context.BuiltinInfo.hasCustomTypechecking(BuiltinID)) {













    ExprResult Res = CorrectDelayedTyposInExpr(TheCall);













    if (!Res.isUsable() || !isa<CallExpr>(Res.get()))













      return Res;













    return CheckBuiltinFunctionCall(FDecl, BuiltinID, cast<CallExpr>(Res.get()));













  }













  if (BuiltinID && Context.BuiltinInfo.hasCustomTypechecking(BuiltinID))













    return CheckBuiltinFunctionCall(FDecl, BuiltinID, TheCall);





























 retry:















  const FunctionType *FuncT;

































clang/lib/Sema/SemaExprCXX.cpp



+4
−0






























Original line number
Diff line number
Diff line








@@ -6232,8 +6232,12 @@ ExprResult Sema::CorrectDelayedTyposInExpr(













  if (E && !ExprEvalContexts.empty() && ExprEvalContexts.back().NumTypos &&















      (E->isTypeDependent() || E->isValueDependent() ||















       E->isInstantiationDependent())) {













    auto TyposInContext = ExprEvalContexts.back().NumTypos;













    assert(TyposInContext < ~0U && "Recursive call of CorrectDelayedTyposInExpr");













    ExprEvalContexts.back().NumTypos = ~0U;















    auto TyposResolved = DelayedTypos.size();















    auto Result = TransformTypos(*this, Filter).Transform(E);













    ExprEvalContexts.back().NumTypos = TyposInContext;















    TyposResolved -= DelayedTypos.size();















    if (Result.isInvalid() || Result.get() != E) {















      ExprEvalContexts.back().NumTypos -= TyposResolved;

































clang/test/SemaCXX/typo-correction-delayed.cpp



+8
−0






























Original line number
Diff line number
Diff line








@@ -166,6 +166,14 @@ namespace PR22250 {













int getenv_s(size_t *y, char(&z)) {}















}





























namespace PR22291 {













template <unsigned I> void f() {













  unsigned *prio_bits_array;  // expected-note {{'prio_bits_array' declared here}}













  // expected-error@+1 {{use of undeclared identifier 'prio_op_array'; did you mean 'prio_bits_array'?}}













  __atomic_store_n(prio_op_array + I, false, __ATOMIC_RELAXED);













}













}





























namespace PR22297 {















double pow(double x, double y);















struct TimeTicks {