# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1403862607 -7200
# Node ID fefb82b01d6f34efaed3ec56a27aea4565ee2ce5
# Parent  c6a1215d025b134c82ce7944b2374a15b75e7d32
Make find_method_handle_intrinsic work in Xint mode

diff -r c6a1215d025b -r fefb82b01d6f src/share/vm/classfile/systemDictionary.cpp
--- a/src/share/vm/classfile/systemDictionary.cpp	Tue Jul 01 17:04:39 2014 +0200
+++ b/src/share/vm/classfile/systemDictionary.cpp	Fri Jun 27 11:50:07 2014 +0200
@@ -2286,7 +2286,7 @@
     spe = NULL;
     // Must create lots of stuff here, but outside of the SystemDictionary lock.
     m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty));
-    nmethod* nm = CompileBroker::compile_method(m, InvocationEntryBci, CompLevel_highest_tier,
+    CompileBroker::compile_method(m, InvocationEntryBci, CompLevel_highest_tier,
                                   methodHandle(), CompileThreshold, "MH", CHECK_(empty));
 
     // Now grab the lock.  We might have to throw away the new method,
@@ -2300,11 +2300,11 @@
         spe->set_method(m());
     }
   } else if (spe->method()->code() == NULL) {
-    nmethod* nm = CompileBroker::compile_method(spe->method(), InvocationEntryBci, CompLevel_highest_tier,
+    CompileBroker::compile_method(spe->method(), InvocationEntryBci, CompLevel_highest_tier,
                                       methodHandle(), CompileThreshold, "MH", CHECK_(empty));
   }
 
-  guarantee(spe != NULL && spe->method() != NULL && spe->method()->code() != NULL, "Could not compile a method handle intrinsic");
+  guarantee(spe != NULL && spe->method() != NULL && (!UseCompiler || spe->method()->code() != NULL), "Could not compile a method handle intrinsic");
   return spe->method();
 }