summaryrefslogtreecommitdiff
path: root/runtime/class_table.cc
diff options
context:
space:
mode:
author Stephen Hines <srhines@google.com> 2017-02-08 11:19:23 -0800
committer Stephen Hines <srhines@google.com> 2017-02-08 11:19:23 -0800
commiteca0dea9f103a19042f0d3505af1126ac97be0dd (patch)
tree313599a8b7613a50f90674417f0635fcd680a927 /runtime/class_table.cc
parentf1d60334ec3fab0e98e1c8307b71ba1888b04a19 (diff)
Revert -Wunreachable-code workaround.
Bug: http://b/31104323 Test: Built/ran ART successfully on sailfish. This reverts commit 813b9c47d8952b3f02a6032d79d66433c981d030, which added a workaround for Clang mistriggering -Wunreachable-code. Change-Id: I46636c9b4f574a870c1f95b6160d05f2a75f8ab8
Diffstat (limited to 'runtime/class_table.cc')
-rw-r--r--runtime/class_table.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/runtime/class_table.cc b/runtime/class_table.cc
index ff846a718e..f1458b42ab 100644
--- a/runtime/class_table.cc
+++ b/runtime/class_table.cc
@@ -55,10 +55,6 @@ mirror::Class* ClassTable::LookupByDescriptor(ObjPtr<mirror::Class> klass) {
return nullptr;
}
-// Bug: http://b/31104323 Ignore -Wunreachable-code from the for loop below
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunreachable-code"
-
mirror::Class* ClassTable::UpdateClass(const char* descriptor, mirror::Class* klass, size_t hash) {
WriterMutexLock mu(Thread::Current(), lock_);
// Should only be updating latest table.
@@ -84,8 +80,6 @@ mirror::Class* ClassTable::UpdateClass(const char* descriptor, mirror::Class* kl
return existing;
}
-#pragma clang diagnostic pop // http://b/31104323
-
size_t ClassTable::CountDefiningLoaderClasses(ObjPtr<mirror::ClassLoader> defining_loader,
const ClassSet& set) const {
size_t count = 0;