Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly order Kernel code for maps with mixed pairs #266

Merged
merged 1 commit into from
Mar 6, 2014

Conversation

nox
Copy link
Contributor

@nox nox commented Mar 4, 2014

The Kernel instructions were not properly ordered when compiling maps with complex values mixed in assoc and exact pairs.

@UlfNorell

The Kernel instructions were not properly ordered when compiling maps with
complex values mixed in assoc and exact pairs.

Reported-by: Ulf Norell
@@ -519,7 +519,7 @@ map_split_pairs(A, Var, Ces, Sub, St0) ->
Kes1 = [#k_map_pair{key=K,val=V}||{_,{assoc,K,V}} <- Assoc],
{Mvar,Em,St2} = force_atomic(#k_map{anno=A,op=assoc,var=Var,es=Kes1},St1),
Kes2 = [#k_map_pair{key=K,val=V}||{_,{exact,K,V}} <- Exact],
{#k_map{anno=A,op=exact,var=Mvar,es=Kes2},Em ++ Esp,St2}
{#k_map{anno=A,op=exact,var=Mvar,es=Kes2},Esp ++ Em,St2}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Devil is in the details =D

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I knew you would enjoy this one.

@psyeugenic psyeugenic self-assigned this Mar 4, 2014
@psyeugenic
Copy link
Contributor

Added to daily builds

@OTP-Maintainer
Copy link

Patch has passed first testings and has been assigned to be reviewed

@psyeugenic psyeugenic merged commit b0c011a into erlang:master Mar 6, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants