From 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Tue, 14 Oct 2014 17:41:57 -0700 Subject: Make ART compile with GCC -O0 again. Tidy up InstructionSetFeatures so that it has a type hierarchy dependent on architecture. Add to instruction_set_test to warn when InstructionSetFeatures don't agree with ones from system properties, AT_HWCAP and /proc/cpuinfo. Clean-up class linker entry point logic to not return entry points but to test whether the passed code is the particular entrypoint. This works around image trampolines that replicate entrypoints. Bug: 17993736 Change-Id: I5f4b49e88c3b02a79f9bee04f83395146ed7be23 --- runtime/jdwp/jdwp_handler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/jdwp') diff --git a/runtime/jdwp/jdwp_handler.cc b/runtime/jdwp/jdwp_handler.cc index 16a774fdf0..7fdc18e8a0 100644 --- a/runtime/jdwp/jdwp_handler.cc +++ b/runtime/jdwp/jdwp_handler.cc @@ -329,14 +329,14 @@ static JdwpError VM_ClassPaths(JdwpState*, Request*, ExpandBuf* pReply) expandBufAddUtf8String(pReply, "/"); std::vector class_path; - Split(Runtime::Current()->GetClassPathString(), ':', class_path); + Split(Runtime::Current()->GetClassPathString(), ':', &class_path); expandBufAdd4BE(pReply, class_path.size()); for (size_t i = 0; i < class_path.size(); ++i) { expandBufAddUtf8String(pReply, class_path[i]); } std::vector boot_class_path; - Split(Runtime::Current()->GetBootClassPathString(), ':', boot_class_path); + Split(Runtime::Current()->GetBootClassPathString(), ':', &boot_class_path); expandBufAdd4BE(pReply, boot_class_path.size()); for (size_t i = 0; i < boot_class_path.size(); ++i) { expandBufAddUtf8String(pReply, boot_class_path[i]); -- cgit v1.2.3