From e6c35e1d4a7b9dc0683c7703efa8f1e06680843d Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Wed, 23 Jan 2013 13:38:47 +0100
Subject: Revert "Merge branch 'nox/rm-reverse-eta-conversion/OTP-10682'"

This reverts commit 750ecdea08fa5fa7e32b7f3019eed96c1699427e, reversing
changes made to 2cfa0466c3b3c7bd5e3621aff0f3e2ca30addb68.
---
 lib/compiler/src/beam_dict.erl | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'lib/compiler/src/beam_dict.erl')

diff --git a/lib/compiler/src/beam_dict.erl b/lib/compiler/src/beam_dict.erl
index ff6c7c11dc..531968b3c8 100644
--- a/lib/compiler/src/beam_dict.erl
+++ b/lib/compiler/src/beam_dict.erl
@@ -138,17 +138,7 @@ string(Str, Dict) when is_list(Str) ->
 -spec lambda(label(), non_neg_integer(), bdict()) ->
         {non_neg_integer(), bdict()}.
 
-lambda(Lbl, 0, #asm{lambdas=Lambdas0}=Dict) ->
-    case lists:keyfind(Lbl, 1, Lambdas0) of
-        {Lbl,{OldIndex,_,_,_,_}} ->
-            {OldIndex,Dict};
-        false ->
-            new_lambda(Lbl, 0, Dict)
-    end;
-lambda(Lbl, NumFree, Dict) ->
-    new_lambda(Lbl, NumFree, Dict).
-
-new_lambda(Lbl, NumFree, #asm{lambdas=Lambdas0}=Dict) ->
+lambda(Lbl, NumFree, #asm{lambdas=Lambdas0}=Dict) ->
     OldIndex = length(Lambdas0),
     %% Set Index the same as OldIndex.
     Index = OldIndex,
@@ -245,12 +235,10 @@ string_table(#asm{strings=Strings,string_offset=Size}) ->
 
 -spec lambda_table(bdict()) -> {non_neg_integer(), [<<_:192>>]}.
 
-lambda_table(#asm{exports=Ext0,locals=Loc0,lambdas=Lambdas0}) ->
+lambda_table(#asm{locals=Loc0,lambdas=Lambdas0}) ->
     Lambdas1 = sofs:relation(Lambdas0),
     Loc = sofs:relation([{Lbl,{F,A}} || {F,A,Lbl} <- Loc0]),
-    Ext = sofs:relation([{Lbl,{F,A}} || {F,A,Lbl} <- Ext0]),
-    All = sofs:union(Loc, Ext),
-    Lambdas2 = sofs:relative_product1(Lambdas1, All),
+    Lambdas2 = sofs:relative_product1(Lambdas1, Loc),
     Lambdas = [<<F:32,A:32,Lbl:32,Index:32,NumFree:32,OldUniq:32>> ||
 		  {{_,Lbl,Index,NumFree,OldUniq},{F,A}} <- sofs:to_external(Lambdas2)],
     {length(Lambdas),Lambdas}.
-- 
cgit v1.2.3