--- old/src/share/vm/oops/instanceRefKlass.inline.hpp	2017-04-24 15:49:00.589089267 +0200
+++ new/src/share/vm/oops/instanceRefKlass.inline.hpp	2017-04-24 15:49:00.445083606 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@
 
 template <bool nv, typename T, class OopClosureType, class Contains>
 void InstanceRefKlass::oop_oop_iterate_discovery(oop obj, ReferenceType type, OopClosureType* closure, Contains& contains) {
-  log_develop_trace(gc, ref)("Process reference default " PTR_FORMAT, p2i(obj));
+  log_develop_trace(gc, ref)("Process reference with discovery " PTR_FORMAT, p2i(obj));
 
   // Special case for some closures.
   if (closure->apply_to_weak_ref_discovered_field()) {
@@ -108,11 +108,11 @@
   do_referent<nv, T>(obj, closure, contains);
   do_discovered<nv, T>(obj, closure, contains);
   do_next<nv, T>(obj, closure, contains);
-  debug_only(trace_reference_gc("InstanceRefKlass::oop_oop_iterate_fields()",
-                                obj,
-                                (T*)java_lang_ref_Reference::referent_addr(obj),
-                                (T*)java_lang_ref_Reference::next_addr(obj),
-                                (T*)java_lang_ref_Reference::discovered_addr(obj));)
+  trace_reference_gc("InstanceRefKlass::oop_oop_iterate_fields()",
+                     obj,
+                     (T*)java_lang_ref_Reference::referent_addr(obj),
+                     (T*)java_lang_ref_Reference::next_addr(obj),
+                     (T*)java_lang_ref_Reference::discovered_addr(obj));
 }
 
 template <bool nv, typename T, class OopClosureType, class Contains>