Skip to content

Commit

Permalink
fold-const: Fix ICE in fold_read_from_constant_string on invalid code…
Browse files Browse the repository at this point in the history
… [PR99204]

fold_read_from_constant_string and expand_expr_real_1 have code to optimize
constant reads from string (tree vs. rtl).
If the STRING_CST array type has zero low bound, index is fold converted to
sizetype and so the compare_tree_int works fine, but if it has some other
low bound, it calls size_diffop_loc and that function from 2 sizetype
operands creates a ssizetype difference.  expand_expr_real_1 then uses
tree_fits_uhwi_p + compare_tree_int and so works fine, but fold-const.c
only checked if index is INTEGER_CST and calls compare_tree_int, which means
for negative index it will succeed and result in UB in the compiler.

2021-02-23  Jakub Jelinek  <[email protected]>

	PR tree-optimization/99204
	* fold-const.c (fold_read_from_constant_string): Check that
	tree_fits_uhwi_p (index) rather than just that index is INTEGER_CST.

	* gfortran.dg/pr99204.f90: New test.
  • Loading branch information
jakubjelinek committed Feb 23, 2021
1 parent efa64fc commit 37b64a3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion gcc/fold-const.c
Original file line number Diff line number Diff line change
Expand Up @@ -15433,7 +15433,7 @@ fold_read_from_constant_string (tree exp)
if (string
&& TYPE_MODE (TREE_TYPE (exp)) == TYPE_MODE (TREE_TYPE (TREE_TYPE (string)))
&& TREE_CODE (string) == STRING_CST
&& TREE_CODE (index) == INTEGER_CST
&& tree_fits_uhwi_p (index)
&& compare_tree_int (index, TREE_STRING_LENGTH (string)) < 0
&& is_int_mode (TYPE_MODE (TREE_TYPE (TREE_TYPE (string))),
&char_mode)
Expand Down
10 changes: 10 additions & 0 deletions gcc/testsuite/gfortran.dg/pr99204.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
! PR tree-optimization/99204
! { dg-do compile }
! { dg-options "-O2 -w" }

program pr99204
character :: c
integer :: i = -12345678
c = 'abc'(i:i)
print *, c
end

0 comments on commit 37b64a3

Please sign in to comment.