aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-11-04 10:26:24 +0100
committerFredrik Gustafsson <[email protected]>2013-11-04 10:26:24 +0100
commit82803a5f91adb7825de911edc6965ab8f1f57a17 (patch)
treeba08d86d83c754cf501a0845f5e94a3ce4b3bf60
parentf7659aeadf2b50acc6140c62a1d1587bf0a8795c (diff)
parentc03b279ca0888926b88e28f8c7edf4a76454b4a3 (diff)
downloadotp-82803a5f91adb7825de911edc6965ab8f1f57a17.tar.gz
otp-82803a5f91adb7825de911edc6965ab8f1f57a17.tar.bz2
otp-82803a5f91adb7825de911edc6965ab8f1f57a17.zip
Merge branch 'Tonkpils/typo-fix/OTP-11455' into maint
* Tonkpils/typo-fix/OTP-11455: Update primary bootstrap Typo fix ambigous -> ambiguous
-rw-r--r--bootstrap/lib/compiler/ebin/beam_validator.beambin34556 -> 34556 bytes
-rw-r--r--lib/compiler/src/beam_validator.erl2
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
index 6b8673cb82..b8a3491caa 100644
--- a/bootstrap/lib/compiler/ebin/beam_validator.beam
+++ b/bootstrap/lib/compiler/ebin/beam_validator.beam
Binary files differ
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.