# HG changeset patch
# User jrose
# Date 1300411758 25200
# Node ID 1a47de5ffbd126989743a8e4c9a83e8af5888637
# Parent  45d01baba33432fe66a1d0f32884d6b65f3719bd
7011865: JSR 292 CTW fails: !THREAD->is_Compiler_thread() failed: Can not load classes with the Compiler thre
Reviewed-by: kvn, never

diff -r 45d01baba334 -r 1a47de5ffbd1 hotspot/src/share/vm/interpreter/linkResolver.cpp
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp	Thu Mar 17 12:08:01 2011 -0700
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp	Thu Mar 17 18:29:18 2011 -0700
@@ -217,7 +217,7 @@
   if (EnableMethodHandles &&
       klass() == SystemDictionary::MethodHandle_klass() &&
       methodOopDesc::is_method_handle_invoke_name(name)) {
-    if (!MethodHandles::enabled()) {
+    if (!THREAD->is_Compiler_thread() && !MethodHandles::enabled()) {
       // Make sure the Java part of the runtime has been booted up.
       klassOop natives = SystemDictionary::MethodHandleNatives_klass();
       if (natives == NULL || instanceKlass::cast(natives)->is_not_initialized()) {