--- old/src/hotspot/share/prims/methodComparator.cpp	2018-03-08 13:54:24.060138509 -0500
+++ new/src/hotspot/share/prims/methodComparator.cpp	2018-03-08 13:54:23.266354910 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -281,11 +281,9 @@
       return false;
     if (_old_cp->is_pseudo_string_at(cpi_old) || _new_cp->is_pseudo_string_at(cpi_new))
       return (_old_cp->is_pseudo_string_at(cpi_old) == _new_cp->is_pseudo_string_at(cpi_new));
-  } else if (tag_old.is_klass() || tag_old.is_unresolved_klass() ||
-             tag_old.is_value_type() || tag_old.is_unresolved_value_type()) {
+  } else if (tag_old.is_klass() || tag_old.is_unresolved_klass()) {
     // tag_old should be klass - 4881222
-    if (! (tag_new.is_unresolved_klass() || tag_new.is_klass() ||
-           tag_new.is_unresolved_value_type() || tag_new.is_value_type()))
+    if (! (tag_new.is_unresolved_klass() || tag_new.is_klass()))
       return false;
     if (_old_cp->klass_at_noresolve(cpi_old) !=
         _new_cp->klass_at_noresolve(cpi_new))