gcc:
2018-07-24  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	* gimple-fold.c (get_inner_char_array_unless_typecast): Helper
	function for strlen range estimations.
	(get_range_strlen): Use get_inner_char_array_unless_typecast.
	* tree-ssa-strlen.c (maybe_set_strlen_range): Likewise.
	* gimple-fold.h (get_inner_char_array_unless_typecast): Declare.

testsuite:
2018-07-24  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	* gcc.dg/strlenopt-40.c: Adjust test expectations.
	* gcc.dg/strlenopt-45.c: Likewise.
	* gcc.dg/strlenopt-48.c: Likewise.
	* gcc.dg/strlenopt-51.c: Likewise.
	* gcc.dg/strlenopt-54.c: New test.