diff options
| -rw-r--r-- | runtime/class_linker.cc | 9 | ||||
| -rw-r--r-- | runtime/class_table.cc | 6 | ||||
| -rw-r--r-- | test/testrunner/env.py | 2 | ||||
| -rwxr-xr-x | test/testrunner/testrunner.py | 4 |
4 files changed, 4 insertions, 17 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index edd6e3b522..6f55d8382d 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -5679,14 +5679,7 @@ class LinkVirtualHashTable { const uint32_t LinkVirtualHashTable::invalid_index_ = std::numeric_limits<uint32_t>::max(); const uint32_t LinkVirtualHashTable::removed_index_ = std::numeric_limits<uint32_t>::max() - 1; -// b/30419309 -#if defined(__i386__) -#define X86_OPTNONE __attribute__((optnone)) -#else -#define X86_OPTNONE -#endif - -X86_OPTNONE bool ClassLinker::LinkVirtualMethods( +bool ClassLinker::LinkVirtualMethods( Thread* self, Handle<mirror::Class> klass, /*out*/std::unordered_map<size_t, ClassLinker::MethodTranslation>* default_translations) { 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; diff --git a/test/testrunner/env.py b/test/testrunner/env.py index e015d7427c..278980fd30 100644 --- a/test/testrunner/env.py +++ b/test/testrunner/env.py @@ -165,7 +165,7 @@ else: ART_PHONY_TEST_HOST_SUFFIX = "64" _2ND_ART_PHONY_TEST_HOST_SUFFIX = "32" -HOST_OUT_EXECUTABLES = ('%s/%s') % (ANDROID_BUILD_TOP, +HOST_OUT_EXECUTABLES = os.path.join(ANDROID_BUILD_TOP, get_build_var("HOST_OUT_EXECUTABLES")) os.environ['JACK'] = HOST_OUT_EXECUTABLES + '/jack' os.environ['DX'] = HOST_OUT_EXECUTABLES + '/dx' diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py index fd3ebd1d4d..00cb497e20 100755 --- a/test/testrunner/testrunner.py +++ b/test/testrunner/testrunner.py @@ -452,8 +452,8 @@ def run_test(command, test, test_variant, test_name): test_skipped = True else: test_skipped = False - proc = subprocess.Popen(command.split(), stderr=subprocess.PIPE) - script_output = proc.stderr.read().strip() + proc = subprocess.Popen(command.split(), stderr=subprocess.STDOUT, stdout=subprocess.PIPE) + script_output = proc.stdout.read().strip() test_passed = not proc.wait() # If verbose is set to True, every test information is printed on a new line. |