diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-20 08:10:17 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-20 14:34:21 -0700 |
| commit | 6ed19fd1b08abbc438781ae3e6fea111c1f92315 (patch) | |
| tree | 1a6c62363904c7c19c2541d0a5304cb85cea48d2 /runtime/runtime.cc | |
| parent | cfea1d0ba7a1b6547aee704aab8210505da1f708 (diff) | |
| download | art-6ed19fd1b08abbc438781ae3e6fea111c1f92315.zip art-6ed19fd1b08abbc438781ae3e6fea111c1f92315.tar.gz art-6ed19fd1b08abbc438781ae3e6fea111c1f92315.tar.bz2 | |
64bit: make runtime offsets more deterministic.
STL implementations vary causing offsets not to be consistent. Place member
variables we care about the offsets of at the start of Runtime.
Change-Id: I3ad7fe606cb99bcdd884a8fdbdd06bd7e047cd84
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index eaa27de..21d79c3 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -80,7 +80,11 @@ namespace art { Runtime* Runtime::instance_ = NULL; Runtime::Runtime() - : compiler_callbacks_(nullptr), + : pre_allocated_OutOfMemoryError_(nullptr), + resolution_method_(nullptr), + imt_conflict_method_(nullptr), + default_imt_(nullptr), + compiler_callbacks_(nullptr), is_zygote_(false), is_concurrent_gc_enabled_(true), is_explicit_gc_disabled_(false), @@ -94,10 +98,6 @@ Runtime::Runtime() class_linker_(nullptr), signal_catcher_(nullptr), java_vm_(nullptr), - pre_allocated_OutOfMemoryError_(nullptr), - resolution_method_(nullptr), - imt_conflict_method_(nullptr), - default_imt_(nullptr), fault_message_lock_("Fault message lock"), fault_message_(""), method_verifier_lock_("Method verifiers lock"), |