Skip to content

Commit

Permalink
New obstack_next_free is not an lvalue
Browse files Browse the repository at this point in the history
New obstack.h casts obstack_next_free to (void *), resulting in it
being a non-lvalue, and warnings on pointer arithmetic.

gcc/
	* gensupport.c (add_mnemonic_string): Make len param a size_t.
	(gen_mnemonic_setattr): Make "size" var a size_t.  Use
	obstack_blank_fast to shrink obstack.  Cast obstack_next_free
	return value.
gcc/objc/
	* objc-encoding.c (encode_aggregate_within): Cast obstack_next_free
	return value.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229984 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
amodra committed Nov 9, 2015
1 parent d3a06cc commit 5962bd2
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 9 deletions.
7 changes: 7 additions & 0 deletions gcc/ChangeLog
@@ -1,3 +1,10 @@
2015-11-09 Alan Modra <amodra@gmail.com>

* gensupport.c (add_mnemonic_string): Make len param a size_t.
(gen_mnemonic_setattr): Make "size" var a size_t. Use
obstack_blank_fast to shrink obstack. Cast obstack_next_free
return value.

2015-11-09 Segher Boessenkool <segher@kernel.crashing.org>

PR rtl-optimization/68182
Expand Down
9 changes: 4 additions & 5 deletions gcc/gensupport.c
Expand Up @@ -2253,7 +2253,7 @@ htab_eq_string (const void *s1, const void *s2)
and a permanent heap copy of STR is created. */

static void
add_mnemonic_string (htab_t mnemonic_htab, const char *str, int len)
add_mnemonic_string (htab_t mnemonic_htab, const char *str, size_t len)
{
char *new_str;
void **slot;
Expand Down Expand Up @@ -2306,7 +2306,7 @@ gen_mnemonic_setattr (htab_t mnemonic_htab, rtx insn)
for (i = 0; *cp; )
{
const char *ep, *sp;
int size = 0;
size_t size = 0;

while (ISSPACE (*cp))
cp++;
Expand All @@ -2333,8 +2333,7 @@ gen_mnemonic_setattr (htab_t mnemonic_htab, rtx insn)
{
/* Don't set a value if there are more than one
instruction in the string. */
obstack_next_free (&string_obstack) =
obstack_next_free (&string_obstack) - size;
obstack_blank_fast (&string_obstack, -size);
size = 0;

cp = sp;
Expand All @@ -2346,7 +2345,7 @@ gen_mnemonic_setattr (htab_t mnemonic_htab, rtx insn)
obstack_1grow (&string_obstack, '*');
else
add_mnemonic_string (mnemonic_htab,
obstack_next_free (&string_obstack) - size,
(char *) obstack_next_free (&string_obstack) - size,
size);
i++;
}
Expand Down
5 changes: 5 additions & 0 deletions gcc/objc/ChangeLog
@@ -1,3 +1,8 @@
2015-11-09 Alan Modra <amodra@gmail.com>

* objc-encoding.c (encode_aggregate_within): Cast obstack_next_free
return value.

2015-10-29 Andrew MacLeod <amacleod@redhat.com>

* objc-lang.c: Reorder #include's and remove duplicates.
Expand Down
10 changes: 6 additions & 4 deletions gcc/objc/objc-encoding.c
Expand Up @@ -495,13 +495,14 @@ encode_aggregate_within (tree type, int curtype, int format, int left,

if (flag_next_runtime)
{
if (ob_size > 0 && *(obstack_next_free (&util_obstack) - 1) == '^')
if (ob_size > 0
&& *((char *) obstack_next_free (&util_obstack) - 1) == '^')
pointed_to = true;

if ((format == OBJC_ENCODE_INLINE_DEFS || generating_instance_variables)
&& (!pointed_to || ob_size - curtype == 1
|| (ob_size - curtype == 2
&& *(obstack_next_free (&util_obstack) - 2) == 'r')))
&& *((char *) obstack_next_free (&util_obstack) - 2) == 'r')))
inline_contents = true;
}
else
Expand All @@ -512,9 +513,10 @@ encode_aggregate_within (tree type, int curtype, int format, int left,
comment above applies: in that case we should avoid encoding
the names of instance variables.
*/
char c1 = ob_size > 1 ? *(obstack_next_free (&util_obstack) - 2) : 0;
char c0 = ob_size > 0 ? *(obstack_next_free (&util_obstack) - 1) : 0;
char c0, c1;

c1 = ob_size > 1 ? *((char *) obstack_next_free (&util_obstack) - 2) : 0;
c0 = ob_size > 0 ? *((char *) obstack_next_free (&util_obstack) - 1) : 0;
if (c0 == '^' || (c1 == '^' && c0 == 'r'))
pointed_to = true;

Expand Down

0 comments on commit 5962bd2

Please sign in to comment.