author | coleenp |
Tue, 19 Mar 2019 14:22:47 -0400 | |
changeset 54196 | 6146ab937899 |
parent 53924 | test/hotspot/jtreg/runtime/RedefineTests/RedefineDeleteJmethod.java@09cba396916f |
child 54585 | 3452d108d06d |
permissions | -rw-r--r-- |
53924
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
1 |
/* |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
2 |
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
4 |
* |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
8 |
* |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
13 |
* accompanied this code). |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
14 |
* |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
18 |
* |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
21 |
* questions. |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
22 |
*/ |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
23 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
24 |
/* |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
25 |
* @test |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
26 |
* @bug 8181171 |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
27 |
* @summary Test deleting static method pointing to by a jmethod |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
28 |
* @library /test/lib |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
29 |
* @modules java.base/jdk.internal.misc |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
30 |
* @modules java.compiler |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
31 |
* java.instrument |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
32 |
* jdk.jartool/sun.tools.jar |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
33 |
* @run main RedefineClassHelper |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
34 |
* @run main/native/othervm -javaagent:redefineagent.jar -Xlog:redefine+class*=trace RedefineDeleteJmethod |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
35 |
*/ |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
36 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
37 |
class B { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
38 |
private static int deleteMe() { System.out.println("deleteMe called"); return 5; } |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
39 |
public static int callDeleteMe() { return deleteMe(); } |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
40 |
} |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
41 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
42 |
public class RedefineDeleteJmethod { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
43 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
44 |
public static String newB = |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
45 |
"class B {" + |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
46 |
"public static int callDeleteMe() { return 6; }" + |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
47 |
"}"; |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
48 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
49 |
public static String newerB = |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
50 |
"class B {" + |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
51 |
"private static int deleteMe() { System.out.println(\"deleteMe (2) called\"); return 7; }" + |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
52 |
"public static int callDeleteMe() { return deleteMe(); }" + |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
53 |
"}"; |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
54 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
55 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
56 |
static { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
57 |
System.loadLibrary("RedefineDeleteJmethod"); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
58 |
} |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
59 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
60 |
static native int jniCallDeleteMe(); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
61 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
62 |
static void test(int expected, boolean nsme_expected) throws Exception { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
63 |
// Call through static method |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
64 |
int res = B.callDeleteMe(); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
65 |
System.out.println("Result = " + res); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
66 |
if (res != expected) { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
67 |
throw new Error("returned " + res + " expected " + expected); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
68 |
} |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
69 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
70 |
// Call through jmethodID, saved from first call. |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
71 |
try { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
72 |
res = jniCallDeleteMe(); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
73 |
if (nsme_expected) { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
74 |
throw new RuntimeException("Failed, NoSuchMethodError expected"); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
75 |
} |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
76 |
if (res != expected) { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
77 |
throw new Error("returned " + res + " expected " + expected); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
78 |
} |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
79 |
} catch (NoSuchMethodError ex) { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
80 |
if (!nsme_expected) { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
81 |
throw new RuntimeException("Failed, NoSuchMethodError not expected"); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
82 |
} |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
83 |
System.out.println("Passed, NoSuchMethodError expected"); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
84 |
} |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
85 |
} |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
86 |
|
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
87 |
public static void main(String[] args) throws Exception { |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
88 |
test(5, false); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
89 |
RedefineClassHelper.redefineClass(B.class, newB); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
90 |
test(6, true); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
91 |
RedefineClassHelper.redefineClass(B.class, newerB); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
92 |
test(7, true); |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
93 |
} |
09cba396916f
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
coleenp
parents:
diff
changeset
|
94 |
} |