aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-07-29 11:58:56 +0200
committerFredrik Gustafsson <[email protected]>2013-07-29 11:58:56 +0200
commit989daf58ebeec07c7f15325ff7b843e02d28e810 (patch)
tree3e7ccc32b8b7d855fd8ce46198dcb0e29bc331ad /lib/compiler/src
parent280305a104bd1ecac3a270360949257791d4906b (diff)
parent0481ecafa24dc60c6bca8afdda038dc2239c991d (diff)
downloadotp-989daf58ebeec07c7f15325ff7b843e02d28e810.tar.gz
otp-989daf58ebeec07c7f15325ff7b843e02d28e810.tar.bz2
otp-989daf58ebeec07c7f15325ff7b843e02d28e810.zip
Merge branch 'maint'
Conflicts: bootstrap/lib/compiler/ebin/v3_core.beam
Diffstat (limited to 'lib/compiler/src')
-rw-r--r--lib/compiler/src/v3_core.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index 8159b42f2f..6dc4f3f300 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -956,7 +956,8 @@ lc_tq(Line, E, [Fil0|Qs0], Mc, St0) ->
args=[],
clauses=[#iclause{anno=LAnno,pats=[],
guard=Gs,body=Lps ++ [Lc]}],
- fc=#iclause{anno=LAnno,pats=[],guard=[],body=[Mc]}},
+ fc=#iclause{anno=LAnno#a{anno=[compiler_generated|LA]},
+ pats=[],guard=[],body=[Mc]}},
[],St2};
false ->
{Lc,Lps,St1} = lc_tq(Line, E, Qs0, Mc, St0),
@@ -1101,7 +1102,8 @@ bc_tq1(Line, E, [Fil0|Qs0], AccVar, St0) ->
clauses=[#iclause{anno=LAnno,
pats=[],
guard=Gs,body=Bps ++ [Bc]}],
- fc=#iclause{anno=LAnno,pats=[],guard=[],body=[AccVar]}},
+ fc=#iclause{anno=LAnno#a{anno=[compiler_generated|LA]},
+ pats=[],guard=[],body=[AccVar]}},
[],St};
false ->
{Bc,Bps,St1} = bc_tq1(Line, E, Qs0, AccVar, St0),