diff options
| author | 2014-01-08 17:19:03 +0000 | |
|---|---|---|
| committer | 2014-01-08 17:19:03 +0000 | |
| commit | 0cb50e58bcdab321378df3b86f1e914d30992b5b (patch) | |
| tree | 560146dfd200432b3e0cb83827e40e08bb1b67a8 /compiler/driver/compiler_driver.h | |
| parent | 4c863edfe99dd63550ee462d77820a007ec40a7d (diff) | |
| parent | 5ddb4104ac605d66693b55b79f26f8b8a5505e63 (diff) | |
Merge "Remove intialized static storage from dex cache."
Diffstat (limited to 'compiler/driver/compiler_driver.h')
| -rw-r--r-- | compiler/driver/compiler_driver.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index f4cc84dfe7..9e316242ba 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -172,8 +172,7 @@ class CompilerDriver { // Callbacks from compiler to see what runtime checks must be generated. - bool CanAssumeTypeIsPresentInDexCache(const DexFile& dex_file, uint32_t type_idx) - LOCKS_EXCLUDED(Locks::mutator_lock_); + bool CanAssumeTypeIsPresentInDexCache(const DexFile& dex_file, uint32_t type_idx); bool CanAssumeStringIsPresentInDexCache(const DexFile& dex_file, uint32_t string_idx) LOCKS_EXCLUDED(Locks::mutator_lock_); @@ -198,8 +197,8 @@ class CompilerDriver { // Can we fastpath static field access? Computes field's offset, volatility and whether the // field is within the referrer (which can avoid checking class initialization). bool ComputeStaticFieldInfo(uint32_t field_idx, const DexCompilationUnit* mUnit, bool is_put, - int* field_offset, int* ssb_index, - bool* is_referrers_class, bool* is_volatile) + int* field_offset, int* storage_index, + bool* is_referrers_class, bool* is_volatile, bool* is_initialized) LOCKS_EXCLUDED(Locks::mutator_lock_); // Can we fastpath a interface, super class or virtual method call? Computes method's vtable |