diff options
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 8a29ff33b7..8b64b8def0 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -1340,7 +1340,7 @@ void AppImageClassLoadersAndDexCachesHelper::Update( } } } - { + if (ClassLinker::kAppImageMayContainStrings) { // Fixup all the literal strings happens at app images which are supposed to be interned. ScopedTrace timing("Fixup String Intern in image and dex_cache"); const auto& image_header = space->GetImageHeader(); @@ -5863,14 +5863,6 @@ bool ClassLinker::LinkVirtualMethods( // smaller as we go on. uint32_t hash_index = hash_table.FindAndRemove(&super_method_name_comparator); if (hash_index != hash_table.GetNotFoundIndex()) { - // Run a check whether we are going to override a method which is hidden - // to `klass`, but ignore the result as we only warn at the moment. - // We cannot do this test earlier because we need to establish that - // a method is being overridden first. ShouldBlockAccessToMember would - // print bogus warnings otherwise. - hiddenapi::ShouldBlockAccessToMember( - super_method, klass->GetClassLoader(), hiddenapi::kOverride); - ArtMethod* virtual_method = klass->GetVirtualMethodDuringLinking( hash_index, image_pointer_size_); if (super_method->IsFinal()) { |