diff options
| author | Ian Rogers <irogers@google.com> | 2014-11-22 02:23:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-22 02:23:06 +0000 |
| commit | e26310320e7ee7bdfcdf340d2e66f216f1d90aa6 (patch) | |
| tree | 09fd909f736572ef8a2fd54f5fc2bbe7e08e53ed /runtime/thread.cc | |
| parent | 022b46cb09a6189797fb3e77dbe7673a3d59249f (diff) | |
| parent | acbb30867482986e02a7cc53c099b8d56d32acee (diff) | |
| download | art-e26310320e7ee7bdfcdf340d2e66f216f1d90aa6.zip art-e26310320e7ee7bdfcdf340d2e66f216f1d90aa6.tar.gz art-e26310320e7ee7bdfcdf340d2e66f216f1d90aa6.tar.bz2 | |
Merge "Fix UnimplementedEntryPoint initialziation."
Diffstat (limited to 'runtime/thread.cc')
| -rw-r--r-- | runtime/thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/thread.cc b/runtime/thread.cc index cd47b5e..163c11d 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -96,8 +96,8 @@ void InitEntryPoints(InterpreterEntryPoints* ipoints, JniEntryPoints* jpoints, void Thread::InitTlsEntryPoints() { // Insert a placeholder so we can easily tell if we call an unimplemented entry point. uintptr_t* begin = reinterpret_cast<uintptr_t*>(&tlsPtr_.interpreter_entrypoints); - uintptr_t* end = reinterpret_cast<uintptr_t*>(reinterpret_cast<uint8_t*>(begin) + - sizeof(tlsPtr_.quick_entrypoints)); + uintptr_t* end = reinterpret_cast<uintptr_t*>(reinterpret_cast<uint8_t*>(&tlsPtr_.quick_entrypoints) + + sizeof(tlsPtr_.quick_entrypoints)); for (uintptr_t* it = begin; it != end; ++it) { *it = reinterpret_cast<uintptr_t>(UnimplementedEntryPoint); } |