summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen/x86
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2011-05-06 14:57:43 -0700
committerCarl Shapiro <cshapiro@google.com>2011-05-06 14:57:43 -0700
commitdc2a1881fe75a8dd961fb24509621c7c97694c9a (patch)
tree36d5e301729dfde4eb4f07e67e545f2e39bcb1c1 /vm/compiler/codegen/x86
parentdc9e44cc0af797679822484d88ef76bff15ffc98 (diff)
downloadandroid_dalvik-dc2a1881fe75a8dd961fb24509621c7c97694c9a.tar.gz
android_dalvik-dc2a1881fe75a8dd961fb24509621c7c97694c9a.tar.bz2
android_dalvik-dc2a1881fe75a8dd961fb24509621c7c97694c9a.zip
Establish a subclass relationship between ClassObject and Object.
Change-Id: I9fb5d33f23ec7aeb2b9a3908d4125b34be0599ae
Diffstat (limited to 'vm/compiler/codegen/x86')
-rw-r--r--vm/compiler/codegen/x86/ia32/ArchVariant.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm/compiler/codegen/x86/ia32/ArchVariant.cpp b/vm/compiler/codegen/x86/ia32/ArchVariant.cpp
index 5ccd26d0f..9f17522a5 100644
--- a/vm/compiler/codegen/x86/ia32/ArchVariant.cpp
+++ b/vm/compiler/codegen/x86/ia32/ArchVariant.cpp
@@ -62,8 +62,8 @@ bool dvmCompilerArchVariantInit(void)
#endif
/* Codegen-specific assumptions */
- assert(offsetof(ClassObject, vtable) < 128 &&
- (offsetof(ClassObject, vtable) & 0x3) == 0);
+ assert(OFFSETOF_MEMBER(ClassObject, vtable) < 128 &&
+ (OFFSETOF_MEMBER(ClassObject, vtable) & 0x3) == 0);
assert(OFFSETOF_MEMBER(ArrayObject, length) < 128 &&
(OFFSETOF_MEMBER(ArrayObject, length) & 0x3) == 0);
assert(OFFSETOF_MEMBER(ArrayObject, contents) < 256);