# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1452288291 -3600
# Node ID 94b7354ef0e09936321e51839145c392f05d762c
# Parent  9d78d44d3aacd706166728ddc484638ea9421b21
improved error message and fixed macro usage (GRAAL-1387)

diff -r 9d78d44d3aac -r 94b7354ef0e0 src/share/vm/compiler/compileBroker.cpp
--- a/src/share/vm/compiler/compileBroker.cpp	Fri Jan 08 17:30:33 2016 +0100
+++ b/src/share/vm/compiler/compileBroker.cpp	Fri Jan 08 22:24:51 2016 +0100
@@ -1746,10 +1746,10 @@
       if (state == _thread_blocked) {
         if (++consecutively_blocked == BLOCKING_JVMCI_COMPILATION_WAIT_TO_UNBLOCK_ATTEMPTS) {
           if (_compilation_log != NULL) {
-            _compilation_log->log_failure(thread, task, "compilation timed out", NULL);
+            _compilation_log->log_failure(thread, task, "wait for blocking compilation timed out", NULL);
           }
           if (PrintCompilation) {
-            task->print_compilation(tty, "compilation timed out");
+            task->print_compilation(tty, "wait for blocking compilation timed out");
           }
           break;
         }
diff -r 9d78d44d3aac -r 94b7354ef0e0 src/share/vm/runtime/compilationPolicy.cpp
--- a/src/share/vm/runtime/compilationPolicy.cpp	Fri Jan 08 17:30:33 2016 +0100
+++ b/src/share/vm/runtime/compilationPolicy.cpp	Fri Jan 08 22:24:51 2016 +0100
@@ -353,8 +353,11 @@
 }
 
 CompileTask* NonTieredCompPolicy::select_task(CompileQueue* compile_queue) {
-  COMPILERJVMCI_PRESENT(return select_task_blocking_aware(compile_queue);)
+#ifdef COMPILERJVMCI
+  return select_task_blocking_aware(compile_queue);
+#else
   return compile_queue->first();
+#endif
 }
 
 bool NonTieredCompPolicy::is_mature(Method* method) {
diff -r 9d78d44d3aac -r 94b7354ef0e0 src/share/vm/runtime/simpleThresholdPolicy.cpp
--- a/src/share/vm/runtime/simpleThresholdPolicy.cpp	Fri Jan 08 17:30:33 2016 +0100
+++ b/src/share/vm/runtime/simpleThresholdPolicy.cpp	Fri Jan 08 22:24:51 2016 +0100
@@ -168,8 +168,11 @@
 
 // Called with the queue locked and with at least one element
 CompileTask* SimpleThresholdPolicy::select_task(CompileQueue* compile_queue) {
-  COMPILERJVMCI_PRESENT(return select_task_blocking_aware(compile_queue);)
+#ifdef COMPILERJVMCI
+  return select_task_blocking_aware(compile_queue);
+#else
   return compile_queue->first();
+#endif
 }
 
 void SimpleThresholdPolicy::reprofile(ScopeDesc* trap_scope, bool is_osr) {