diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-12-16 17:01:53 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-12-16 17:01:53 +0000 |
| commit | db4b9be3fe5c20e36b83aa451c126665e3393b70 (patch) | |
| tree | a13a7b3f2483dc18149817da3810fdbbb56b3e0a | |
| parent | 3db35d24180167e246be8f69f4045d17f6b9a42b (diff) | |
| download | gcc-db4b9be3fe5c20e36b83aa451c126665e3393b70.tar.gz | |
�
* jcf-parse.c (get_constant): Set TREE_TYPE for string constants.
(HANDLE_CONSTANTVALUE): If flag_emit_class_files, call get_constant.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24346 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/jcf-parse.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e86a2b60c08..e81caeb411c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 16 14:42:19 1998 Per Bothner <bothner@cygnus.com> + + * jcf-parse.c (get_constant): Set TREE_TYPE for string constants. + (HANDLE_CONSTANTVALUE): If flag_emit_class_files, call get_constant. + 1998-12-16 Tom Tromey <tromey@cygnus.com> * parse-scan.y (qualified_name): Use correct sprintf format. diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index 5d8a5e09c04..5186e6fd06e 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -129,7 +129,7 @@ set_source_filename (jcf, index) #define HANDLE_CONSTANTVALUE(INDEX) \ { tree constant; int index = INDEX; \ - if (JPOOL_TAG (jcf, index) == CONSTANT_String) { \ + if (! flag_emit_class_files && JPOOL_TAG (jcf, index) == CONSTANT_String) { \ tree name = get_name_constant (jcf, JPOOL_USHORT1 (jcf, index)); \ constant = build_utf8_ref (name); \ } \ @@ -312,6 +312,7 @@ get_constant (jcf, index) } value = make_node (STRING_CST); + TREE_TYPE (value) = build_pointer_type (string_type_node); TREE_STRING_LENGTH (value) = 2 * str_len; TREE_STRING_POINTER (value) = obstack_alloc (expression_obstack, 2 * str_len); |