diff options
| author | Bryce McKinlay <mckinlay@redhat.com> | 2004-08-13 18:26:00 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2004-08-13 19:26:00 +0100 |
| commit | 73389fa4a2ec749ef646627ef69c6245a8d862a4 (patch) | |
| tree | 4bc5ac5377cb0ba23dab124e8d6916b8709349f9 /libjava/defineclass.cc | |
| parent | aa18c0d302d3430a701f3c88e9ee7da8a04931be (diff) | |
| download | gcc-73389fa4a2ec749ef646627ef69c6245a8d862a4.zip gcc-73389fa4a2ec749ef646627ef69c6245a8d862a4.tar.gz gcc-73389fa4a2ec749ef646627ef69c6245a8d862a4.tar.bz2 | |
re PR libgcj/17020 (gij should ignore all reserved method flags)
PR libgcj/17020
Reported by Robin Green.
* defineclass.cc (handleField): Don't throw exception on
unrecognised modifier. Add FIXME comments for spec compliance.
(handleMethod): Likewise.
From-SVN: r85952
Diffstat (limited to 'libjava/defineclass.cc')
| -rw-r--r-- | libjava/defineclass.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc index ad40fc8..5cd6b00 100644 --- a/libjava/defineclass.cc +++ b/libjava/defineclass.cc @@ -1096,16 +1096,15 @@ void _Jv_ClassReader::handleField (int field_no, throw_class_format_error ("duplicate field name"); } - if (field->flags & (Modifier::SYNCHRONIZED - | Modifier::NATIVE - | Modifier::INTERFACE - | Modifier::ABSTRACT)) - throw_class_format_error ("erroneous field access flags"); - + // At most one of PUBLIC, PRIVATE, or PROTECTED is allowed. if (1 < ( ((field->flags & Modifier::PUBLIC) ? 1 : 0) +((field->flags & Modifier::PRIVATE) ? 1 : 0) +((field->flags & Modifier::PROTECTED) ? 1 : 0))) throw_class_format_error ("erroneous field access flags"); + + // FIXME: JVM spec S4.5: Verify ACC_FINAL and ACC_VOLATILE are not + // both set. Verify modifiers for interface fields. + } if (verify) @@ -1256,15 +1255,15 @@ void _Jv_ClassReader::handleMethod throw_class_format_error ("duplicate method"); } - if (method->accflags & (Modifier::VOLATILE - | Modifier::TRANSIENT - | Modifier::INTERFACE)) - throw_class_format_error ("erroneous method access flags"); - + // At most one of PUBLIC, PRIVATE, or PROTECTED is allowed. if (1 < ( ((method->accflags & Modifier::PUBLIC) ? 1 : 0) +((method->accflags & Modifier::PRIVATE) ? 1 : 0) +((method->accflags & Modifier::PROTECTED) ? 1 : 0))) throw_class_format_error ("erroneous method access flags"); + + // FIXME: JVM spec S4.6: if ABSTRACT modifier is set, verify other + // flags are not set. Verify flags for interface methods. Verifiy + // modifiers for initializers. } } |