diff options
| author | Björn Gustavsson <[email protected]> | 2016-02-01 14:15:02 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-02-01 14:15:02 +0100 |
| commit | f269d952033a177836fa5e949857035c6b6f9c6b (patch) | |
| tree | b7fe277d48515f9f24599c5b75c3d8be059a5211 /lib/stdlib/src/beam_lib.erl | |
| parent | 6c574b52d66a6c74f7413fd19c1b99564aef293e (diff) | |
| parent | eb75295eb95602d0930ce9070447537b7ace22df (diff) | |
| download | otp-f269d952033a177836fa5e949857035c6b6f9c6b.tar.gz otp-f269d952033a177836fa5e949857035c6b6f9c6b.tar.bz2 otp-f269d952033a177836fa5e949857035c6b6f9c6b.zip | |
Merge branch 'bjorn/stdlib/remove-tuple-fun-vestiges'
* bjorn/stdlib/remove-tuple-fun-vestiges:
Eliminate redundant double is_function test
Diffstat (limited to 'lib/stdlib/src/beam_lib.erl')
| -rw-r--r-- | lib/stdlib/src/beam_lib.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl index d20d86269a..00cd1221fa 100644 --- a/lib/stdlib/src/beam_lib.erl +++ b/lib/stdlib/src/beam_lib.erl @@ -975,9 +975,7 @@ handle_call({get_crypto_key, What}, From, #state{crypto_key_f=F}=S) -> handle_call({crypto_key_fun, F}, {_,_} = From, S) -> case S#state.crypto_key_f of undefined -> - %% Don't allow tuple funs here. (They weren't allowed before, - %% so there is no reason to allow them now.) - if is_function(F), is_function(F, 1) -> + if is_function(F, 1) -> {Result, Fun, Reply} = case catch F(init) of ok -> |