diff options
| author | Carl Shapiro <cshapiro@google.com> | 2011-03-21 13:58:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-21 13:58:59 -0700 |
| commit | 111afc834432531b3528d36d7ff551ac350fb581 (patch) | |
| tree | 30cafeed6c1b830955bfbc3c040a3137cd3f8355 /vm/Globals.h | |
| parent | f4955a1a2eb1c06aafc9e314b221c448d15623d9 (diff) | |
| parent | 3475f9cdb47a6d6f8ad2ce49bbc3af46bca92f09 (diff) | |
| download | android_dalvik-111afc834432531b3528d36d7ff551ac350fb581.tar.gz android_dalvik-111afc834432531b3528d36d7ff551ac350fb581.tar.bz2 android_dalvik-111afc834432531b3528d36d7ff551ac350fb581.zip | |
Merge "Move finalization out of the VM." into dalvik-dev
Diffstat (limited to 'vm/Globals.h')
| -rw-r--r-- | vm/Globals.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vm/Globals.h b/vm/Globals.h index df10e3681..db329e4ba 100644 --- a/vm/Globals.h +++ b/vm/Globals.h @@ -285,6 +285,7 @@ struct DvmGlobals { ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationFactory; ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationMember; ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationMemberArray; + ClassObject* classJavaLangRefFinalizerReference; /* * classes representing exception types. The names here don't include @@ -337,7 +338,6 @@ struct DvmGlobals { int voffJavaLangObject_equals; int voffJavaLangObject_hashCode; int voffJavaLangObject_toString; - int voffJavaLangObject_finalize; /* field offsets - Class */ int offJavaLangClass_pd; @@ -390,6 +390,9 @@ struct DvmGlobals { /* method pointers - java.lang.ref.Reference */ Method* methJavaLangRefReference_enqueueInternal; + /* more method pointers - java.lang.ref.FinalizerReference */ + Method* methJavaLangRefFinalizerReferenceAdd; + /* constructor method pointers; no vtable involved, so use Method* */ Method* methJavaLangStackTraceElement_init; Method* methJavaLangReflectConstructor_init; |