diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-08-02 21:20:46 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-08-02 21:20:46 +0000 |
| commit | 572c28962ecce76c43a77174801e44dfdfe9bac9 (patch) | |
| tree | 489c5ba70ebca4a8c68b6e6cfbbc6dd6343b586b | |
| parent | ece3a793c48557f7b525fff8e127aa301a8c3422 (diff) | |
| download | ppe42-gcc-572c28962ecce76c43a77174801e44dfdfe9bac9.tar.gz ppe42-gcc-572c28962ecce76c43a77174801e44dfdfe9bac9.zip | |
2004-08-02 Bryce McKinlay <mckinlay@redhat.com>
PR java/16701
* parse.y (fold_constant_for_init): Call resolve_field_access with
correct current_class context.
2004-08-02 Bryce McKinlay <mckinlay@redhat.com>
* testsuite/libjava.compile/PR16701.java: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@85453 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/parse.y | 10 | ||||
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.compile/PR16701.java | 10 |
4 files changed, 25 insertions, 5 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index b2c0a625fa6..1cd9315f14b 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2004-08-02 Bryce McKinlay <mckinlay@redhat.com> + + PR java/16701 + * parse.y (fold_constant_for_init): Call resolve_field_access with + correct current_class context. + 2004-08-01 Roger Sayle <roger@eyesopen.com> * decl.c (update_aliases, initialize_local_variable): Replace calls diff --git a/gcc/java/parse.y b/gcc/java/parse.y index c251f2f12b7..fdff7467649 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -15970,16 +15970,16 @@ fold_constant_for_init (tree node, tree context) } else { - /* Install the proper context for the field resolution. - The prior context is restored once the name is - properly qualified. */ + tree r = NULL_TREE; + /* Install the proper context for the field resolution. */ tree saved_current_class = current_class; /* Wait until the USE_COMPONENT_REF re-write. FIXME. */ current_class = DECL_CONTEXT (context); qualify_ambiguous_name (node); + r = resolve_field_access (node, &decl, NULL); + /* Restore prior context. */ current_class = saved_current_class; - if (resolve_field_access (node, &decl, NULL) - && decl != NULL_TREE) + if (r != error_mark_node && decl != NULL_TREE) return fold_constant_for_init (decl, decl); return NULL_TREE; } diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 28973292b36..81922f2655c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2004-08-02 Bryce McKinlay <mckinlay@redhat.com> + + * testsuite/libjava.compile/PR16701.java: New test. + 2004-08-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/Collection.java, java/util/List.java, diff --git a/libjava/testsuite/libjava.compile/PR16701.java b/libjava/testsuite/libjava.compile/PR16701.java new file mode 100644 index 00000000000..60d459a69c7 --- /dev/null +++ b/libjava/testsuite/libjava.compile/PR16701.java @@ -0,0 +1,10 @@ +class Cl +{ + private static final int CONSTANT1 = 0x001; + public static final int CONSTANT2 = 0x002 >> CONSTANT1; +} + +public class PR16701 +{ + public static final int VALUE = Cl.CONSTANT2; +} |
