FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve.cc: Include StringBuffer.

Browse source 
* resolve.cc: Include StringBuffer.
	(_Jv_ResolvePoolEntry): Use StringBuffer to create error string.

From-SVN: r57515
This commit is contained in:
Tom Tromey 2002-09-25 20:40:09 +00:00 • committed by Tom Tromey
parent 7ea082bbb5
commit fd44a92df6
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libjava/ChangeLog
View file

@ -1,5 +1,8 @@
2002-09-25 Tom Tromey <tromey@redhat.com> 2002-09-25 Tom Tromey <tromey@redhat.com>
* resolve.cc: Include StringBuffer.
(_Jv_ResolvePoolEntry): Use StringBuffer to create error string.
* boehm.cc (_Jv_MarkObj): Don't fail if class object has been * boehm.cc (_Jv_MarkObj): Don't fail if class object has been
allocated but not initialized. allocated but not initialized.

27
libjava/resolve.cc
View file

@ -20,6 +20,7 @@ details. */
#include <java-cpool.h> #include <java-cpool.h>
#include <java/lang/Class.h> #include <java/lang/Class.h>
#include <java/lang/String.h> #include <java/lang/String.h>
#include <java/lang/StringBuffer.h>
#include <java/lang/Thread.h> #include <java/lang/Thread.h>
#include <java/lang/InternalError.h> #include <java/lang/InternalError.h>
#include <java/lang/VirtualMachineError.h> #include <java/lang/VirtualMachineError.h>
@ -201,12 +202,13 @@ _Jv_ResolvePoolEntry (jclass klass, int index)
end_of_field_search: end_of_field_search:
if (the_field == 0) if (the_field == 0)
{ {
jstring msg = JvNewStringLatin1 ("field "); java::lang::StringBuffer *sb = new java::lang::StringBuffer();
msg = msg->concat (owner->getName ()); sb->append(JvNewStringLatin1("field "));
msg = msg->concat (JvNewStringLatin1(".")); sb->append(owner->getName());
msg = msg->concat (_Jv_NewStringUTF (field_name->data)); sb->append(JvNewStringLatin1("."));
msg = msg->concat (JvNewStringLatin1(" was not found.")); sb->append(_Jv_NewStringUTF(field_name->data));
throw_incompatible_class_change_error (msg); sb->append(JvNewStringLatin1(" was not found."));
throw_incompatible_class_change_error(sb->toString());
} }
pool->data[index].field = the_field; pool->data[index].field = the_field;
@ -312,12 +314,13 @@ _Jv_ResolvePoolEntry (jclass klass, int index)
if (the_method == 0) if (the_method == 0)
{ {
jstring msg = JvNewStringLatin1 ("method "); java::lang::StringBuffer *sb = new java::lang::StringBuffer();
msg = msg->concat (owner->getName ()); sb->append(JvNewStringLatin1("method "));
msg = msg->concat (JvNewStringLatin1(".")); sb->append(owner->getName());
msg = msg->concat (_Jv_NewStringUTF (method_name->data)); sb->append(JvNewStringLatin1("."));
msg = msg->concat (JvNewStringLatin1(" was not found.")); sb->append(_Jv_NewStringUTF(method_name->data));
throw new java::lang::NoSuchMethodError (msg); sb->append(JvNewStringLatin1(" was not found."));
throw new java::lang::NoSuchMethodError (sb->toString());
} }
pool->data[index].rmethod = pool->data[index].rmethod =