summaryrefslogtreecommitdiffstats
path: root/vm/ReferenceTable.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-07-19 17:53:51 -0700
committerElliott Hughes <enh@google.com>2011-07-19 17:53:51 -0700
commit8bc8bf71a52e17d483021b4c9dc8e735d9bce3ed (patch)
treeee9183f1ae87226d10f157b8bc6ce6bae372fd09 /vm/ReferenceTable.cpp
parent5b298a2a95dfb3562ee297d284bef565e595a70c (diff)
downloadandroid_dalvik-8bc8bf71a52e17d483021b4c9dc8e735d9bce3ed.tar.gz
android_dalvik-8bc8bf71a52e17d483021b4c9dc8e735d9bce3ed.tar.bz2
android_dalvik-8bc8bf71a52e17d483021b4c9dc8e735d9bce3ed.zip
Don't use dvmIsValidObject outside the GC.
Use dvmIsHeapPointer outside the GC. (This still isn't safe because there's no synchronization when dealing with the HeapSource.) Bug: 5049447 Change-Id: Ie0b325ef0a92687ea1eaf1491a4bb832298893c5
Diffstat (limited to 'vm/ReferenceTable.cpp')
-rw-r--r--vm/ReferenceTable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/ReferenceTable.cpp b/vm/ReferenceTable.cpp
index 4ec80ae23..99d613e0d 100644
--- a/vm/ReferenceTable.cpp
+++ b/vm/ReferenceTable.cpp
@@ -56,8 +56,8 @@ void dvmClearReferenceTable(ReferenceTable* pRef)
*/
bool dvmAddToReferenceTable(ReferenceTable* pRef, Object* obj)
{
- assert(dvmIsValidObject(obj));
assert(obj != NULL);
+ assert(dvmIsHeapAddress(obj));
assert(pRef->table != NULL);
assert(pRef->allocEntries <= pRef->maxEntries);