diff options
| author | Björn Gustavsson <[email protected]> | 2012-08-09 12:27:59 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-08-15 10:54:52 +0200 |
| commit | 6f23f159d965af86722724144f132caf27ab5e76 (patch) | |
| tree | c6444365fdf108df2359a34e2ede820a90651f82 /lib | |
| parent | 39608562fa4efdf4528a7cf3b9823cc84fa7946a (diff) | |
| download | otp-6f23f159d965af86722724144f132caf27ab5e76.tar.gz otp-6f23f159d965af86722724144f132caf27ab5e76.tar.bz2 otp-6f23f159d965af86722724144f132caf27ab5e76.zip | |
beam_type: Print the offending function if this pass crashes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/compiler/src/beam_type.erl | 15 | ||||
| -rw-r--r-- | lib/compiler/test/misc_SUITE.erl | 9 |
2 files changed, 20 insertions, 4 deletions
diff --git a/lib/compiler/src/beam_type.erl b/lib/compiler/src/beam_type.erl index 6f0ffb5b25..d307d192b2 100644 --- a/lib/compiler/src/beam_type.erl +++ b/lib/compiler/src/beam_type.erl @@ -29,10 +29,17 @@ module({Mod,Exp,Attr,Fs0,Lc}, _Opts) -> {ok,{Mod,Exp,Attr,Fs,Lc}}. function({function,Name,Arity,CLabel,Asm0}) -> - Asm1 = beam_utils:live_opt(Asm0), - Asm2 = opt(Asm1, [], tdb_new()), - Asm = beam_utils:delete_live_annos(Asm2), - {function,Name,Arity,CLabel,Asm}. + try + Asm1 = beam_utils:live_opt(Asm0), + Asm2 = opt(Asm1, [], tdb_new()), + Asm = beam_utils:delete_live_annos(Asm2), + {function,Name,Arity,CLabel,Asm} + catch + Class:Error -> + Stack = erlang:get_stacktrace(), + io:fwrite("Function: ~w/~w\n", [Name,Arity]), + erlang:raise(Class, Error, Stack) + end. %% opt([Instruction], Accumulator, TypeDb) -> {[Instruction'],TypeDb'} %% Keep track of type information; try to simplify. diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl index 5e13a93c52..b53d0dba1d 100644 --- a/lib/compiler/test/misc_SUITE.erl +++ b/lib/compiler/test/misc_SUITE.erl @@ -190,6 +190,15 @@ silly_coverage(Config) when is_list(Config) -> {label,2}|non_proper_list]}],99}, ?line expect_error(fun() -> beam_block:module(BlockInput, []) end), + %% beam_type + TypeInput = {?MODULE,[{foo,0}],[], + [{function,foo,0,2, + [{label,1}, + {line,loc}, + {func_info,{atom,?MODULE},{atom,foo},0}, + {label,2}|non_proper_list]}],99}, + expect_error(fun() -> beam_type:module(TypeInput, []) end), + %% beam_except ExceptInput = {?MODULE,[{foo,0}],[], [{function,foo,0,2, |