parse.y (build_assertion): Re-do 02-25 change following Jeff Sturm suggestion: Use...

	* parse.y (build_assertion):  Re-do 02-25 change following Jeff Sturm
	suggestion:  Use build_incomplete_class_ref.

From-SVN: r78597

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1eb98e35de0c44849bb57322545430ede15b2199..4bc03b53bf2a66596476af33cdc52496d7358c02 100644 (file)
--- 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 446661b93fd37346f6e320f231e609bfbba93c38..14bec8d01f522d6720b0beda55ea999021c2efbc 100644 (file)
--- 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"));