diff options
| author | 2014-02-12 20:10:43 +0000 | |
|---|---|---|
| committer | 2014-02-12 20:10:45 +0000 | |
| commit | ae7e954bdb0ab23dac8619bbbe7bb5a2bf4fa6d7 (patch) | |
| tree | 2a8cf503b21c347bd0627a1e9d7d95281b85be71 /compiler/driver/compiler_driver.cc | |
| parent | 2300790c868f70862f1d1c2578a07c8d0f29d53d (diff) | |
| parent | c7ac649e6ddcf322de48abcddfde63b3e0832aea (diff) | |
Merge "Check IsStatic() on special accessor fields."
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 61e9fbb151..6d953ed6f9 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1006,7 +1006,7 @@ bool CompilerDriver::ComputeSpecialAccessorInfo(uint32_t field_idx, bool is_put, uint32_t method_idx = verifier->GetMethodReference().dex_method_index; mirror::ArtMethod* method = dex_cache->GetResolvedMethod(method_idx); mirror::ArtField* field = dex_cache->GetResolvedField(field_idx); - if (method == nullptr || field == nullptr) { + if (method == nullptr || field == nullptr || field->IsStatic()) { return false; } mirror::Class* method_class = method->GetDeclaringClass(); |