diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/Class.h | 2 | ||||
| -rw-r--r-- | libjava/java/lang/natString.cc | 24 |
2 files changed, 1 insertions, 25 deletions
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index 1577628..b8a8d90 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -286,7 +286,7 @@ private: friend jfieldID JvGetFirstStaticField (jclass); friend jint JvNumStaticFields (jclass); - friend jobject _Jv_AllocObject (jclass, jint); + friend jobject _Jv_AllocObject (jclass); friend void *_Jv_AllocObj (jint, jclass); friend void *_Jv_AllocPtrFreeObj (jint, jclass); friend void *_Jv_AllocArray (jint, jclass); diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc index 8217f70..e01f467 100644 --- a/libjava/java/lang/natString.cc +++ b/libjava/java/lang/natString.cc @@ -402,30 +402,6 @@ java::lang::String::valueOf (jint num) } jstring -_Jv_AllocString(jsize len) -{ - jsize sz = sizeof(java::lang::String) + len * sizeof(jchar); - - // We assert that for strings allocated this way, the data field - // will always point to the object itself. Thus there is no reason - // for the garbage collector to scan any of it. - // Furthermore, we're about to overwrite the string data, so - // initialization of the object is not an issue. -#ifdef ENABLE_JVMPI - jstring obj = (jstring) _Jv_AllocPtrFreeObject(&StringClass, sz); -#else - // Class needs no initialization, and there is no finalizer, so - // we can go directly to the collector's allocator interface. - jstring obj = (jstring) _Jv_AllocPtrFreeObj(sz, &StringClass); -#endif - obj->data = obj; - obj->boffset = sizeof(java::lang::String); - obj->count = len; - obj->cachedHashCode = 0; - return obj; -} - -jstring _Jv_NewString(const jchar *chars, jsize len) { jstring str = _Jv_AllocString(len); |