diff options
| author | Björn Gustavsson <[email protected]> | 2014-11-17 16:08:40 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-11-17 16:08:40 +0100 |
| commit | dad49788a71fa6d7ea5d0515e87d87f9e68debe5 (patch) | |
| tree | 7c3ca50067c8c43cb5c3465e00f101ff34b8c66e /lib/compiler/src/v3_core.erl | |
| parent | e61f384adff0c9b134750ee239581296d25c10cd (diff) | |
| parent | 9430e6e0223f8d9ae592f8062a50285d23becd5a (diff) | |
| download | otp-dad49788a71fa6d7ea5d0515e87d87f9e68debe5.tar.gz otp-dad49788a71fa6d7ea5d0515e87d87f9e68debe5.tar.bz2 otp-dad49788a71fa6d7ea5d0515e87d87f9e68debe5.zip | |
Merge branch 'nox/compiler/eep37-duplicate-names/OTP-12262' into maint
* nox/compiler/eep37-duplicate-names/OTP-12262:
Fix miscompilation when module contains multiple named funs
Diffstat (limited to 'lib/compiler/src/v3_core.erl')
| -rw-r--r-- | lib/compiler/src/v3_core.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl index 83cf76f241..caf5298d38 100644 --- a/lib/compiler/src/v3_core.erl +++ b/lib/compiler/src/v3_core.erl @@ -647,8 +647,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), |