From 34e069606d6f1698cd3c33b39e72b79ae27e1c7b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 9 Apr 2012 13:55:55 -0700 Subject: Remove the useless "suspend count already zero" message for new threads. We can actually detect the expected case of this warning ourselves, and not emit it. Then we can upgrade the WARNING to a FATAL. I also tripped over the fact that the operator<< for Thread::State was out of date, so I've moved the Thread enums up to namespace scope so the script can automatically generate correct operator<< implementations for us. (All the high-numbered thread states have been off by one for a couple of weeks.) Change-Id: I5de573d33d641e5a3cba87b370e9620c8c66e633 --- src/compiler_llvm/jni_compiler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/compiler_llvm/jni_compiler.cc') diff --git a/src/compiler_llvm/jni_compiler.cc b/src/compiler_llvm/jni_compiler.cc index 071c0bd4e7..e0a570463a 100644 --- a/src/compiler_llvm/jni_compiler.cc +++ b/src/compiler_llvm/jni_compiler.cc @@ -142,7 +142,7 @@ CompiledMethod* JniCompiler::Compile() { // Set thread state to kNative StoreToObjectOffset(thread_object_addr, Thread::StateOffset().Int32Value(), - irb_.getInt32(Thread::kNative)); + irb_.getInt32(kNative)); // Get callee code_addr llvm::Value* code_addr_ = @@ -262,7 +262,7 @@ CompiledMethod* JniCompiler::Compile() { // Set thread state to kRunnable StoreToObjectOffset(thread_object_addr, Thread::StateOffset().Int32Value(), - irb_.getInt32(Thread::kRunnable)); + irb_.getInt32(kRunnable)); if (return_shorty == 'L') { // If the return value is reference, it may point to SIRT, we should decode it. -- cgit v1.2.3-59-g8ed1b