diff options
| author | Hans Bolinder <hasse@erlang.org> | 2021-02-01 07:17:32 +0100 |
|---|---|---|
| committer | Hans Bolinder <hasse@erlang.org> | 2021-02-01 07:17:32 +0100 |
| commit | ee6a69bcef0dfdafe07906b939052d24e25be9c3 (patch) | |
| tree | a778d0648b2b9fbbb3bc1eba374ce0d25a29a1e3 /lib/compiler/src/beam_kernel_to_ssa.erl | |
| parent | 2ac9e0744e867f791662a5f279e91f6a7bf67199 (diff) | |
| parent | 370a2f1c940d305818eb6e415e874741382c22d9 (diff) | |
| download | erlang-ee6a69bcef0dfdafe07906b939052d24e25be9c3.tar.gz | |
Merge branch 'richcarl/columns/PR-2664/OTP-16824'
* richcarl/columns/PR-2664/OTP-16824: (56 commits)
Update primary bootstrap
erl_lint: Give a better column position for format warnings
erl_lint: Correct column number for unsized binary not at end
Include column numbers in compiler warnings
dialyzer: Improve column numbers in warnings
stdlib: Improve locations of annotations of abstract code
stdlib: Improve error locations in module erl_lint
stdlib: Improve error locations in module epp
stdlib: Improve error locations in module erl_parse
stdlib: Fix handling of annotations in erl_expand_records
erl_docgen: Correct handling of annotation of abstract code
syntax_tools: Generalize start line to be location
syntax_tools: Correct handling of annotations of abstract code
edoc: Correct handling of annotations of abstract code
tools: Substitute Anno for Line in xref_reader
tools: Substitute Anno for Line in cover
stdlib: Substitute Anno for Line in epp
stdlib: Substitute Anno for Line in erl_eval
stdlib: Substitute Anno for Line in erl_pp
stdlib: Substitute Anno for Line in eval_bits
...
Diffstat (limited to 'lib/compiler/src/beam_kernel_to_ssa.erl')
| -rw-r--r-- | lib/compiler/src/beam_kernel_to_ssa.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/compiler/src/beam_kernel_to_ssa.erl b/lib/compiler/src/beam_kernel_to_ssa.erl index 7ba2d925e4..0c79f00d1f 100644 --- a/lib/compiler/src/beam_kernel_to_ssa.erl +++ b/lib/compiler/src/beam_kernel_to_ssa.erl @@ -1276,6 +1276,9 @@ new_label(#cg{lcount=Next}=St) -> line_anno([Line,{file,Name}]) when is_integer(Line) -> line_anno_1(Name, Line); +line_anno([{Line,Column},{file,Name}]) when is_integer(Line), + is_integer(Column) -> + line_anno_1(Name, Line); line_anno([_|_]=A) -> {Name,Line} = find_loc(A, no_file, 0), line_anno_1(Name, Line); @@ -1292,6 +1295,9 @@ line_anno_1(Name, Line) -> find_loc([Line|T], File, _) when is_integer(Line) -> find_loc(T, File, Line); +find_loc([{Line, Column}|T], File, _) when is_integer(Line), + is_integer(Column) -> + find_loc(T, File, Line); find_loc([{file,File}|T], _, Line) -> find_loc(T, File, Line); find_loc([_|T], File, Line) -> |