diff options
| author | (no author) <(no author)@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-24 17:49:25 +0000 |
|---|---|---|
| committer | (no author) <(no author)@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-24 17:49:25 +0000 |
| commit | 99b8e7f1cc78f3ddabb89dfb5d6cb7cac3aff14f (patch) | |
| tree | e4720d039c042b7cd89f8a75f256c697ae8b5493 /gcc/java/class.c | |
| parent | 964944fc854c1dd723f7b8150d0deac634aabdbb (diff) | |
This commit was manufactured by cvs2svn to create taghammer-3_3-merge-20030624
'hammer-3_3-merge-20030624'.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/tags/hammer-3_3-merge-20030624@68434 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/class.c')
| -rw-r--r-- | gcc/java/class.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/gcc/java/class.c b/gcc/java/class.c index bec8d0c15e1..d1acdf9d59c 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -1,5 +1,5 @@ /* Functions related to building classes and their related objects. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -1866,8 +1866,19 @@ maybe_layout_super_class (super_class, this_class) super_class = TREE_TYPE (super_class); else { + /* do_resolve_class expects an EXPR_WITH_FILE_LOCATION, so + we give it one. */ + tree this_wrap = NULL_TREE; + + if (this_class) + { + tree this_decl = TYPE_NAME (this_class); + this_wrap = build_expr_wfl (this_class, + DECL_SOURCE_FILE (this_decl), + DECL_SOURCE_LINE (this_decl), 0); + } super_class = do_resolve_class (NULL_TREE, /* FIXME? */ - super_class, NULL_TREE, this_class); + super_class, NULL_TREE, this_wrap); if (!super_class) return NULL_TREE; /* FIXME, NULL_TREE not checked by caller. */ super_class = TREE_TYPE (super_class); |