diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-11-04 10:26:49 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-11-04 10:26:49 +0100 |
| commit | a43efb085857bf8eb6958e03f4935c3c6bcac0bc (patch) | |
| tree | 9d70b9afe0da8d04ce43634921ea0da23454ebe7 | |
| parent | 38051e02fdfd50ed90439fac50d2ce3b18860d7a (diff) | |
| parent | 82803a5f91adb7825de911edc6965ab8f1f57a17 (diff) | |
| download | otp-a43efb085857bf8eb6958e03f4935c3c6bcac0bc.tar.gz otp-a43efb085857bf8eb6958e03f4935c3c6bcac0bc.tar.bz2 otp-a43efb085857bf8eb6958e03f4935c3c6bcac0bc.zip | |
Merge branch 'maint'
| -rw-r--r-- | bootstrap/lib/compiler/ebin/beam_validator.beam | bin | 34556 -> 34556 bytes | |||
| -rw-r--r-- | lib/compiler/src/beam_validator.erl | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/lib/compiler/ebin/beam_validator.beam b/bootstrap/lib/compiler/ebin/beam_validator.beam Binary files differindex 6b8673cb82..b8a3491caa 100644 --- a/bootstrap/lib/compiler/ebin/beam_validator.beam +++ b/bootstrap/lib/compiler/ebin/beam_validator.beam diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl index 70279ab658..48f5135aca 100644 --- a/lib/compiler/src/beam_validator.erl +++ b/lib/compiler/src/beam_validator.erl @@ -530,7 +530,7 @@ valfun_2(I, #vst{current=#st{ct=[[Fail]|_]}}=Vst) when is_integer(Fail) -> %% Update branched state valfun_3(I, branch_state(Fail, Vst)); valfun_2(_, _) -> - error(ambigous_catch_try_state). + error(ambiguous_catch_try_state). %% Handle the remaining floating point instructions here. %% Floating point. |