git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support only \0-terminated string in c_getstr and return 

* fold-const.c (c_getstr): Support of properly \0-terminated
	string constants.  New argument is added.
	* fold-const.h: New argument is added.

From-SVN: r241152
This commit is contained in:
Martin Liska 2016-10-14 11:54:32 +02:00 committed by Martin Liska
parent 57c4fbc64b
commit a766d4d74d
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2016-10-14 Martin Liska <mliska@suse.cz>
* fold-const.c (c_getstr): Support of properly \0-terminated
string constants. New argument is added.
* fold-const.h: New argument is added.
2016-10-14 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* config/aarch64/aarch64.c (aarch64_print_hint_for_core_or_arch):

38
gcc/fold-const.c
View File

@ -14441,24 +14441,44 @@ fold_build_pointer_plus_hwi_loc (location_t loc, tree ptr, HOST_WIDE_INT off)
}
/* Return a char pointer for a C string if it is a string constant
or sum of string constant and integer constant. */
or sum of string constant and integer constant. We only support
string constants properly terminated with '\0' character.
If STRLEN is a valid pointer, length (including terminating character)
of returned string is stored to the argument. */
const char *
c_getstr (tree src)
c_getstr (tree src, unsigned HOST_WIDE_INT *strlen)
{
tree offset_node;
if (strlen)
*strlen = 0;
src = string_constant (src, &offset_node);
if (src == 0)
return 0;
return NULL;
if (offset_node == 0)
return TREE_STRING_POINTER (src);
else if (!tree_fits_uhwi_p (offset_node)
|| compare_tree_int (offset_node, TREE_STRING_LENGTH (src) - 1) > 0)
return 0;
unsigned HOST_WIDE_INT offset = 0;
if (offset_node != NULL_TREE)
{
if (!tree_fits_uhwi_p (offset_node))
return NULL;
else
offset = tree_to_uhwi (offset_node);
}
return TREE_STRING_POINTER (src) + tree_to_uhwi (offset_node);
unsigned HOST_WIDE_INT string_length = TREE_STRING_LENGTH (src);
const char *string = TREE_STRING_POINTER (src);
/* Support only properly null-terminated strings. */
if (string_length == 0
|| string[string_length - 1] != '\0'
|| offset >= string_length)
return NULL;
if (strlen)
*strlen = string_length - offset;
return string + offset;
}
#if CHECKING_P

2
gcc/fold-const.h
View File

@ -182,7 +182,7 @@ extern bool expr_not_equal_to (tree t, const wide_int &);
extern tree const_unop (enum tree_code, tree, tree);
extern tree const_binop (enum tree_code, tree, tree, tree);
extern bool negate_mathfn_p (combined_fn);
extern const char *c_getstr (tree);
extern const char *c_getstr (tree, unsigned HOST_WIDE_INT *strlen = NULL);
/* Return OFF converted to a pointer offset type suitable as offset for
POINTER_PLUS_EXPR. Use location LOC for this conversion. */