diff options
| author | Roger Sayle <roger@eyesopen.com> | 2006-02-04 18:57:53 +0000 |
|---|---|---|
| committer | Roger Sayle <sayle@gcc.gnu.org> | 2006-02-04 18:57:53 +0000 |
| commit | 5460aa9c92db4858927d7a7c2118e71d7c90aa6d (patch) | |
| tree | c0d1e0f40e8cd4dc49d6721aa72f8082ff6c8750 /gcc/java/mangle.c | |
| parent | dd4ebf6ae9d708b231ad929bbe6fa900fb336a02 (diff) | |
| download | gcc-5460aa9c92db4858927d7a7c2118e71d7c90aa6d.zip gcc-5460aa9c92db4858927d7a7c2118e71d7c90aa6d.tar.gz gcc-5460aa9c92db4858927d7a7c2118e71d7c90aa6d.tar.bz2 | |
decl.c (java_init_decl_processing): Create char_type_node as a regular INTEGER_TYPE node.
* decl.c (java_init_decl_processing): Create char_type_node as a
regular INTEGER_TYPE node.
(push_promoted_type): Preserve TYPE_STRING_FLAG on types.
* typeck.c (convert): No longer check for CHAR_TYPEs but instead
test for char_type_node and promoted_char_type_node as special
instances of INTEGER_TYPE tree codes.
(promote_type,build_java_signature): Likewise.
* jcf-write.c (adjust_typed_op): Likewise.
* mangle.c (mangle_type): Likewise.
* parse.y (do_unary_numeric_promotion): No longer handle CHAR_TYPE.
* parse.h (JINTEGRAL_TYPE_P): Likewise.
From-SVN: r110592
Diffstat (limited to 'gcc/java/mangle.c')
| -rw-r--r-- | gcc/java/mangle.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c index a1b7518..a99bfe5 100644 --- a/gcc/java/mangle.c +++ b/gcc/java/mangle.c @@ -243,9 +243,13 @@ mangle_type (tree type) { char code; case BOOLEAN_TYPE: code = 'b'; goto primitive; - case CHAR_TYPE: code = 'w'; goto primitive; case VOID_TYPE: code = 'v'; goto primitive; case INTEGER_TYPE: + if (type == char_type_node || type == promoted_char_type_node) + { + code = 'w'; + goto primitive; + } /* Get the original type instead of the arguments promoted type. Avoid symbol name clashes. Should call a function to do that. FIXME. */ |