diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-13 07:49:24 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-01-13 07:49:26 -0800 |
| commit | 6dea1575fd44aeee1dbe4d2bb184357598581652 (patch) | |
| tree | 852b2791adfb9663ce5ab2ee0a8ee02502a6b5b1 | |
| parent | 2ca72c704e7462c56f8c4489369b618872b595a0 (diff) | |
| parent | 069df3c06ff155f7cffc2511603320e460455c0f (diff) | |
| download | android_dalvik-6dea1575fd44aeee1dbe4d2bb184357598581652.tar.gz android_dalvik-6dea1575fd44aeee1dbe4d2bb184357598581652.tar.bz2 android_dalvik-6dea1575fd44aeee1dbe4d2bb184357598581652.zip | |
Merge "fix dvmDbgOutputAllInterfaces to include only direct super-interfaces"
| -rw-r--r-- | vm/Debugger.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/vm/Debugger.cpp b/vm/Debugger.cpp index 5a4e0e5f5..b54facd36 100644 --- a/vm/Debugger.cpp +++ b/vm/Debugger.cpp @@ -1264,20 +1264,15 @@ void dvmDbgOutputAllMethods(RefTypeId refTypeId, bool withGeneric, void dvmDbgOutputAllInterfaces(RefTypeId refTypeId, ExpandBuf* pReply) { ClassObject* clazz; - int i, start, count; + int i, count; clazz = refTypeIdToClassObject(refTypeId); assert(clazz != NULL); - if (clazz->super == NULL) - start = 0; - else - start = clazz->super->iftableCount; - - count = clazz->iftableCount - start; + count = clazz->interfaceCount; expandBufAdd4BE(pReply, count); - for (i = start; i < clazz->iftableCount; i++) { - ClassObject* iface = clazz->iftable[i].clazz; + for (i = 0; i < count; i++) { + ClassObject* iface = clazz->interfaces[i]; expandBufAddRefTypeId(pReply, classObjectToRefTypeId(iface)); } } |