diff options
| author | Andreas Gampe <agampe@google.com> | 2015-10-26 20:47:28 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2015-10-28 18:30:14 -0700 |
| commit | 7f57e8c60ec31461151a8bfdd2b3fabfa78cb3f5 (patch) | |
| tree | c38a3fc65deb8e28e8913a6c85129a6cb4560f7b /runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | |
| parent | 54d8f4bc810e7e0767f44cb77e5706a232b644bb (diff) | |
| download | art-7f57e8c60ec31461151a8bfdd2b3fabfa78cb3f5.zip art-7f57e8c60ec31461151a8bfdd2b3fabfa78cb3f5.tar.gz art-7f57e8c60ec31461151a8bfdd2b3fabfa78cb3f5.tar.bz2 | |
[WIP] ART: Write-protect TLS
Change-Id: I6762a3a30d01bd6eb8bb25f23f390c91147fe9b4
Diffstat (limited to 'runtime/entrypoints/quick/quick_trampoline_entrypoints.cc')
| -rw-r--r-- | runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 2ea5cb0..73db6ba 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -1949,6 +1949,7 @@ static TwoWordReturn artInvokeCommon(uint32_t method_idx, mirror::Object* this_o ArtMethod* caller_method, Thread* self, ArtMethod** sp) { ScopedQuickEntrypointChecks sqec(self); DCHECK_EQ(*sp, Runtime::Current()->GetCalleeSaveMethod(Runtime::kRefsAndArgs)); + DCHECK(caller_method != nullptr); ArtMethod* method = FindMethodFast(method_idx, this_object, caller_method, access_check, type); if (UNLIKELY(method == nullptr)) { const DexFile* dex_file = caller_method->GetDeclaringClass()->GetDexCache()->GetDexFile(); |