dwarf2out.c (gen_typedef_die): Abort if we get identical TREE_TYPE and DECL_ORIGINAL_TYPE on a typedef.

* dwarf2out.c (gen_typedef_die): Abort if we get identical
        TREE_TYPE and DECL_ORIGINAL_TYPE on a typedef.

        * typeck.c (common_type): If we're just returning one of our
        arguments, don't strip typedef types.

From-SVN: r35297
This commit is contained in:
Jason Merrill 2000-07-27 14:22:39 -04:00 committed by Jason Merrill
parent 589ca5cb10
commit 62e3bf5476
4 changed files with 25 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2000-07-27 Jason Merrill <jason@redhat.com>
* dwarf2out.c (gen_typedef_die): Abort if we get identical
TREE_TYPE and DECL_ORIGINAL_TYPE on a typedef.
2000-07-27 RodneyBrown <RodneyBrown@pmsc.com>
* expr.h (get_alias_set, lang_get_alias_set): Delete prototypes.

View File

@ -1,3 +1,8 @@
2000-07-27 Jason Merrill <jason@redhat.com>
* typeck.c (common_type): If we're just returning one of our
arguments, don't strip typedef types.
2000-07-26 Mark Mitchell <mark@codesourcery.com>
* decl.c (start_cleanup_fn): Mark the function as `inline'.

View File

@ -521,26 +521,27 @@ composite_pointer_type (t1, t2, arg1, arg2, location)
converted to integer types. */
tree
common_type (t1, t2)
tree t1, t2;
common_type (orig_t1, orig_t2)
tree orig_t1, orig_t2;
{
register enum tree_code code1;
register enum tree_code code2;
tree attributes;
tree t1, t2;
/* Save time if the two types are the same. */
if (orig_t1 == orig_t2)
return orig_t1;
t1 = original_type (orig_t1);
t2 = original_type (orig_t2);
if (t1 == t2)
return t1;
t1 = original_type (t1);
t2 = original_type (t2);
if (t1 == t2)
return t1;
return orig_t1;
/* If one type is nonsense, use the other. */
if (t1 == error_mark_node)
return t2;
return orig_t2;
if (t2 == error_mark_node)
return t1;
return orig_t1;
if ((ARITHMETIC_TYPE_P (t1) || TREE_CODE (t1) == ENUMERAL_TYPE)
&& (ARITHMETIC_TYPE_P (t2) || TREE_CODE (t2) == ENUMERAL_TYPE))

View File

@ -9276,7 +9276,11 @@ gen_typedef_die (decl, context_die)
if (DECL_ORIGINAL_TYPE (decl))
{
type = DECL_ORIGINAL_TYPE (decl);
equate_type_number_to_die (TREE_TYPE (decl), type_die);
if (type == TREE_TYPE (decl))
abort ();
else
equate_type_number_to_die (TREE_TYPE (decl), type_die);
}
else
type = TREE_TYPE (decl);