Skip to content

R
riscv-gcc-1
Commit 29ce73cb by Paolo Bonzini Committed by Paolo Bonzini
Options

re PR c/20385 (Lame parse error message for undefined type) 

gcc:
2010-12-17  Paolo Bonzini  <bonzini@gnu.org>

	PR c/20385
	* function.c (used_types_insert): Handle ERROR_MARK.
	* c-decl.c (grokdeclarator): Handle ERROR_MARK.
	(declspecs_add_type): Leave error_mark_node in specs->type.
	(finish_declspecs): Change it to integer_type_node here.
	* c-parser.c (c_parser_peek_2nd_token): Move earlier.
	(enum c_lookahead_kind): New.
	(c_parser_next_token_starts_typename): New name of
	c_parser_next_tokens_start_typename.  Accept lookahead enum
	and handle it here instead of...
	(c_parser_next_tokens_start_declaration): ... here.  Call it.
	(c_parser_declspecs): Accept another argument.  Do not exit
	on C_ID_ID if it is guessed to be an unknown typename.
	(c_parser_parms_declarator): Use 2nd token to distinguish a K&R
	declaration from an ANSI declaration starting with an unknown
	typename.
	(c_parser_struct_declaration, c_parser_objc_type_name,
	c_parser_typeof_specifier, c_parser_declarator,
	c_parser_direct_declarator_inner): Adjust calls.
	(c_parser_parameter_declaration): Likewise.
	(c_parser_type_name): Pass back an error_mark_node to the caller.
	(c_parser_postfix_expression): Do error recovery when 
	c_parser_type_name returns NULL.

testsuite:
2010-12-17  Paolo Bonzini  <bonzini@gnu.org>

	PR c/20385
	* objc.dg/tls/init-2.m: Adjust.
	* gcc.dg/noncompile/920923-1.c: Adjust.
	* gcc.dg/noncompile/pr44517.c: Adjust.
	* gcc.dg/declspec-18.c: New test.

From-SVN: r167999
parent 7f260570
Showing with 149 additions and 12 deletions
gcc/ChangeLog
2010-12-17 Paolo Bonzini <bonzini@gnu.org>
PR c/20385
* function.c (used_types_insert): Handle ERROR_MARK.
* c-decl.c (grokdeclarator): Handle ERROR_MARK.
(declspecs_add_type): Leave error_mark_node in specs->type.
(finish_declspecs): Change it to integer_type_node here.
* c-parser.c (c_parser_peek_2nd_token): Move earlier.
(enum c_lookahead_kind): New.
(c_parser_next_token_starts_typename): New name of
c_parser_next_tokens_start_typename. Accept lookahead enum
and handle it here instead of...
(c_parser_next_tokens_start_declaration): ... here. Call it.
(c_parser_declspecs): Accept another argument. Do not exit
on C_ID_ID if it is guessed to be an unknown typename.
(c_parser_parms_declarator): Use 2nd token to distinguish a K&R
declaration from an ANSI declaration starting with an unknown
typename.
(c_parser_struct_declaration, c_parser_objc_type_name,
c_parser_typeof_specifier, c_parser_declarator,
c_parser_direct_declarator_inner): Adjust calls.
(c_parser_parameter_declaration): Likewise.
(c_parser_type_name): Pass back an error_mark_node to the caller.
(c_parser_postfix_expression): Do error recovery when
c_parser_type_name returns NULL.
2010-12-17 Joseph Myers <joseph@codesourcery.com>
* config/i386/netware.h (ASM_SPEC, SIZE_TYPE, PTRDIFF_TYPE):
gcc/c-decl.c
......@@ -4865,6 +4865,8 @@ grokdeclarator (const struct c_declarator *declarator,
tree expr_dummy;
bool expr_const_operands_dummy;
if (TREE_CODE (type) == ERROR_MARK)
return error_mark_node;
if (expr == NULL)
expr = &expr_dummy;
if (expr_const_operands == NULL)
......@@ -9315,9 +9317,9 @@ declspecs_add_type (location_t loc, struct c_declspecs *specs,
else
specs->type = TREE_TYPE (t);
}
else if (TREE_CODE (type) != ERROR_MARK)
else
{
if (spec.kind == ctsk_typeof)
if (TREE_CODE (type) != ERROR_MARK && spec.kind == ctsk_typeof)
{
specs->typedef_p = true;
if (spec.expr)
......@@ -9332,11 +9334,6 @@ declspecs_add_type (location_t loc, struct c_declspecs *specs,
}
specs->type = type;
}
else
{
/* Set a dummy type here to avoid warning about implicit 'int'. */
specs->type = integer_type_node;
}
return specs;
}
......@@ -9452,6 +9449,10 @@ finish_declspecs (struct c_declspecs *specs)
gcc_assert (!specs->long_p && !specs->long_long_p && !specs->short_p
&& !specs->signed_p && !specs->unsigned_p
&& !specs->complex_p);
/* Set a dummy type. */
if (TREE_CODE (specs->type) == ERROR_MARK)
specs->type = integer_type_node;
return specs;
}
......
gcc/function.c
......@@ -5712,6 +5712,8 @@ used_types_insert (tree t)
break;
else
t = TREE_TYPE (t);
if (TREE_CODE (t) == ERROR_MARK)
return;
if (TYPE_NAME (t) == NULL_TREE
|| TYPE_NAME (t) == TYPE_NAME (TYPE_MAIN_VARIANT (t)))
t = TYPE_MAIN_VARIANT (t);
......
gcc/testsuite/ChangeLog
2010-12-17 Paolo Bonzini <bonzini@gnu.org>
PR c/20385
* objc.dg/tls/init-2.m: Adjust.
* gcc.dg/noncompile/920923-1.c: Adjust.
* gcc.dg/noncompile/pr44517.c: Adjust.
* gcc.dg/declspec-18.c: New test.
2010-12-17 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
* gcc.dg/titype-1.c: Enable TImode on __SPU__.
......
gcc/testsuite/gcc.dg/declspec-18.c 0 → 100644
/* { dg-do compile } */
/* { dg-options "-std=gnu89" } */
static t1 *a; /* { dg-error "unknown type name 't1'" } */
int z; /* { dg-message "previous declaration of 'z'" } */
typedef t2 *z; /* { dg-error "unknown type name 't2'" } */
/* { dg-error "'z' redeclared " "" { target *-*-* } 7 } */
extern t3 p1(void); /* { dg-error "unknown type name 't3'" } */
int p2(const t4 x); /* { dg-error "unknown type name 't4'" } */
int p3(const t1 x); /* { dg-error "unknown type name 't1'" } */ /* dup??? */
int p4(t5 (*x)(void)); /* { dg-error "unknown type name 't5'" } */
int p5(t6 *); /* { dg-error "unknown type name 't6'" } */
int p6(t7 x); /* { dg-error "unknown type name 't7'" } */
int p7(t8[]); /* { dg-error "unknown type name 't8'" } */
int p8(int, t9); /* { dg-error "unknown type name 't9'" } */
struct s {
const t1 a; /* { dg-error "unknown type name 't1'" } */ /* dup??? */
const t10 b; /* { dg-error "unknown type name 't10'" } */
int b; /* { dg-error "duplicate member" } */
};
typeof (z) c1;
typeof (x1) c2; /* { dg-error "undeclared" } */
typeof (const t11) c3; /* { dg-error "unknown type name 't11'" } */
typeof (t12 *) c3; /* { dg-error "unknown type name 't12'" "" { xfail *-*-* } } */
/* { dg-bogus "unknown type name 'x1'" "" { target *-*-* } 26 } */
/* { dg-bogus "undeclared" "" { xfail *-*-* } 28 } */
/* { dg-bogus "expected expression before" "" { xfail *-*-* } 28 } */
int recover1;
int s0 = sizeof (z);
int s1 = sizeof (x2); /* { dg-error "undeclared" } */
int s2 = sizeof (const t13); /* { dg-error "unknown type name 't13'" } */
int s3 = sizeof (t14 *); /* { dg-error "unknown type name 't14'" "" { xfail *-*-* } } */
int recover2;
/* { dg-bogus "unknown type name 'x2'" "" { target *-*-* } 36 } */
/* { dg-bogus "undeclared" "" { xfail *-*-* } 38 } */
/* { dg-bogus "expected expression before" "" { xfail *-*-* } 38 } */
int a0 = __alignof__ (z);
int a1 = __alignof__ (x3); /* { dg-error "undeclared" } */
int a2 = __alignof__ (const t15); /* { dg-error "unknown type name 't15'" } */
int a3 = __alignof__ (t16 *); /* { dg-error "unknown type name 't16'" "" { xfail *-*-* } } */
int recover3;
/* { dg-bogus "unknown type name 'x3'" "" { target *-*-* } 47 } */
/* { dg-bogus "undeclared" "" { xfail *-*-* } 49 } */
/* { dg-bogus "expected expression before" "" { xfail *-*-* } 49 } */
/* Cannot detect (undefd_type *) or (undefd_type (*) because it would
require 3 tokens of lookahead (same as above). */
const char *f1()
{
return (const t17) "abc"; /* { dg-error "unknown type name 't17'" } */
/* { dg-bogus "expected" "" { target *-*-* } 63 } */
}
const char *f2()
{
return (const t18 *) "abc"; /* { dg-error "unknown type name 't18'" } */
/* { dg-bogus "expected" "" { target *-*-* } 69 } */
}
/* The parser has problems distinguishing semantic and syntactic errors,
so it emits a wrong "expected ')'" error here. */
void *f3(int x)
{
return (void *) ((void *(*)(t19)) f3); /* { dg-error "unknown type name 't19'" } */
/* { dg-bogus "expected" "" { xfail *-*-* } 79 } */
}
const void *f4()
{
return &((const t20){1}); /* { dg-error "unknown type name 't20'" } */
/* { dg-bogus "return discards 'const'" "" { target *-*-* } 85 } */
/* { dg-bogus "expected" "" { target *-*-* } 85 } */
}
int f5(__builtin_va_list ap)
{
int x = __builtin_va_arg (ap, t21); /* { dg-error "unknown type name 't21'" } */
int y = __builtin_va_arg (ap, const t22); /* { dg-error "unknown type name 't22'" } */
}
int f6(void)
{
return __builtin_offsetof (t23, field); /* { dg-error "unknown type name 't23'" } */
/* { dg-bogus "request for member" "" { target *-*-* } 98 } */
}
gcc/testsuite/gcc.dg/noncompile/920923-1.c
......@@ -2,13 +2,13 @@
typedef BYTE unsigned char; /* { dg-error "expected" } */
typedef int item_n;
typedef int perm_set;
struct PENT { caddr_t v_addr; };/* { dg-error "expected" } */
struct PENT { caddr_t v_addr; };/* { dg-error "unknown type name" } */
typedef struct PENT prec;
typedef struct PENT *prec_t;
prec_t mem_hash;
BYTE *mem_base; /* { dg-error "unknown type name" } */
struct PTE {
BYTE *p_page; /* { dg-error "expected" } */
BYTE *p_page; /* { dg-error "unknown type name" } */
perm_set p_perms;
};
typedef struct PTE pte;
......@@ -56,7 +56,7 @@ int va_op;
caddr_t v_addr; /* { dg-error "unknown type name" } */
{
register prec_t bucket;
register caddr_t p_addr; /* { dg-error "expected|undeclared" } */
register caddr_t p_addr; /* { dg-error "unknown type name" } */
bucket = mem_hash+((((v_addr)>>ITEMBITS))&hash_mask); /* { dg-error "undeclared" } */
do {
if (bucket->v_addr == ((v_addr)>>ITEMBITS) { /* { dg-error "expected|undeclared|no member" } */
......
gcc/testsuite/gcc.dg/noncompile/pr44517.c
......@@ -12,7 +12,7 @@ int f2(int x, lon y, long z, ...){ /* { dg-error "unknown type name 'lon'" } */
void f3(int n, int a[n], pid_t x); /* { dg-error "unknown type name 'pid_t'" } */
void f4() {}
void f5(int a, *b); /* { dg-error "expected declaration specifiers or" } */
void f6(int a, b); /* { dg-error "expected declaration specifiers or" } */
void f6(int a, b); /* { dg-error "unknown type name 'b'" } */
void f7(int a, goto b); /* { dg-error "expected declaration specifiers or" } */
void f8(int a, in goto); /* { dg-error "unknown type name 'in'" } */
void f9(int a, in 1); /* { dg-error "unknown type name 'in'" } */
gcc/testsuite/objc.dg/tls/init-2.m
......@@ -11,4 +11,4 @@ struct S
{
S(); /* { dg-error "expected specifier-qualifier-list before 'S'" } */
};
__thread S s; /* { dg-error "expected" } two errors here */
__thread S s; /* { dg-error "unknown type name" } */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment