FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

class.c (make_class): Don't set CLASS_P here (because this function is also called by...

Browse source 
d
	* class.c (make_class):  Don't set CLASS_P here (because
	this function is also called by build_java_array_type).
	(push_class):  Set CLASS_P here instead.
	* parse.h (TYPE_CLASS_P):  Check for TYPE_ARRAY_P is redundant.
	* jcf-dump.c (print_access_flags):  Take extra parameter to indicate
	context.  If the context is class, perfer "super" over "synchronized".
	* jcf-write.c (generate_classfile):  Don't add ACC_SUPER if interface.
	* parse.y (create_class):  Don't call parser_check_super here;
	it is not robust.  Always wait until later.
	* parse.y (method_header):  For interfaces, set ACC_ABSTRACT (to
	match what JDK 1.2 does), but don't set ACC_PUBLIC.

From-SVN: r25784
This commit is contained in:
Per Bothner 1999-03-15 05:09:44 -08:00
parent 2728f62201
commit 2c3199bc4a
4 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gcc/java/jcf-dump.c
View file

@ -77,7 +77,7 @@ int class_access_flags = 0;
/* Print in format similar to javap. VERY IMCOMPLETE. */
int flag_javap_compatible = 0;
static int print_access_flags PROTO ((FILE *, uint16));
static int print_access_flags PROTO ((FILE *, uint16, char));
static void print_constant_terse PROTO ((FILE*, JCF*, int, int));
static void print_constant PROTO ((FILE *, JCF *, int, int));
static void print_constant_ref PROTO ((FILE *, JCF *, int));
@ -127,7 +127,7 @@ DEFUN(utf8_equal_string, (jcf, index, value),
class_access_flags = ACCESS_FLAGS; \
if (flag_print_class_info) \
{ fprintf (out, "\nAccess flags: 0x%x", ACCESS_FLAGS); \
print_access_flags (out, ACCESS_FLAGS); \
print_access_flags (out, ACCESS_FLAGS, 'c'); \
fputc ('\n', out); \
fprintf (out, "This class: "); \
if (flag_print_constant_pool) \
@ -163,7 +163,7 @@ DEFUN(utf8_equal_string, (jcf, index, value),
if (flag_print_fields) \
{ fprintf (out, "Field name:"); \
print_constant_terse (out, jcf, NAME, CONSTANT_Utf8); \
print_access_flags (out, ACCESS_FLAGS); \
print_access_flags (out, ACCESS_FLAGS, 'f'); \
fprintf (out, " Signature: "); \
if (flag_print_constant_pool) \
fprintf (out, "%d=", SIGNATURE); \
@ -194,7 +194,7 @@ DEFUN(utf8_equal_string, (jcf, index, value),
if (flag_javap_compatible) \
{ \
fprintf (out, " "); \
print_access_flags (out, ACCESS_FLAGS); \
print_access_flags (out, ACCESS_FLAGS, 'm'); \
fputc (' ', out); \
print_signature (out, jcf, SIGNATURE, PRINT_SIGNATURE_RESULT_ONLY); \
fputc (' ', out); \
@ -206,7 +206,7 @@ DEFUN(utf8_equal_string, (jcf, index, value),
{ \
fprintf (out, "\nMethod name:"); \
print_constant_terse (out, jcf, NAME, CONSTANT_Utf8); \
print_access_flags (out, ACCESS_FLAGS); \
print_access_flags (out, ACCESS_FLAGS, 'm'); \
fprintf (out, " Signature: "); \
if (flag_print_constant_pool) \
fprintf (out, "%d=", SIGNATURE); \
@ -305,16 +305,24 @@ DEFUN(print_constant_ref, (stream, jcf, index),
fprintf (stream, ">");
}
/* Print the access flags given by FLAGS.
The CONTEXT is one of 'c' (class flags), 'f' (field flags),
or 'm' (method flags). */
static int
DEFUN (print_access_flags, (stream, flags),
FILE *stream AND uint16 flags)
DEFUN (print_access_flags, (stream, flags, context),
FILE *stream AND uint16 flags AND char context)
{
if (flags & ACC_PUBLIC) fprintf (stream, " public");
if (flags & ACC_PRIVATE) fprintf (stream, " private");
if (flags & ACC_PROTECTED) fprintf (stream, " protected");
if (flags & ACC_STATIC) fprintf (stream, " static");
if (flags & ACC_FINAL) fprintf (stream, " final");
if (flags & ACC_SYNCHRONIZED) fprintf (stream, " synchronized");
if (flags & ACC_SYNCHRONIZED)
if (context == 'c')
fprintf (stream, " super");
else
fprintf (stream, " synchronized");
if (flags & ACC_VOLATILE) fprintf (stream, " volatile");
if (flags & ACC_TRANSIENT) fprintf (stream, " transient");
if (flags & ACC_NATIVE) fprintf (stream, " native");

13
gcc/java/parse.c
View file

@ -5593,17 +5593,8 @@ create_class (flags, id, super, interfaces)
return NULL_TREE;
}
/* The class is known and exists if there is a decl. Otherwise,
postpone the operation and do it later. */
super_decl = IDENTIFIER_CLASS_VALUE (EXPR_WFL_NODE (super));
if (super_decl)
{
parser_check_super (super_decl, decl, id);
super_decl_type = TREE_TYPE (super_decl);
}
else
super_decl_type =
register_incomplete_type (JDEP_SUPER, super, decl, NULL_TREE);
super_decl_type =
register_incomplete_type (JDEP_SUPER, super, decl, NULL_TREE);
}
else if (TREE_TYPE (decl) != object_type_node)
super_decl_type = object_type_node;

3
gcc/java/parse.h
View file

@ -208,8 +208,7 @@ extern tree stabilize_reference PROTO ((tree));
(CLASS_P (TYPE) && CLASS_INTERFACE (TYPE_NAME (TYPE)))
#define TYPE_CLASS_P(TYPE) (CLASS_P (TYPE) \
&& !CLASS_INTERFACE (TYPE_NAME (TYPE)) \
&& !TYPE_ARRAY_P (TYPE))
&& !CLASS_INTERFACE (TYPE_NAME (TYPE)))
/* Standard error messages */
#define ERROR_CANT_CONVERT_TO_BOOLEAN(OPERATOR, NODE, TYPE) \

13
gcc/java/parse.y
View file

@ -2991,17 +2991,8 @@ create_class (flags, id, super, interfaces)
return NULL_TREE;
}
/* The class is known and exists if there is a decl. Otherwise,
postpone the operation and do it later. */
super_decl = IDENTIFIER_CLASS_VALUE (EXPR_WFL_NODE (super));
if (super_decl)
{
parser_check_super (super_decl, decl, id);
super_decl_type = TREE_TYPE (super_decl);
}
else
super_decl_type =
register_incomplete_type (JDEP_SUPER, super, decl, NULL_TREE);
super_decl_type =
register_incomplete_type (JDEP_SUPER, super, decl, NULL_TREE);
}
else if (TREE_TYPE (decl) != object_type_node)
super_decl_type = object_type_node;