--- old/src/hotspot/share/jvmci/jvmciEnv.cpp	2018-03-08 13:54:06.343388025 -0500
+++ new/src/hotspot/share/jvmci/jvmciEnv.cpp	2018-03-08 13:54:05.783485687 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -150,7 +150,7 @@
   if (found_klass == NULL && !cpool.is_null() && cpool->has_preresolution()) {
     // Look inside the constant pool for pre-resolved class entries.
     for (int i = cpool->length() - 1; i >= 1; i--) {
-      if (cpool->tag_at(i).is_klass() || cpool->tag_at(i).is_value_type()) {
+      if (cpool->tag_at(i).is_klass()) {
         Klass*  kls = cpool->resolved_klass_at(i);
         if (kls->name() == sym) {
           return kls;