diff options
| author | 2016-10-13 12:53:15 +0100 | |
|---|---|---|
| committer | 2016-10-14 11:25:28 +0100 | |
| commit | 1a1de67c4923436eb7de7da334c6d77703375dbd (patch) | |
| tree | bf82b30cddfeaa822e14a63c0ad9fedd3886958d /runtime/intern_table.h | |
| parent | 6e5fa09510c7280168e040382d27dd8b55760d9a (diff) | |
Do not write empty class table and intern table to image.
And remove dead ClassLinker and InternTable code that would
be erroneously triggered by not writing the tables.
Test: m test-art-host
Change-Id: I2520daa8d1231e16112d44e364a72d782fa32527
Diffstat (limited to 'runtime/intern_table.h')
| -rw-r--r-- | runtime/intern_table.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/runtime/intern_table.h b/runtime/intern_table.h index 184fbdc539..30ff55d33d 100644 --- a/runtime/intern_table.h +++ b/runtime/intern_table.h @@ -238,8 +238,6 @@ class InternTable { REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(Locks::intern_table_lock_); // Transaction rollback access. - mirror::String* LookupStringFromImage(mirror::String* s) - REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(Locks::intern_table_lock_); mirror::String* InsertStrongFromTransaction(mirror::String* s) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(Locks::intern_table_lock_); mirror::String* InsertWeakFromTransaction(mirror::String* s) @@ -260,7 +258,6 @@ class InternTable { void WaitUntilAccessible(Thread* self) REQUIRES(Locks::intern_table_lock_) REQUIRES_SHARED(Locks::mutator_lock_); - bool images_added_to_intern_table_ GUARDED_BY(Locks::intern_table_lock_); bool log_new_roots_ GUARDED_BY(Locks::intern_table_lock_); ConditionVariable weak_intern_condition_ GUARDED_BY(Locks::intern_table_lock_); // Since this contains (strong) roots, they need a read barrier to |