--- a/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp	Tue Jan 19 12:07:32 2016 +0100
+++ b/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp	Mon Feb 01 22:11:16 2016 +0100
@@ -414,7 +414,7 @@
 }
 
 void ParScanThreadStateSet::print_taskqueue_stats() {
-  if (!develop_log_is_enabled(Trace, gc, task, stats)) {
+  if (!log_develop_is_enabled(Trace, gc, task, stats)) {
     return;
   }
   LogHandle(gc, task, stats) log;

--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Tue Jan 19 12:07:32 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Mon Feb 01 22:11:16 2016 +0100
@@ -3141,7 +3141,7 @@
 }
 
 void G1CollectedHeap::print_taskqueue_stats() const {
-  if (!develop_log_is_enabled(Trace, gc, task, stats)) {
+  if (!log_develop_is_enabled(Trace, gc, task, stats)) {
     return;
   }
   LogHandle(gc, task, stats) log;

--- a/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp	Tue Jan 19 12:07:32 2016 +0100
+++ b/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp	Mon Feb 01 22:11:16 2016 +0100
@@ -195,7 +195,7 @@
 };
 
 void PSParallelCompact::print_region_ranges() {
-  if (!develop_log_is_enabled(Trace, gc, compaction, phases)) {
+  if (!log_develop_is_enabled(Trace, gc, compaction, phases)) {
     return;
   }
   LogHandle(gc, compaction, phases) log;
@@ -265,7 +265,7 @@
 print_generic_summary_data(ParallelCompactData& summary_data,
                            SpaceInfo* space_info)
 {
-  if (!develop_log_is_enabled(Trace, gc, compaction, phases)) {
+  if (!log_develop_is_enabled(Trace, gc, compaction, phases)) {
     return;
   }
 
@@ -360,7 +360,7 @@
 void
 print_initial_summary_data(ParallelCompactData& summary_data,
                            SpaceInfo* space_info) {
-  if (!develop_log_is_enabled(Trace, gc, compaction, phases)) {
+  if (!log_develop_is_enabled(Trace, gc, compaction, phases)) {
     return;
   }
 
@@ -641,7 +641,7 @@
   *target_next = split_destination + partial_obj_size;
   HeapWord* const source_next = region_to_addr(split_region) + partial_obj_size;
 
-  if (develop_log_is_enabled(Trace, gc, compaction, phases)) {
+  if (log_develop_is_enabled(Trace, gc, compaction, phases)) {
     const char * split_type = partial_obj_size == 0 ? "easy" : "hard";
     log_develop_trace(gc, compaction, phases)("%s split:  src=" PTR_FORMAT " src_c=" SIZE_FORMAT " pos=" SIZE_FORMAT,
                                               split_type, p2i(source_next), split_region, partial_obj_size);
@@ -1535,7 +1535,7 @@
     }
   }
 
-  if (develop_log_is_enabled(Trace, gc, compaction, phases)) {
+  if (log_develop_is_enabled(Trace, gc, compaction, phases)) {
     const size_t region_size = ParallelCompactData::RegionSize;
     HeapWord* const dense_prefix_end = _space_info[id].dense_prefix();
     const size_t dp_region = _summary_data.addr_to_region_idx(dense_prefix_end);
@@ -2190,7 +2190,7 @@
   bool _enabled;
   size_t _total_regions;
 public:
-  FillableRegionLogger() : _next_index(0), _total_regions(0), _enabled(develop_log_is_enabled(Trace, gc, compaction)) { }
+  FillableRegionLogger() : _next_index(0), _total_regions(0), _enabled(log_develop_is_enabled(Trace, gc, compaction)) { }
   ~FillableRegionLogger() {
     log.trace(SIZE_FORMAT " initially fillable regions", _total_regions);
   }
@@ -2381,7 +2381,7 @@
 // region.
 void PSParallelCompact::write_block_fill_histogram()
 {
-  if (!develop_log_is_enabled(Trace, gc, compaction)) {
+  if (!log_develop_is_enabled(Trace, gc, compaction)) {
     return;
   }
 

--- a/hotspot/src/share/vm/gc/parallel/psPromotionManager.cpp	Tue Jan 19 12:07:32 2016 +0100
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionManager.cpp	Mon Feb 01 22:11:16 2016 +0100
@@ -130,7 +130,7 @@
 
 void
 PSPromotionManager::print_taskqueue_stats() {
-  if (!develop_log_is_enabled(Trace, gc, task, stats)) {
+  if (!log_develop_is_enabled(Trace, gc, task, stats)) {
     return;
   }
   LogHandle(gc, task, stats) log;

--- a/hotspot/src/share/vm/gc/parallel/psPromotionManager.inline.hpp	Tue Jan 19 12:07:32 2016 +0100
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionManager.inline.hpp	Mon Feb 01 22:11:16 2016 +0100
@@ -284,7 +284,7 @@
 
   // This code must come after the CAS test, or it will print incorrect
   // information.
-  if (develop_log_is_enabled(Trace, gc, scavenge) && o->is_forwarded()) {
+  if (log_develop_is_enabled(Trace, gc, scavenge) && o->is_forwarded()) {
     log_develop_trace(gc, scavenge)("{%s %s " PTR_FORMAT " -> " PTR_FORMAT " (%d)}",
                       "forwarding",
                       new_obj->klass()->internal_name(), p2i((void *)o), p2i((void *)new_obj), new_obj->size());

--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Tue Jan 19 12:07:32 2016 +0100
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Mon Feb 01 22:11:16 2016 +0100
@@ -763,7 +763,7 @@
   if (cp_cache_entry->is_resolved(bytecode)) return;
 
   if (bytecode == Bytecodes::_invokeinterface) {
-    if (develop_log_is_enabled(Trace, itables)) {
+    if (log_develop_is_enabled(Trace, itables)) {
       ResourceMark rm(thread);
       log_develop_trace(itables)("Resolving: klass: %s to method: %s",
                                  info.resolved_klass()->name()->as_C_string(),

--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp	Tue Jan 19 12:07:32 2016 +0100
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp	Mon Feb 01 22:11:16 2016 +0100
@@ -816,7 +816,7 @@
     THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
   }
 
-  if (develop_log_is_enabled(Trace, itables)) {
+  if (log_develop_is_enabled(Trace, itables)) {
     trace_method_resolution("invokeinterface resolved method: caller-class",
                             link_info.current_klass(), resolved_klass,
                             resolved_method, true);
@@ -1064,7 +1064,7 @@
     THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
   }
 
-  if (develop_log_is_enabled(Trace, itables)) {
+  if (log_develop_is_enabled(Trace, itables)) {
     trace_method_resolution("invokespecial resolved method: caller-class:",
                             current_klass, resolved_klass, resolved_method, true);
   }
@@ -1135,7 +1135,7 @@
                                                sel_method->signature()));
   }
 
-  if (develop_log_is_enabled(Trace, itables)) {
+  if (log_develop_is_enabled(Trace, itables)) {
     trace_method_resolution("invokespecial selected method: resolved-class:",
                             resolved_klass, resolved_klass, sel_method, true);
   }
@@ -1188,7 +1188,7 @@
     THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
   }
 
-  if (develop_log_is_enabled(Trace, vtables)) {
+  if (log_develop_is_enabled(Trace, vtables)) {
     trace_method_resolution("invokevirtual resolved method: caller-class:",
                             current_klass, resolved_klass, resolved_method, false);
   }
@@ -1264,7 +1264,7 @@
                                                       selected_method->signature()));
   }
 
-  if (develop_log_is_enabled(Trace, vtables)) {
+  if (log_develop_is_enabled(Trace, vtables)) {
     trace_method_resolution("invokevirtual selected method: receiver-class:",
                             recv_klass, resolved_klass, selected_method,
                             false, vtable_index);
@@ -1363,7 +1363,7 @@
                                                       sel_method->signature()));
   }
 
-  if (develop_log_is_enabled(Trace, itables)) {
+  if (log_develop_is_enabled(Trace, itables)) {
     trace_method_resolution("invokeinterface selected method: receiver-class",
                             recv_klass, resolved_klass, sel_method, true);
   }

--- a/hotspot/src/share/vm/logging/log.hpp	Tue Jan 19 12:07:32 2016 +0100
+++ b/hotspot/src/share/vm/logging/log.hpp	Mon Feb 01 22:11:16 2016 +0100
@@ -57,13 +57,13 @@
 #define log_develop_info(...)  (!log_is_enabled(Info, __VA_ARGS__))   ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Info>
 #define log_develop_debug(...) (!log_is_enabled(Debug, __VA_ARGS__)) ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Debug>
 #define log_develop_trace(...) (!log_is_enabled(Trace, __VA_ARGS__))  ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Trace>
-#define develop_log_is_enabled(level, ...)  log_is_enabled(level, __VA_ARGS__)
+#define log_develop_is_enabled(level, ...)  log_is_enabled(level, __VA_ARGS__)
 #else
 #define DUMMY_ARGUMENT_CONSUMER(...)
 #define log_develop_info(...)  DUMMY_ARGUMENT_CONSUMER
 #define log_develop_debug(...) DUMMY_ARGUMENT_CONSUMER
 #define log_develop_trace(...) DUMMY_ARGUMENT_CONSUMER
-#define develop_log_is_enabled(...)  false
+#define log_develop_is_enabled(...)  false
 #endif
 
 // Convenience macro to test if the logging is enabled on the specified level for given tags.

--- a/hotspot/src/share/vm/memory/metaspace.cpp	Tue Jan 19 12:07:32 2016 +0100
+++ b/hotspot/src/share/vm/memory/metaspace.cpp	Mon Feb 01 22:11:16 2016 +0100
@@ -1234,7 +1234,7 @@
 #ifdef ASSERT
   new_entry->mangle();
 #endif
-  if (develop_log_is_enabled(Trace, gc, metaspace)) {
+  if (log_develop_is_enabled(Trace, gc, metaspace)) {
     LogHandle(gc, metaspace) log;
     VirtualSpaceNode* vsl = current_virtual_space();
     ResourceMark rm;
@@ -3051,7 +3051,7 @@
 
   initialize_class_space(metaspace_rs);
 
-  if (develop_log_is_enabled(Trace, gc, metaspace)) {
+  if (log_develop_is_enabled(Trace, gc, metaspace)) {
     LogHandle(gc, metaspace) log;
     ResourceMark rm;
     print_compressed_class_space(log.trace_stream(), requested_addr);

--- a/hotspot/src/share/vm/oops/klassVtable.cpp	Tue Jan 19 12:07:32 2016 +0100
+++ b/hotspot/src/share/vm/oops/klassVtable.cpp	Mon Feb 01 22:11:16 2016 +0100
@@ -135,7 +135,7 @@
     superVtable->verify(tty, true);
 #endif
     superVtable->copy_vtable_to(table());
-    if (develop_log_is_enabled(Trace, vtables)) {
+    if (log_develop_is_enabled(Trace, vtables)) {
       ResourceMark rm;
       log_develop_trace(vtables)("copy vtable from %s to %s size %d",
                                  super->internal_name(), klass()->internal_name(),
@@ -272,7 +272,7 @@
       assert(super_method->name() == name && super_method->signature() == signature, "vtable entry name/sig mismatch");
 #endif
       if (supersuperklass->is_override(super_method, target_loader, target_classname, THREAD)) {
-        if (develop_log_is_enabled(Trace, vtables)) {
+        if (log_develop_is_enabled(Trace, vtables)) {
           ResourceMark rm(THREAD);
           outputStream* logst = LogHandle(vtables)::trace_stream();
           char* sig = target_method()->name_and_sig_as_C_string();
@@ -303,7 +303,7 @@
                         KlassHandle target_klass, Method* super_method,
                         Thread* thread) {
 #ifndef PRODUCT
-  if (develop_log_is_enabled(Trace, vtables)) {
+  if (log_develop_is_enabled(Trace, vtables)) {
     ResourceMark rm(thread);
     outputStream* logst = LogHandle(vtables)::trace_stream();
     char* sig = target_method()->name_and_sig_as_C_string();
@@ -491,7 +491,7 @@
 }
 
 void klassVtable::put_method_at(Method* m, int index) {
-  if (develop_log_is_enabled(Trace, vtables)) {
+  if (log_develop_is_enabled(Trace, vtables)) {
     ResourceMark rm;
     outputStream* logst = LogHandle(vtables)::trace_stream();
     const char* sig = (m != NULL) ? m->name_and_sig_as_C_string() : "<NULL>";
@@ -818,7 +818,7 @@
   get_mirandas(&mirandas, NULL, ik()->super(), ik()->methods(),
                ik()->default_methods(), ik()->local_interfaces());
   for (int i = 0; i < mirandas.length(); i++) {
-    if (develop_log_is_enabled(Trace, vtables)) {
+    if (log_develop_is_enabled(Trace, vtables)) {
       Method* meth = mirandas.at(i);
       ResourceMark rm(Thread::current());
       outputStream* logst = LogHandle(vtables)::trace_stream();
@@ -1043,7 +1043,7 @@
     if (interface_method_needs_itable_index(m)) {
       assert(!m->is_final_method(), "no final interface methods");
       // If m is already assigned a vtable index, do not disturb it.
-      if (develop_log_is_enabled(Trace, itables)) {
+      if (log_develop_is_enabled(Trace, itables)) {
         ResourceMark rm;
         outputStream* logst = LogHandle(itables)::trace_stream();
         assert(m != NULL, "methods can never be null");
@@ -1158,7 +1158,7 @@
       int ime_num = m->itable_index();
       assert(ime_num < ime_count, "oob");
       itableOffsetEntry::method_entry(_klass(), method_table_offset)[ime_num].initialize(target());
-      if (develop_log_is_enabled(Trace, itables)) {
+      if (log_develop_is_enabled(Trace, itables)) {
         ResourceMark rm(THREAD);
         if (target() != NULL) {
           outputStream* logst = LogHandle(itables)::trace_stream();