diff options
| author | Per Bothner <per@bothner.com> | 2004-02-27 16:34:26 -0800 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2004-02-27 16:34:26 -0800 |
| commit | 202167e7f1fcbcc4b88011e19564d06e2e250e5d (patch) | |
| tree | e8e1f2e5ac4212f887d957c75ea72cfbaf462dd5 /gcc/java | |
| parent | 0717c5b0655fada57f4e0726265ad6354fa0bb22 (diff) | |
| download | gcc-202167e7f1fcbcc4b88011e19564d06e2e250e5d.zip gcc-202167e7f1fcbcc4b88011e19564d06e2e250e5d.tar.gz gcc-202167e7f1fcbcc4b88011e19564d06e2e250e5d.tar.bz2 | |
parse.y (build_assertion): Re-do 02-25 change following Jeff Sturm suggestion: Use build_incomplete_class_ref.
* parse.y (build_assertion): Re-do 02-25 change following Jeff Sturm
suggestion: Use build_incomplete_class_ref.
From-SVN: r78597
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/parse.y | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 1eb98e3..4bc03b5 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2004-02-27 Per Bothner <per@bothner.com> + + * parse.y (build_assertion): Re-do 02-25 change following Jeff Sturm + suggestion: Use build_incomplete_class_ref. + 2004-02-27 Kazu Hirata <kazu@cs.umass.edu> * java/parse.h: Update copyright. diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 446661b..14bec8d 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -15302,10 +15302,6 @@ build_assertion (int location, tree condition, tree value) { tree field, classdollar, id, call; tree class_type = TREE_TYPE (klass); - tree outer_class = klass; - while (INNER_CLASS_DECL_P (outer_class)) - outer_class = DECL_CONTEXT (outer_class); - outer_class = TREE_TYPE (outer_class); field = add_field (class_type, get_identifier ("$assertionsDisabled"), @@ -15314,10 +15310,7 @@ build_assertion (int location, tree condition, tree value) MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (field); FIELD_SYNTHETIC (field) = 1; - if (!TYPE_DOT_CLASS (outer_class)) - build_dot_class_method (outer_class); - classdollar - = build_dot_class_method_invocation (outer_class, class_type); + classdollar = build_incomplete_class_ref (location, class_type); /* Call CLASS.desiredAssertionStatus(). */ id = build_wfl_node (get_identifier ("desiredAssertionStatus")); |