[PATCH] java/2956, java/2959, java/2665, java/3602
Alexandre Petit-Bianco
apbianco@cygnus.com
Tue Jul 31 15:15:00 GMT 2001
Some patches that I need to get out of the way. They fix the following
PRs:
http://gcc.gnu.org/ml/java-prs/2001-q2/msg00039.html
http://gcc.gnu.org/ml/java-prs/2001-q2/msg00040.html
http://gcc.gnu.org/ml/java-prs/2001-q2/msg00018.html
http://gcc.gnu.org/ml/java-prs/2001-q3/msg00015.html
It's been tested and didn't seem to trigger regressions. I'm going to
check this in.
./A
2001-07-18 Alexandre Petit-Bianco <apbianco@redhat.com>
* parse.y (create_interface): Avoid cyclic inheritance report when
syntax error encountered during class definition.
Fixes PR java/2956
2001-07-17 Alexandre Petit-Bianco <apbianco@redhat.com>
* parse.h (INTERFACE_INNER_MODIFIERS): Disallow `private.'
* parse.y (check_class_interface_creation): Allow `private' if the
enclosing is not an interface.
(create_interface): Interface tagged public if the enclosing
context is an interface.
(create_class): Class tagged public if the enclosing context
is an interface.
Fixes PR java/2959
2001-07-17 Alexandre Petit-Bianco <apbianco@redhat.com>
* class.c (push_class): Set DECL_SIZE to `integer_zero_node.'
Fixes PR java/2665
2001-07-13 Alexandre Petit-Bianco <apbianco@redhat.com>
* parse.y (java_complete_lsh): Set CAN_COMPLETE_NORMALLY and unset
TREE_CONSTANT_OVERFLOW of CASE_EXPR value.
Fixes PR java/3602
Index: class.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/class.c,v
retrieving revision 1.100
diff -u -p -r1.100 class.c
--- class.c 2001/06/27 20:38:20 1.100
+++ class.c 2001/07/31 22:02:51
@@ -331,6 +331,10 @@ push_class (class_type, class_name)
input_filename = IDENTIFIER_POINTER (source_name);
lineno = 0;
decl = build_decl (TYPE_DECL, class_name, class_type);
+
+ /* dbxout needs a DECL_SIZE if in gstabs mode */
+ DECL_SIZE (decl) = integer_zero_node;
+
input_filename = save_input_filename;
lineno = save_lineno;
signature = identifier_subst (class_name, "L", '.', '/', ";");
Index: parse.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/parse.h,v
retrieving revision 1.74
diff -u -p -r1.74 parse.h
--- parse.h 2001/07/11 07:33:43 1.74
+++ parse.h 2001/07/31 22:02:54
@@ -79,7 +79,7 @@ extern tree stabilize_reference PARAMS (
#define METHOD_MODIFIERS ACC_PUBLIC|ACC_PROTECTED|ACC_PRIVATE|ACC_ABSTRACT| \
ACC_STATIC|ACC_FINAL|ACC_SYNCHRONIZED|ACC_NATIVE
#define INTERFACE_MODIFIERS ACC_PUBLIC|ACC_ABSTRACT
-#define INTERFACE_INNER_MODIFIERS ACC_PUBLIC|ACC_PROTECTED|ACC_PRIVATE|ACC_ABSTRACT|ACC_STATIC
+#define INTERFACE_INNER_MODIFIERS ACC_PUBLIC|ACC_PROTECTED|ACC_ABSTRACT|ACC_STATIC
#define INTERFACE_METHOD_MODIFIERS ACC_PUBLIC|ACC_ABSTRACT
#define INTERFACE_FIELD_MODIFIERS ACC_PUBLIC|ACC_STATIC|ACC_FINAL
Index: parse.y
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/parse.y,v
retrieving revision 1.296
diff -u -p -r1.296 parse.y
--- parse.y 2001/07/13 19:43:54 1.296
+++ parse.y 2001/07/31 22:03:30
@@ -3450,7 +3450,9 @@ check_class_interface_creation (is_inter
else
{
check_modifiers_consistency (flags);
- icaf = ACC_PRIVATE|ACC_PROTECTED;
+ icaf = ACC_PROTECTED;
+ if (! CLASS_INTERFACE (GET_CPC ()))
+ icaf |= ACC_PRIVATE;
}
}
@@ -3738,6 +3740,11 @@ create_interface (flags, id, super)
tree q_name = parser_qualified_classname (raw_name);
tree decl = IDENTIFIER_CLASS_VALUE (q_name);
+ /* Certain syntax errors are making SUPER be like ID. Avoid this
+ case. */
+ if (ctxp->class_err && id == super)
+ super = NULL;
+
EXPR_WFL_NODE (id) = q_name; /* Keep source location, even if refined. */
/* Basic checks: scope, redefinition, modifiers */
@@ -3750,7 +3757,12 @@ create_interface (flags, id, super)
/* Suspend the current parsing context if we're parsing an inner
interface */
if (CPC_INNER_P ())
- java_parser_context_suspend ();
+ {
+ java_parser_context_suspend ();
+ /* Interface members are public. */
+ if (CLASS_INTERFACE (GET_CPC ()))
+ flags |= ACC_PUBLIC;
+ }
/* Push a new context for (static) initialized upon declaration fields */
java_parser_context_push_initialized_field ();
@@ -3870,6 +3882,11 @@ create_class (flags, id, super, interfac
tree class_id, decl;
tree super_decl_type;
+ /* Certain syntax errors are making SUPER be like ID. Avoid this
+ case. */
+ if (ctxp->class_err && id == super)
+ super = NULL;
+
class_id = parser_qualified_classname (raw_name);
decl = IDENTIFIER_CLASS_VALUE (class_id);
EXPR_WFL_NODE (id) = class_id;
@@ -3884,7 +3901,13 @@ create_class (flags, id, super, interfac
/* Suspend the current parsing context if we're parsing an inner
class or an anonymous class. */
if (CPC_INNER_P ())
- java_parser_context_suspend ();
+ {
+ java_parser_context_suspend ();
+ /* Interface members are public. */
+ if (CLASS_INTERFACE (GET_CPC ()))
+ flags |= ACC_PUBLIC;
+ }
+
/* Push a new context for (static) initialized upon declaration fields */
java_parser_context_push_initialized_field ();
@@ -7336,7 +7359,9 @@ java_reorder_fields ()
}
}
}
- stop_reordering = TREE_TYPE (TREE_VALUE (gclass_list));
+ /* There are cases were gclass_list will be empty. */
+ if (gclass_list)
+ stop_reordering = TREE_TYPE (TREE_VALUE (gclass_list));
}
/* Layout the methods of all classes loaded in one way or another.
@@ -11367,6 +11392,8 @@ java_complete_lhs (node)
}
cn = fold (convert (int_type_node, cn));
+ TREE_CONSTANT_OVERFLOW (cn) = 0;
+ CAN_COMPLETE_NORMALLY (cn) = 1;
/* Multiple instance of a case label bearing the same
value is checked during code generation. The case
More information about the Gcc-patches
mailing list