<p dir="ltr">LGTM for branch.</p>
<div class="gmail_quote">On Aug 20, 2015 9:47 AM, "Hans Wennborg" <<a href="mailto:hans@chromium.org">hans@chromium.org</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">It was requested that this be merged to 3.7.<br>
<br>
Richard: OK for merging?<br>
<br>
Thanks,<br>
Hans<br>
<br>
On Thu, Aug 20, 2015 at 6:11 AM, Olivier Goffart via cfe-commits<br>
<<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br>
> Author: ogoffart<br>
> Date: Thu Aug 20 08:11:14 2015<br>
> New Revision: 245560<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=245560&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=245560&view=rev</a><br>
> Log:<br>
> Fix crash with two typos in the arguments of a function<br>
><br>
> The problem is that the arguments are of TheCall are reset later<br>
> to the ones in Args, making TypoExpr put back. Some TypoExpr that have<br>
> already  been diagnosed and will assert later in Sema::getTypoExprState<br>
><br>
> Modified:<br>
>     cfe/trunk/lib/Sema/SemaExpr.cpp<br>
>     cfe/trunk/test/Sema/typo-correction.c<br>
><br>
> Modified: cfe/trunk/lib/Sema/SemaExpr.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=245560&r1=245559&r2=245560&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=245560&r1=245559&r2=245560&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Sema/SemaExpr.cpp (original)<br>
> +++ cfe/trunk/lib/Sema/SemaExpr.cpp Thu Aug 20 08:11:14 2015<br>
> @@ -4937,6 +4937,7 @@ Sema::BuildResolvedCallExpr(Expr *Fn, Na<br>
>      if (!Result.isUsable()) return ExprError();<br>
>      TheCall = dyn_cast<CallExpr>(Result.get());<br>
>      if (!TheCall) return Result;<br>
> +    Args = ArrayRef<Expr *>(TheCall->getArgs(), TheCall->getNumArgs());<br>
>    }<br>
><br>
>    // Bail out early if calling a builtin with custom typechecking.<br>
><br>
> Modified: cfe/trunk/test/Sema/typo-correction.c<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/typo-correction.c?rev=245560&r1=245559&r2=245560&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/typo-correction.c?rev=245560&r1=245559&r2=245560&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/Sema/typo-correction.c (original)<br>
> +++ cfe/trunk/test/Sema/typo-correction.c Thu Aug 20 08:11:14 2015<br>
> @@ -49,3 +49,9 @@ extern double cabs(_Complex double z);<br>
>  void fn1() {<br>
>    cabs(errij);  // expected-error {{use of undeclared identifier 'errij'}}<br>
>  }<br>
> +<br>
> +extern long afunction(int); // expected-note {{'afunction' declared here}}<br>
> +void fn2() {<br>
> +  f(THIS_IS_AN_ERROR, // expected-error {{use of undeclared identifier 'THIS_IS_AN_ERROR'}}<br>
> +    afunction(afunction_));  // expected-error {{use of undeclared identifier 'afunction_'; did you mean 'afunction'?}}<br>
> +}<br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>