Mercurial > hg > graal-jvmci-8
diff src/share/vm/opto/library_call.cpp @ 14726:92aa6797d639
Backed out merge changeset: b51e29501f30
Backed out merge revision to its first parent (8f483e200405)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 24 Mar 2014 21:30:43 +0100 |
| parents | 2edca307b15a |
| children |
line wrap: on
line diff
--- a/src/share/vm/opto/library_call.cpp Fri Mar 21 16:36:59 2014 -0700 +++ b/src/share/vm/opto/library_call.cpp Mon Mar 24 21:30:43 2014 +0100 @@ -3180,8 +3180,7 @@ // private native boolean java.lang.Thread.isInterrupted(boolean ClearInterrupted); bool LibraryCallKit::inline_native_isInterrupted() { // Add a fast path to t.isInterrupted(clear_int): - // (t == Thread.current() && - // (!TLS._osthread._interrupted || WINDOWS_ONLY(false) NOT_WINDOWS(!clear_int))) + // (t == Thread.current() && (!TLS._osthread._interrupted || !clear_int)) // ? TLS._osthread._interrupted : /*slow path:*/ t.isInterrupted(clear_int) // So, in the common case that the interrupt bit is false, // we avoid making a call into the VM. Even if the interrupt bit @@ -3238,7 +3237,6 @@ // drop through to next case set_control( _gvn.transform(new (C) IfTrueNode(iff_bit))); -#ifndef TARGET_OS_FAMILY_windows // (c) Or, if interrupt bit is set and clear_int is false, use 2nd fast path. Node* clr_arg = argument(1); Node* cmp_arg = _gvn.transform(new (C) CmpINode(clr_arg, intcon(0))); @@ -3252,10 +3250,6 @@ // drop through to next case set_control( _gvn.transform(new (C) IfTrueNode(iff_arg))); -#else - // To return true on Windows you must read the _interrupted field - // and check the the event state i.e. take the slow path. -#endif // TARGET_OS_FAMILY_windows // (d) Otherwise, go to the slow path. slow_region->add_req(control());