--- old/src/hotspot/share/ci/ciEnv.cpp	2017-10-15 23:58:58.416581939 +0200
+++ new/src/hotspot/share/ci/ciEnv.cpp	2017-10-15 23:58:58.082581017 +0200
@@ -1218,12 +1218,12 @@
                 method->signature()->as_quoted_ascii(),
                 entry_bci, comp_level);
   if (compiler_data() != NULL) {
-    if (is_c2_compile(comp_level)) { // C2
+    if (is_c2_compile(comp_level)) {
 #ifdef COMPILER2
       // Dump C2 inlining data.
       ((Compile*)compiler_data())->dump_inline_data(out);
 #endif
-    } else if (is_c1_compile(comp_level)) { // C1
+    } else if (is_c1_compile(comp_level)) {
 #ifdef COMPILER1
       // Dump C1 inlining data.
       ((Compilation*)compiler_data())->dump_inline_data(out);
--- old/src/hotspot/share/compiler/compileBroker.cpp	2017-10-15 23:58:59.165584008 +0200
+++ new/src/hotspot/share/compiler/compileBroker.cpp	2017-10-15 23:58:58.855583152 +0200
@@ -785,7 +785,6 @@
     // Create a name for our thread.
     sprintf(name_buffer, "%s CompilerThread%d", _compilers[1]->name(), i);
     CompilerCounters* counters = new CompilerCounters();
-    // C2
     make_thread(name_buffer, _c2_compile_queue, counters, _compilers[1], compiler_thread, CHECK);
   }
 
--- old/test/hotspot/jtreg/compiler/whitebox/CompilerWhiteBoxTest.java	2017-10-15 23:58:59.944586160 +0200
+++ new/test/hotspot/jtreg/compiler/whitebox/CompilerWhiteBoxTest.java	2017-10-15 23:58:59.617585257 +0200
@@ -51,7 +51,7 @@
     public static final int COMP_LEVEL_LIMITED_PROFILE = 2;
     /** {@code CompLevel::CompLevel_full_profile} -- C1, invocation & backedge counters + mdo */
     public static final int COMP_LEVEL_FULL_PROFILE = 3;
-    /** {@code CompLevel::CompLevel_full_optimization} -- C2 or Shark */
+    /** {@code CompLevel::CompLevel_full_optimization} -- C2 */
     public static final int COMP_LEVEL_FULL_OPTIMIZATION = 4;
     /** Maximal value for CompLevel */
     public static final int COMP_LEVEL_MAX = COMP_LEVEL_FULL_OPTIMIZATION;