--- a/src/hotspot/share/gc/g1/g1FullCollector.cpp	Fri Mar 02 10:09:01 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp	Fri Mar 02 10:09:02 2018 +0100
@@ -199,7 +199,8 @@
   scope()->tracer()->report_object_count_after_gc(&_is_alive);
 }
 
-void G1FullCollector::prepare_compaction_common() {
+void G1FullCollector::phase2_prepare_compaction() {
+  GCTraceTime(Info, gc, phases) info("Phase 2: Prepare for compaction", scope()->timer());
   G1FullGCPrepareTask task(this);
   run_task(&task);
 
@@ -209,11 +210,6 @@
   }
 }
 
-void G1FullCollector::phase2_prepare_compaction() {
-  GCTraceTime(Info, gc, phases) info("Phase 2: Prepare for compaction", scope()->timer());
-  prepare_compaction_ext(); // Will call prepare_compaction_common() above.
-}
-
 void G1FullCollector::phase3_adjust_pointers() {
   // Adjust the pointers to reflect the new locations
   GCTraceTime(Info, gc, phases) info("Phase 3: Adjust pointers and remembered sets", scope()->timer());

--- a/src/hotspot/share/gc/g1/g1FullCollector.hpp	Fri Mar 02 10:09:01 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1FullCollector.hpp	Fri Mar 02 10:09:02 2018 +0100
@@ -85,10 +85,6 @@
   void verify_after_marking();
 
   void run_task(AbstractGangTask* task);
-
-  // Prepare compaction extension support.
-  void prepare_compaction_ext();
-  void prepare_compaction_common();
 };
 
 

--- a/src/hotspot/share/gc/g1/g1FullCollector_ext.cpp	Fri Mar 02 10:09:01 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "gc/g1/g1FullCollector.hpp"
-
-void G1FullCollector::prepare_compaction_ext() {
-  prepare_compaction_common();
-}