summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen/x86
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2011-05-03 17:59:35 -0700
committerCarl Shapiro <cshapiro@google.com>2011-05-03 18:09:17 -0700
commita62c3a0ab3fcdde37f47d16e9699a935ae7a8e88 (patch)
treeb23da5546e400facfa36b3dec6daac8c30d3a537 /vm/compiler/codegen/x86
parent00c88766d7425c7923187c18a8c7e91d32807a97 (diff)
downloadandroid_dalvik-a62c3a0ab3fcdde37f47d16e9699a935ae7a8e88.tar.gz
android_dalvik-a62c3a0ab3fcdde37f47d16e9699a935ae7a8e88.tar.bz2
android_dalvik-a62c3a0ab3fcdde37f47d16e9699a935ae7a8e88.zip
Establish a subclass relationship between ArrayObject and Object.
Change-Id: I9f9fe52bd4ceebb6dde48251a89190ba6bb00ce4
Diffstat (limited to 'vm/compiler/codegen/x86')
-rw-r--r--vm/compiler/codegen/x86/ia32/ArchVariant.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/compiler/codegen/x86/ia32/ArchVariant.cpp b/vm/compiler/codegen/x86/ia32/ArchVariant.cpp
index 4dd528ead..6992c167a 100644
--- a/vm/compiler/codegen/x86/ia32/ArchVariant.cpp
+++ b/vm/compiler/codegen/x86/ia32/ArchVariant.cpp
@@ -63,9 +63,9 @@ bool dvmCompilerArchVariantInit(void)
/* Codegen-specific assumptions */
assert(offsetof(ClassObject, vtable) < 128 &&
(offsetof(ClassObject, vtable) & 0x3) == 0);
- assert(offsetof(ArrayObject, length) < 128 &&
- (offsetof(ArrayObject, length) & 0x3) == 0);
- assert(offsetof(ArrayObject, contents) < 256);
+ assert(OFFSETOF_MEMBER(ArrayObject, length) < 128 &&
+ (OFFSETOF_MEMBER(ArrayObject, length) & 0x3) == 0);
+ assert(OFFSETOF_MEMBER(ArrayObject, contents) < 256);
/* Up to 5 args are pushed on top of FP - sizeofStackSaveArea */
assert(sizeof(StackSaveArea) < 236);