OpenJDK / jdk / jdk

changeset 27744:602796878bbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Thu, 13 Nov 2014 16:11:01 -0800
parents 82f4cb44b2d7 27976836d1e1
children 4918f8cda45d 3c39416995e5 0c0ccfb397f7
files
diffstat 4 files changed, 336 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c	Wed Jul 05 20:07:55 2017 +0200
+++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c	Thu Nov 13 16:11:01 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. 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
@@ -45,7 +45,7 @@
 
 static volatile struct PacketList *cmdQueue;
 static jrawMonitorID cmdQueueLock;
-static jrawMonitorID resumeLock;
+static jrawMonitorID vmDeathLock;
 static jboolean transportError;
 
 static jboolean
@@ -60,28 +60,17 @@
     }
 }
 
-static jboolean
-resumeCommand(jdwpCmdPacket *cmd)
-{
-    if ( (cmd->cmdSet == JDWP_COMMAND_SET(VirtualMachine)) &&
-         (cmd->cmd == JDWP_COMMAND(VirtualMachine, Resume)) ) {
-        return JNI_TRUE;
-    } else {
-        return JNI_FALSE;
-    }
-}
-
 void
 debugLoop_initialize(void)
 {
-    resumeLock = debugMonitorCreate("JDWP Resume Lock");
+    vmDeathLock = debugMonitorCreate("JDWP VM_DEATH Lock");
 }
 
 void
 debugLoop_sync(void)
 {
-    debugMonitorEnter(resumeLock);
-    debugMonitorExit(resumeLock);
+    debugMonitorEnter(vmDeathLock);
+    debugMonitorExit(vmDeathLock);
 }
 
 /*
@@ -136,14 +125,14 @@
             jboolean replyToSender = JNI_TRUE;
 
             /*
-             * For VirtualMachine.Resume commands we hold the resumeLock
+             * For VirtualMachine commands we hold the vmDeathLock
              * while executing and replying to the command. This ensures
-             * that a Resume after VM_DEATH will be allowed to complete
+             * that a VM command after VM_DEATH will be allowed to complete
              * before the thread posting the VM_DEATH continues VM
              * termination.
              */
-            if (resumeCommand(cmd)) {
-                debugMonitorEnter(resumeLock);
+            if (cmd->cmdSet == JDWP_COMMAND_SET(VirtualMachine)){
+                debugMonitorEnter(vmDeathLock);
             }
 
             /* Initialize the input and output streams */
@@ -181,10 +170,10 @@
             }
 
             /*
-             * Release the resumeLock as the reply has been posted.
+             * Release the vmDeathLock as the reply has been posted.
              */
-            if (resumeCommand(cmd)) {
-                debugMonitorExit(resumeLock);
+            if (cmd->cmdSet == JDWP_COMMAND_SET(VirtualMachine)){
+               debugMonitorExit(vmDeathLock);
             }
 
             inStream_destroy(&in);
--- a/jdk/test/java/lang/reflect/Parameter/BadClassFiles.java	Wed Jul 05 20:07:55 2017 +0200
+++ b/jdk/test/java/lang/reflect/Parameter/BadClassFiles.java	Thu Nov 13 16:11:01 2014 -0800
@@ -81,10 +81,23 @@
         0,25,0,0,0,3,0,0,
         0,1,-79,0,0,0,1,0,
         7,0,0,0,6,0,1,0,
-        0,0,2,0,10,0,0,0,
-        9,2,0,11,0,0,0,12,
-        0,0,0,1,0,13,0,0,
-        0,2,0,14
+        0,0,2,
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,9,
+        // parameter_count
+        2,
+        // first parameter name
+        0,11,
+        // first parameter modifiers
+        0,0,
+        // second parameter name
+        0,12,
+        // second parameter modifiers
+        0,0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
     };
 
     private static final byte[] BadModifiers_bytes = {
@@ -121,10 +134,23 @@
         25,0,0,0,3,0,0,0,
         1,-79,0,0,0,1,0,7,
         0,0,0,6,0,1,0,0,
-        0,2,0,10,0,0,0,9,
-        2,0,11,0,51,51,12,0,
-        0,0,1,0,13,0,0,0,
-        2,0,14
+        0,2,
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,9,
+        // parameter_count
+        2,
+        // first parameter name
+        0,11,
+        // first parameter modifiers
+        51,51,
+        // second parameter name
+        0,12,
+        // second parameter modifiers
+        0,0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
     };
 
     private static final byte[] BadNameIndex_bytes = {
@@ -161,10 +187,23 @@
         25,0,0,0,3,0,0,0,
         1,-79,0,0,0,1,0,7,
         0,0,0,6,0,1,0,0,
-        0,2,0,10,0,0,0,9,
-        2,0,1,0,0,0,12,0,
-        0,0,1,0,13,0,0,0,
-        2,0,14
+        0,2,
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,9,
+        // parameter_count
+        2,
+        // first parameter name
+        0,1,
+        // first parameter modifiers
+        0,0,
+        // second parameter name
+        0,12,
+        // second parameter modifiers
+        0,0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
     };
 
     private static final byte[] NameIndexOutOfBounds_bytes = {
@@ -203,11 +242,23 @@
         25,0,0,0,3,0,0,0,
         1,-79,0,0,0,1,0,7,
         0,0,0,6,0,1,0,0,
-        0,2,0,10,0,0,0,9,
-        2,0,-1,0,0,0,12,0,
-        0,0,1,0,13,0,0,0,
-        2,0,14
-
+        0,2,
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,9,
+        // parameter_count
+        2,
+        // first parameter name
+        0,-1,
+        // first parameter modifiers
+        0,0,
+        // second parameter name
+        0,12,
+        // second parameter modifiers
+        0,0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
     };
 
     private static final byte[] ExtraParams_bytes = {
@@ -244,10 +295,26 @@
         0,0,3,0,0,0,1,-79,
         0,0,0,1,0,7,0,0,
         0,6,0,1,0,0,0,2,
-        0,10,0,0,0,13,3,0,
-        11,0,0,0,12,0,0,0,
-        11,0,0,0,1,0,13,0,
-        0,0,2,0,14
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,13,
+        // parameter_count
+        3,
+        // first parameter name
+        0,11,
+        // first parameter modifiers
+        0,0,
+        // second parameter name
+        0,12,
+        // second parameter modifiers
+        0,0,
+        // third parameter name
+        0,11,
+        // third parameter modifiers
+        0,0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
     };
 
     private static final byte[] BadName1_bytes = {
@@ -283,10 +350,23 @@
         25,0,0,0,3,0,0,0,
         1,-79,0,0,0,1,0,7,
         0,0,0,6,0,1,0,0,
-        0,2,0,10,0,0,0,9,
-        2,0,11,0,0,0,12,0,
-        0,0,1,0,13,0,0,0,
-        2,0,14
+        0,2,
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,9,
+        // parameter_count
+        2,
+        // first parameter name
+        0,11,
+        // first parameter modifiers
+        0,0,
+        // second parameter name
+        0,12,
+        // second parameter modifiers
+        0,0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
     };
 
     private static final byte[] BadName2_bytes = {
@@ -322,10 +402,23 @@
         25,0,0,0,3,0,0,0,
         1,-79,0,0,0,1,0,7,
         0,0,0,6,0,1,0,0,
-        0,2,0,10,0,0,0,9,
-        2,0,11,0,0,0,12,0,
-        0,0,1,0,13,0,0,0,
-        2,0,14
+        0,2,
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,9,
+        // parameter_count
+        2,
+        // first parameter name
+        0,11,
+        // first parameter modifiers
+        0,0,
+        // second parameter name
+        0,12,
+        // second parameter modifiers
+        0,0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
     };
 
     private static final byte[] BadName3_bytes = {
@@ -361,10 +454,23 @@
         25,0,0,0,3,0,0,0,
         1,-79,0,0,0,1,0,7,
         0,0,0,6,0,1,0,0,
-        0,2,0,10,0,0,0,9,
-        2,0,11,0,0,0,12,0,
-        0,0,1,0,13,0,0,0,
-        2,0,14
+        0,2,
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,9,
+        // parameter_count
+        2,
+        // first parameter name
+        0,11,
+        // first parameter modifiers
+        0,0,
+        // second parameter name
+        0,12,
+        // second parameter modifiers
+        0,0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
     };
 
     private static final byte[] BadName4_bytes = {
@@ -400,10 +506,68 @@
         25,0,0,0,3,0,0,0,
         1,-79,0,0,0,1,0,7,
         0,0,0,6,0,1,0,0,
-        0,2,0,10,0,0,0,9,
-        2,0,11,0,0,0,12,0,
-        0,0,1,0,13,0,0,0,
-        2,0,14
+        0,2,
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,9,
+        // parameter_count
+        2,
+        // first parameter name
+        0,11,
+        // first parameter modifiers
+        0,0,
+        // second parameter name
+        0,12,
+        // second parameter modifiers
+        0,0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
+    };
+
+    private static final byte[] BadParams_bytes = {
+        -54,-2,-70,-66,0,0,0,
+        52,0,18,10,0,3,0,15,
+        7,0,16,7,0,17,1,0,6,
+        60,105,110,105,116,62,
+        1,0,3,40,41,86,1,0,4,
+        67,111,100,101,1,0,15,
+        76,105,110,101,78,117,
+        109,98,101,114,84,97,
+        98,108,101,1,0,1,109,
+        1,0,5,40,73,73,41,86,
+        1,0,16,77,101,116,104,
+        111,100,80,97,114,97,
+        109,101,116,101,114,115,
+        1,0,1,97,1,0,1,98,1,
+        0,10,83,111,117,114,
+        99,101,70,105,108,101,
+        1,0,14,66,97,100,80,97,
+        114,97,109,115,46,106,
+        97,118,97,12,0,4,0,5,
+        1,0,9,66,97,100,80,97,
+        114,97,109,115,1,0,16,
+        106,97,118,97,47,108,97,
+        110,103,47,79,98,106,
+        101,99,116,0,33,0,
+        2,0,3,0,0,0,0,0,2,
+        0,1,0,4,0,5,0,1,0,
+        6,0,0,0,29,0,1,0,1,
+        0,0,0,5,42,-73,0,1,
+        -79,0,0,0,1,0,7,0,0,
+        0,6,0,1,0,0,0,1,0,1,
+        0,8,0,9,0,2,0,6,0,0,
+        0,25,0,0,0,3,0,0,0,1,
+        -79,0,0,0,1,0,7,0,0,
+        0,6,0,1,0,0,0,2,
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,1,
+        // parameter_count
+        0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
     };
 
     private static class InMemoryClassLoader extends ClassLoader {
@@ -423,6 +587,7 @@
             loader.defineClass("BadNameIndex", BadNameIndex_bytes),
             loader.defineClass("NameIndexOutOfBounds", NameIndexOutOfBounds_bytes),
             loader.defineClass("ExtraParams", ExtraParams_bytes),
+            loader.defineClass("BadParams", BadParams_bytes),
             // Name with .
             loader.defineClass("BadName1", BadName1_bytes),
             // Name with [
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/reflect/Parameter/NoName.java	Thu Nov 13 16:11:01 2014 -0800
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @run main NoName
+ * @summary The reflection API should report parameters with no name properly.
+ */
+import java.lang.Class;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.lang.reflect.MalformedParametersException;
+import java.lang.ClassLoader;
+import java.lang.ClassNotFoundException;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class NoName {
+
+    private static final byte[] NoName_bytes = {
+        -54,-2,-70,-66,0,0,0,52,
+        0,18,10,0,3,0,15,7,
+        0,16,7,0,17,1,0,6,
+        60,105,110,105,116,62,1,0,
+        3,40,41,86,1,0,4,67,
+        111,100,101,1,0,15,76,105,
+        110,101,78,117,109,98,101,114,
+        84,97,98,108,101,1,0,1,
+        109,1,0,5,40,73,73,41,
+        86,1,0,16,77,101,116,104,
+        111,100,80,97,114,97,109,101,
+        116,101,114,115,1,0,0,1,
+        0,1,98,1,0,10,83,111,
+        117,114,99,101,70,105,108,101,
+        1,0,14,69,109,112,116,121,
+        78,97,109,101,46,106,97,118,
+        97,12,0,4,0,5,1,0,
+        9,69,109,112,116,121,78,97,
+        109,101,1,0,16,106,97,118,
+        97,47,108,97,110,103,47,79,
+        98,106,101,99,116,0,33,0,
+        2,0,3,0,0,0,0,0,
+        2,0,1,0,4,0,5,0,
+        1,0,6,0,0,0,29,0,
+        1,0,1,0,0,0,5,42,
+        -73,0,1,-79,0,0,0,1,
+        0,7,0,0,0,6,0,1,
+        0,0,0,1,0,1,0,8,
+        0,9,0,2,0,6,0,0,
+        0,25,0,0,0,3,0,0,
+        0,1,-79,0,0,0,1,0,
+        7,0,0,0,6,0,1,0,
+        0,0,2,
+        // Method Parameters attribute here
+        0,10,
+        // attribute_length
+        0,0,0,9,
+        // parameter_count
+        2,
+        // first parameter name
+        0,0,
+        // first parameter modifiers
+        0,0,
+        // second parameter name
+        0,12,
+        // second parameter modifiers
+        0,0,
+        // end attribute
+        0,1,0,13,0,0,0,2,0,14
+    };
+
+    private static class InMemoryClassLoader extends ClassLoader {
+        public Class<?> defineClass(String name, byte[] b) {
+            return defineClass(name, b, 0, b.length);
+        }
+    };
+
+    private static final InMemoryClassLoader loader = new InMemoryClassLoader();
+
+    private final Class<?> noName;
+
+    private NoName() throws ClassNotFoundException {
+        noName = loader.defineClass("EmptyName", NoName_bytes);
+    }
+
+    public static void main(String... args)
+        throws NoSuchMethodException, IOException, ClassNotFoundException {
+        new NoName().run();
+    }
+
+    public void run() throws NoSuchMethodException {
+        final Class<?> cls = noName;
+        System.err.println("Trying " + cls);
+        final Method method = cls.getMethod("m", int.class, int.class);
+        final Parameter[] params = method.getParameters();
+        System.err.println("Name " + params[0].getName());
+        System.err.println("Name " + params[1].getName());
+    }
+
+}
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java	Wed Jul 05 20:07:55 2017 +0200
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java	Thu Nov 13 16:11:01 2014 -0800
@@ -128,8 +128,7 @@
      */
     private static final Pattern useGcPattern = Pattern.compile(
             "(?:\\-XX\\:[\\+\\-]Use.+GC)"
-            + "|(?:\\-Xconcgc)"
-            + "|(?:\\-Xincgc)");
+            + "|(?:\\-Xconcgc)");
     public static List<String> removeGcOpts(List<String> opts) {
         List<String> optsWithoutGC = new ArrayList<String>();
         for (String opt : opts) {
© 2007, 2021 Oracle and/or its affiliates
Terms of Use · Privacy · Trademarks