--- old/src/hotspot/share/opto/multnode.cpp	2018-11-06 17:19:59.206505670 +0100
+++ new/src/hotspot/share/opto/multnode.cpp	2018-11-06 17:19:59.046506823 +0100
@@ -33,10 +33,6 @@
 #include "opto/regmask.hpp"
 #include "opto/type.hpp"
 #include "utilities/vmError.hpp"
-#include "utilities/macros.hpp"
-#if INCLUDE_SHENANDOAHGC
-#include "gc/shenandoah/c2/shenandoahSupport.hpp"
-#endif
 
 //=============================================================================
 //------------------------------MultiNode--------------------------------------
--- old/src/hotspot/share/opto/type.cpp	2018-11-06 17:19:59.799501400 +0100
+++ new/src/hotspot/share/opto/type.cpp	2018-11-06 17:19:59.643502523 +0100
@@ -2996,8 +2996,7 @@
           assert(this->isa_instptr(), "must be an instance ptr.");
           _is_ptr_to_narrowoop = false;
         } else if (klass() == ciEnv::current()->Class_klass() &&
-                   _offset >= InstanceMirrorKlass::offset_of_static_fields() &&
-                   !UseShenandoahGC) {
+                   _offset >= InstanceMirrorKlass::offset_of_static_fields()) {
           // Static fields
           assert(o != NULL, "must be constant");
           ciInstanceKlass* k = o->as_instance()->java_lang_Class_klass()->as_instance_klass();