--- a/hotspot/src/share/vm/runtime/arguments.cpp	Wed Nov 11 14:40:38 2015 -1000
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Wed Nov 11 16:32:17 2015 -1000
@@ -456,7 +456,7 @@
   return flag_name;
 }
 
-#ifndef PRODUCT
+#ifdef ASSERT
 static bool lookup_special_flag(const char *flag_name, size_t skip_index) {
   for (size_t i = 0; special_jvm_flags[i].name != NULL; i++) {
     if ((i != skip_index) && (strcmp(special_jvm_flags[i].name, flag_name) == 0)) {