diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2013-07-22 21:41:31 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2013-07-22 21:46:58 +0200 |
| commit | d6985f32ff416307f2c4a0d48b4ec7c403b3a962 (patch) | |
| tree | 804ba626af633d2fc32d78002239dd8a0119fbd1 | |
| parent | 2a418eeb10f82673a7f7f77f878cc7e786c37d09 (diff) | |
| download | erlang-d6985f32ff416307f2c4a0d48b4ec7c403b3a962.tar.gz | |
Fix unsafe variable tracking in try expressions
Variables used in the body of a try expression were marked as unsafe
*and* used, which makes no sense as an unsafe variable can't be used.
Function vtsubtract/2 is used to forget usage of such unsafe variables.
Reported-by: Paul Davis
| -rw-r--r-- | lib/stdlib/src/erl_lint.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/test/erl_lint_SUITE.erl | 19 |
2 files changed, 19 insertions, 2 deletions
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl index 4d02a00af8..2e791379c1 100644 --- a/lib/stdlib/src/erl_lint.erl +++ b/lib/stdlib/src/erl_lint.erl @@ -2106,7 +2106,7 @@ expr({'try',Line,Es,Scs,Ccs,As}, Vt, St0) -> {Evt0,St1} = exprs(Es, Vt, St0), TryLine = {'try',Line}, Uvt = vtunsafe(vtnames(vtnew(Evt0, Vt)), TryLine, []), - Evt1 = vtupdate(Uvt, Evt0), + Evt1 = vtupdate(Uvt, vtsubtract(Evt0, Uvt)), {Sccs,St2} = icrt_clauses(Scs++Ccs, TryLine, vtupdate(Evt1, Vt), St1), Rvt0 = Sccs, Rvt1 = vtupdate(vtunsafe(vtnames(vtnew(Rvt0, Vt)), TryLine, []), Rvt0), diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl index 68945d6f39..a407a94c32 100644 --- a/lib/stdlib/test/erl_lint_SUITE.erl +++ b/lib/stdlib/test/erl_lint_SUITE.erl @@ -1098,7 +1098,24 @@ unsafe_vars_try(Config) when is_list(Config) -> {10,erl_lint,{unsafe_var,'Ra',{'try',3}}}, {10,erl_lint,{unsafe_var,'Rc',{'try',3}}}, {10,erl_lint,{unsafe_var,'Ro',{'try',3}}}], - []}}], + []}}, + {unsafe_try5, + <<"bang() -> + case 1 of + nil -> + Acc = 2; + _ -> + try + Acc = 3, + Acc + catch _:_ -> + ok + end + end, + Acc. + ">>, + [], + {errors,[{13,erl_lint,{unsafe_var,'Acc',{'try',6}}}],[]}}], ?line [] = run(Config, Ts), ok. |