aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-11-17 16:18:24 +0100
committerBjörn Gustavsson <[email protected]>2014-11-17 16:18:24 +0100
commitc85746b2fa2780435051611caa87639c770a4d91 (patch)
tree3c6f91940e275a51adbf7b970b4c30001bae9e67 /lib/compiler/src
parent2045ebf21c428711c55edddbc93ec8d024d47020 (diff)
parent761e1318abdaee269be8cdcbb6b3e6f5d3f2a65d (diff)
downloadotp-c85746b2fa2780435051611caa87639c770a4d91.tar.gz
otp-c85746b2fa2780435051611caa87639c770a4d91.tar.bz2
otp-c85746b2fa2780435051611caa87639c770a4d91.zip
Merge branch 'maint'
* maint: Fix miscompilation when module contains multiple named funs Fix locations of shadowing warnings in ms_transform
Diffstat (limited to 'lib/compiler/src')
-rw-r--r--lib/compiler/src/v3_core.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index 6b9450e481..612660c2d6 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -653,8 +653,8 @@ expr({'fun',L,{clauses,Cs},Id}, St) ->
fun_tq(Id, Cs, L, St, unnamed);
expr({named_fun,L,'_',Cs,Id}, St) ->
fun_tq(Id, Cs, L, St, unnamed);
-expr({named_fun,L,Name,Cs,{Index,Uniq,_Fname}}, St) ->
- fun_tq({Index,Uniq,Name}, Cs, L, St, {named, Name});
+expr({named_fun,L,Name,Cs,Id}, St) ->
+ fun_tq(Id, Cs, L, St, {named,Name});
expr({call,L,{remote,_,M,F},As0}, #core{wanted=Wanted}=St0) ->
{[M1,F1|As1],Aps,St1} = safe_list([M,F|As0], St0),
Lanno = lineno_anno(L, St1),