# HG changeset patch
# User kvn
# Date 1242925536 25200
# Node ID aabd393cf1eed966662cca9096f6ec98d0962238
# Parent  27d660246893faaf6851983ce35608f7b3aaab98
6772683: Thread.isInterrupted() fails to return true on multiprocessor PC
Summary: Set the control edge for the field _interrupted load in inline_native_isInterrupted().
Reviewed-by: never

diff -r 27d660246893 -r aabd393cf1ee src/share/vm/opto/library_call.cpp
--- a/src/share/vm/opto/library_call.cpp	Fri May 15 18:14:44 2009 -0700
+++ b/src/share/vm/opto/library_call.cpp	Thu May 21 10:05:36 2009 -0700
@@ -2593,7 +2593,8 @@
   Node* p = basic_plus_adr(top()/*!oop*/, tls_ptr, in_bytes(JavaThread::osthread_offset()));
   Node* osthread = make_load(NULL, p, TypeRawPtr::NOTNULL, T_ADDRESS);
   p = basic_plus_adr(top()/*!oop*/, osthread, in_bytes(OSThread::interrupted_offset()));
-  Node* int_bit = make_load(NULL, p, TypeInt::BOOL, T_INT);
+  // Set the control input on the field _interrupted read to prevent it floating up.
+  Node* int_bit = make_load(control(), p, TypeInt::BOOL, T_INT);
   Node* cmp_bit = _gvn.transform( new (C, 3) CmpINode(int_bit, intcon(0)) );
   Node* bol_bit = _gvn.transform( new (C, 2) BoolNode(cmp_bit, BoolTest::ne) );
 
diff -r 27d660246893 -r aabd393cf1ee test/compiler/6772683/InterruptedTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6772683/InterruptedTest.java	Thu May 21 10:05:36 2009 -0700
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 6772683
+ * @summary Thread.isInterrupted() fails to return true on multiprocessor PC
+ * @run main/othervm InterruptedTest
+ */
+
+public class InterruptedTest {
+
+    public static void main(String[] args) throws Exception {
+        Thread workerThread = new Thread("worker") {
+            public void run() {
+                System.out.println("Worker thread: running...");
+                while (!Thread.currentThread().isInterrupted()) {
+                }
+                System.out.println("Worker thread: bye");
+            }
+        };
+        System.out.println("Main thread: starts a worker thread...");
+        workerThread.start();
+        System.out.println("Main thread: waits at most 5s for the worker thread to die...");
+        workerThread.join(5000); // Wait 5 sec to let run() method to be compiled
+        int ntries = 0;
+        while (workerThread.isAlive() && ntries < 5) {
+            System.out.println("Main thread: interrupts the worker thread...");
+            workerThread.interrupt();
+            if (workerThread.isInterrupted()) {
+                System.out.println("Main thread: worker thread is interrupted");
+            }
+            ntries++;
+            System.out.println("Main thread: waits for the worker thread to die...");
+            workerThread.join(1000); // Wait 1 sec and try again
+        }
+        if (ntries == 5) {
+          System.out.println("Main thread: the worker thread dod not die");
+          System.exit(97);
+        }
+        System.out.println("Main thread: bye");
+    }
+
+}