From eca0dea9f103a19042f0d3505af1126ac97be0dd Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Wed, 8 Feb 2017 11:19:23 -0800 Subject: 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 --- runtime/class_table.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'runtime/class_table.cc') 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 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 defining_loader, const ClassSet& set) const { size_t count = 0; -- cgit v1.2.3-59-g8ed1b