summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2000-10-06 01:44:21 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2000-10-06 01:44:21 +0000
commitdbcad757ec15e746e662e38b72b08ab1f8fdb7a3 (patch)
treeda878bbdec2e474288ba1dc874c258abbb44d67e
parentf7ce7e1e7ea220277a849d860fa470f665b84a9c (diff)
downloadppe42-gcc-dbcad757ec15e746e662e38b72b08ab1f8fdb7a3.tar.gz
ppe42-gcc-dbcad757ec15e746e662e38b72b08ab1f8fdb7a3.zip
* init.c (build_java_class_ref): Use `build_static_name' with a
suffix, not a prefix, to build the class object's name. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36737 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/init.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 34389c50c9c..23e16de16a4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-05 Tom Tromey <tromey@cygnus.com>
+
+ * init.c (build_java_class_ref): Use `build_static_name' with a
+ suffix, not a prefix, to build the class object's name.
+
2000-10-05 Nathan Sidwell <nathan@codesourcery.com>
* cp-tree.h (access_kind): Fix comment typo.
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 89619ee4e50..e31554fe56b 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -2167,9 +2167,9 @@ build_java_class_ref (type)
tree type;
{
tree name, class_decl;
- static tree CL_prefix = NULL_TREE;
- if (CL_prefix == NULL_TREE)
- CL_prefix = get_identifier("_CL_");
+ static tree CL_suffix = NULL_TREE;
+ if (CL_suffix == NULL_TREE)
+ CL_suffix = get_identifier("class$");
if (jclass_node == NULL_TREE)
{
jclass_node = IDENTIFIER_GLOBAL_VALUE (get_identifier("jclass"));
@@ -2177,7 +2177,7 @@ build_java_class_ref (type)
fatal("call to Java constructor, while `jclass' undefined");
jclass_node = TREE_TYPE (jclass_node);
}
- name = build_overload_with_type (CL_prefix, type);
+ name = build_static_name (type, CL_suffix);
class_decl = IDENTIFIER_GLOBAL_VALUE (name);
if (class_decl == NULL_TREE)
{
@@ -2193,7 +2193,7 @@ build_java_class_ref (type)
return class_decl;
}
-/* Returns teh size of the cookie to use when allocating an array
+/* Returns the size of the cookie to use when allocating an array
whose elements have the indicated TYPE. Assumes that it is already
known that a cookie is needed. */
OpenPOWER on IntegriCloud