diff options
| author | Björn Gustavsson <[email protected]> | 2018-10-01 11:44:44 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-10-01 11:44:44 +0200 |
| commit | ba7e9c39a9067b5bc5e9316c8eb294359e3641a6 (patch) | |
| tree | bf169ff32f0963cda3c8b35596dc308beeee3edb /lib/compiler/src/beam_validator.erl | |
| parent | 0f0a8cb58182b9c2b31b4b7f5c257eeab2c9c40b (diff) | |
| parent | 6ee1de2e3384b3f9a99f756867f18afd8166420c (diff) | |
| download | otp-ba7e9c39a9067b5bc5e9316c8eb294359e3641a6.tar.gz otp-ba7e9c39a9067b5bc5e9316c8eb294359e3641a6.tar.bz2 otp-ba7e9c39a9067b5bc5e9316c8eb294359e3641a6.zip | |
Merge pull request #1965 from bjorng/bjorn/compiler/misc-cleanups
Minor cleanups and bug fixes of the compiler
Diffstat (limited to 'lib/compiler/src/beam_validator.erl')
| -rw-r--r-- | lib/compiler/src/beam_validator.erl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl index ca065295d6..7d908df3bf 100644 --- a/lib/compiler/src/beam_validator.erl +++ b/lib/compiler/src/beam_validator.erl @@ -479,16 +479,20 @@ valfun_1({try_case,Reg}, #vst{current=#st{ct=[Fail|Fails]}}=Vst0) -> error({bad_type,Type}) end; valfun_1({get_list,Src,D1,D2}, Vst0) -> + assert_not_literal(Src), assert_type(cons, Src, Vst0), Vst = set_type_reg(term, Src, D1, Vst0), set_type_reg(term, Src, D2, Vst); valfun_1({get_hd,Src,Dst}, Vst) -> + assert_not_literal(Src), assert_type(cons, Src, Vst), set_type_reg(term, Src, Dst, Vst); valfun_1({get_tl,Src,Dst}, Vst) -> + assert_not_literal(Src), assert_type(cons, Src, Vst), set_type_reg(term, Src, Dst, Vst); valfun_1({get_tuple_element,Src,I,Dst}, Vst) -> + assert_not_literal(Src), assert_type({tuple_element,I+1}, Src, Vst), set_type_reg(term, Src, Dst, Vst); valfun_1({jump,{f,Lbl}}, Vst) -> @@ -917,6 +921,7 @@ valfun_4(_, _) -> error(unknown_instruction). verify_get_map(Fail, Src, List, Vst0) -> + assert_not_literal(Src), %OTP 22. assert_type(map, Src, Vst0), Vst1 = foldl(fun(D, Vsti) -> case is_reg_defined(D,Vsti) of @@ -1466,6 +1471,10 @@ assert_term(Src, Vst) -> get_term_type(Src, Vst), ok. +assert_not_literal({x,_}) -> ok; +assert_not_literal({y,_}) -> ok; +assert_not_literal(Literal) -> error({literal_not_allowed,Literal}). + %% The possible types. %% %% First non-term types: |