--- a/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp	Thu Mar 17 10:55:15 2016 -1000
+++ b/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp	Thu Mar 17 16:10:09 2016 -1000
@@ -800,12 +800,9 @@
 
 bool JVMCIRuntime::treat_as_trivial(Method* method) {
   if (_HotSpotJVMCIRuntime_initialized) {
-    oop loader = method->method_holder()->class_loader();
-    if (loader == NULL) {
-      for (int i = 0; i < _trivial_prefixes_count; i++) {
-        if (method->method_holder()->name()->starts_with(_trivial_prefixes[i])) {
-          return true;
-        }
+    for (int i = 0; i < _trivial_prefixes_count; i++) {
+      if (method->method_holder()->name()->starts_with(_trivial_prefixes[i])) {
+        return true;
       }
     }
   }