author | jlaskey |
Thu, 21 Jun 2018 08:58:59 -0300 | |
changeset 50695 | 36ca515343e0 |
parent 47216 | 71c04702a3d5 |
permissions | -rw-r--r-- |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
1 |
/* |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
2 |
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
4 |
* |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
10 |
* |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
15 |
* accompanied this code). |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
16 |
* |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
20 |
* |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
23 |
* questions. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
24 |
*/ |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
25 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
26 |
/* |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
27 |
* This file is available under and governed by the GNU General Public |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
28 |
* License version 2 only, as published by the Free Software Foundation. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
29 |
* However, the following notice accompanied the original version of this |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
30 |
* file, and Oracle licenses the original version of this file under the BSD |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
31 |
* license: |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
32 |
*/ |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
33 |
/* |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
34 |
Copyright 2009-2013 Attila Szegedi |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
35 |
|
50695 | 36 |
Redistribution and use in source and binary forms, with or without |
37 |
modification, are permitted provided that the following conditions are |
|
38 |
met: |
|
39 |
* Redistributions of source code must retain the above copyright |
|
40 |
notice, this list of conditions and the following disclaimer. |
|
41 |
* Redistributions in binary form must reproduce the above copyright |
|
42 |
notice, this list of conditions and the following disclaimer in the |
|
43 |
documentation and/or other materials provided with the distribution. |
|
44 |
* Neither the name of the copyright holder nor the names of |
|
45 |
contributors may be used to endorse or promote products derived from |
|
46 |
this software without specific prior written permission. |
|
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
47 |
|
50695 | 48 |
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS |
49 |
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
|
50 |
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A |
|
51 |
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER |
|
52 |
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
53 |
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
54 |
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR |
|
55 |
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
|
56 |
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
|
57 |
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
|
58 |
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
59 |
*/ |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
60 |
|
34447
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33337
diff
changeset
|
61 |
package jdk.dynalink.beans; |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
62 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
63 |
import java.lang.invoke.MethodHandle; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
64 |
import java.lang.invoke.MethodHandles; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
65 |
import java.lang.invoke.MethodType; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
66 |
import java.lang.reflect.Array; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
67 |
import java.util.StringTokenizer; |
34447
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33337
diff
changeset
|
68 |
import jdk.dynalink.CallSiteDescriptor; |
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33337
diff
changeset
|
69 |
import jdk.dynalink.linker.LinkerServices; |
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33337
diff
changeset
|
70 |
import jdk.dynalink.linker.support.Guards; |
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33337
diff
changeset
|
71 |
import jdk.dynalink.linker.support.Lookup; |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
72 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
73 |
/** |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
74 |
* Base class for dynamic methods that dispatch to a single target Java method or constructor. Handles adaptation of the |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
75 |
* target method to a call site type (including mapping variable arity methods to a call site signature with different |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
76 |
* arity). |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
77 |
*/ |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
78 |
abstract class SingleDynamicMethod extends DynamicMethod { |
20945
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
79 |
private static final MethodHandle CAN_CONVERT_TO = Lookup.findOwnStatic(MethodHandles.lookup(), "canConvertTo", boolean.class, LinkerServices.class, Class.class, Object.class); |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
80 |
|
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
24719
diff
changeset
|
81 |
SingleDynamicMethod(final String name) { |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
82 |
super(name); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
83 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
84 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
85 |
/** |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
86 |
* Returns true if this method is variable arity. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
87 |
* @return true if this method is variable arity. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
88 |
*/ |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
89 |
abstract boolean isVarArgs(); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
90 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
91 |
/** |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
92 |
* Returns this method's native type. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
93 |
* @return this method's native type. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
94 |
*/ |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
95 |
abstract MethodType getMethodType(); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
96 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
97 |
/** |
33331
273e6a10de22
8139435: Make sure CallSiteDescriptor.getLookup is subject to a security check
attila
parents:
33007
diff
changeset
|
98 |
* Given a specified call site descriptor, returns a method handle to this method's target. The target |
273e6a10de22
8139435: Make sure CallSiteDescriptor.getLookup is subject to a security check
attila
parents:
33007
diff
changeset
|
99 |
* should only depend on the descriptor's lookup, and it should only retrieve it (as a privileged |
273e6a10de22
8139435: Make sure CallSiteDescriptor.getLookup is subject to a security check
attila
parents:
33007
diff
changeset
|
100 |
* operation) when it is absolutely needed. |
273e6a10de22
8139435: Make sure CallSiteDescriptor.getLookup is subject to a security check
attila
parents:
33007
diff
changeset
|
101 |
* @param desc the call site descriptor to use. |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
102 |
* @return the handle to this method's target method. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
103 |
*/ |
33331
273e6a10de22
8139435: Make sure CallSiteDescriptor.getLookup is subject to a security check
attila
parents:
33007
diff
changeset
|
104 |
abstract MethodHandle getTarget(CallSiteDescriptor desc); |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
105 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
106 |
@Override |
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
24719
diff
changeset
|
107 |
MethodHandle getInvocation(final CallSiteDescriptor callSiteDescriptor, final LinkerServices linkerServices) { |
36686
a351eacd4c42
8150218: Autoconversion SAM adapters sometimes don't get privileges
attila
parents:
34447
diff
changeset
|
108 |
return linkerServices.getWithLookup(()->getInvocation(getTarget(callSiteDescriptor), |
a351eacd4c42
8150218: Autoconversion SAM adapters sometimes don't get privileges
attila
parents:
34447
diff
changeset
|
109 |
callSiteDescriptor.getMethodType(), linkerServices), callSiteDescriptor); |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
110 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
111 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
112 |
@Override |
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
24719
diff
changeset
|
113 |
SingleDynamicMethod getMethodForExactParamTypes(final String paramTypes) { |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
114 |
return typeMatchesDescription(paramTypes, getMethodType()) ? this : null; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
115 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
116 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
117 |
@Override |
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
24719
diff
changeset
|
118 |
boolean contains(final SingleDynamicMethod method) { |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
119 |
return getMethodType().parameterList().equals(method.getMethodType().parameterList()); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
120 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
121 |
|
32441
8401a09d1b0d
8134939: Improve toString method of Dynalink DynamicMethod objects
attila
parents:
28881
diff
changeset
|
122 |
static String getMethodNameWithSignature(final MethodType type, final String methodName, final boolean withReturnType) { |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
123 |
final String typeStr = type.toString(); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
124 |
final int retTypeIndex = typeStr.lastIndexOf(')') + 1; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
125 |
int secondParamIndex = typeStr.indexOf(',') + 1; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
126 |
if(secondParamIndex == 0) { |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
127 |
secondParamIndex = retTypeIndex - 1; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
128 |
} |
32441
8401a09d1b0d
8134939: Improve toString method of Dynalink DynamicMethod objects
attila
parents:
28881
diff
changeset
|
129 |
final StringBuilder b = new StringBuilder(); |
8401a09d1b0d
8134939: Improve toString method of Dynalink DynamicMethod objects
attila
parents:
28881
diff
changeset
|
130 |
if (withReturnType) { |
8401a09d1b0d
8134939: Improve toString method of Dynalink DynamicMethod objects
attila
parents:
28881
diff
changeset
|
131 |
b.append(typeStr, retTypeIndex, typeStr.length()).append(' '); |
8401a09d1b0d
8134939: Improve toString method of Dynalink DynamicMethod objects
attila
parents:
28881
diff
changeset
|
132 |
} |
8401a09d1b0d
8134939: Improve toString method of Dynalink DynamicMethod objects
attila
parents:
28881
diff
changeset
|
133 |
return b.append(methodName).append('(').append(typeStr, secondParamIndex, retTypeIndex).toString(); |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
134 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
135 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
136 |
/** |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
137 |
* Given a method handle and a call site type, adapts the method handle to the call site type. Performs type |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
138 |
* conversions as needed using the specified linker services, and in case that the method handle is a vararg |
24719 | 139 |
* collector, matches it to the arity of the call site. The type of the return value is only changed if it can be |
140 |
* converted using a conversion that loses neither precision nor magnitude, see |
|
141 |
* {@link LinkerServices#asTypeLosslessReturn(MethodHandle, MethodType)}. |
|
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
142 |
* @param target the method handle to adapt |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
143 |
* @param callSiteType the type of the call site |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
144 |
* @param linkerServices the linker services used for type conversions |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
145 |
* @return the adapted method handle. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
146 |
*/ |
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
24719
diff
changeset
|
147 |
static MethodHandle getInvocation(final MethodHandle target, final MethodType callSiteType, final LinkerServices linkerServices) { |
28881
0008daeef352
8072596: Arrays.asList results in ClassCastException with a JS array
attila
parents:
25865
diff
changeset
|
148 |
final MethodHandle filteredTarget = linkerServices.filterInternalObjects(target); |
0008daeef352
8072596: Arrays.asList results in ClassCastException with a JS array
attila
parents:
25865
diff
changeset
|
149 |
final MethodType methodType = filteredTarget.type(); |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
150 |
final int paramsLen = methodType.parameterCount(); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
151 |
final boolean varArgs = target.isVarargsCollector(); |
28881
0008daeef352
8072596: Arrays.asList results in ClassCastException with a JS array
attila
parents:
25865
diff
changeset
|
152 |
final MethodHandle fixTarget = varArgs ? filteredTarget.asFixedArity() : filteredTarget; |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
153 |
final int fixParamsLen = varArgs ? paramsLen - 1 : paramsLen; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
154 |
final int argsLen = callSiteType.parameterCount(); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
155 |
if(argsLen < fixParamsLen) { |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
156 |
// Less actual arguments than number of fixed declared arguments; can't invoke. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
157 |
return null; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
158 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
159 |
// Method handle has the same number of fixed arguments as the call site type |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
160 |
if(argsLen == fixParamsLen) { |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
161 |
// Method handle that matches the number of actual arguments as the number of fixed arguments |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
162 |
final MethodHandle matchedMethod; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
163 |
if(varArgs) { |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
164 |
// If vararg, add a zero-length array of the expected type as the last argument to signify no variable |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
165 |
// arguments. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
166 |
matchedMethod = MethodHandles.insertArguments(fixTarget, fixParamsLen, Array.newInstance( |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
167 |
methodType.parameterType(fixParamsLen).getComponentType(), 0)); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
168 |
} else { |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
169 |
// Otherwise, just use the method |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
170 |
matchedMethod = fixTarget; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
171 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
172 |
return createConvertingInvocation(matchedMethod, linkerServices, callSiteType); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
173 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
174 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
175 |
// What's below only works for varargs |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
176 |
if(!varArgs) { |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
177 |
return null; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
178 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
179 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
180 |
final Class<?> varArgType = methodType.parameterType(fixParamsLen); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
181 |
// Handle a somewhat sinister corner case: caller passes exactly one argument in the vararg position, and we |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
182 |
// must handle both a prepacked vararg array as well as a genuine 1-long vararg sequence. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
183 |
if(argsLen == paramsLen) { |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
184 |
final Class<?> callSiteLastArgType = callSiteType.parameterType(fixParamsLen); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
185 |
if(varArgType.isAssignableFrom(callSiteLastArgType)) { |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
186 |
// Call site signature guarantees we'll always be passed a single compatible array; just link directly |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
187 |
// to the method, introducing necessary conversions. Also, preserve it being a variable arity method. |
28881
0008daeef352
8072596: Arrays.asList results in ClassCastException with a JS array
attila
parents:
25865
diff
changeset
|
188 |
return createConvertingInvocation(filteredTarget, linkerServices, callSiteType).asVarargsCollector( |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
189 |
callSiteLastArgType); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
190 |
} |
20945
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
191 |
|
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
192 |
// This method handle takes the single argument and packs it into a newly allocated single-element array. It |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
193 |
// will be used when the incoming argument can't be converted to the vararg array type (the "vararg packer" |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
194 |
// method). |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
195 |
final MethodHandle varArgCollectingInvocation = createConvertingInvocation(collectArguments(fixTarget, |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
196 |
argsLen), linkerServices, callSiteType); |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
197 |
|
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
198 |
// Is call site type assignable from an array type (e.g. Object:int[], or Object[]:String[]) |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
199 |
final boolean isAssignableFromArray = callSiteLastArgType.isAssignableFrom(varArgType); |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
200 |
// Do we have a custom conversion that can potentially convert the call site type to an array? |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
201 |
final boolean isCustomConvertible = linkerServices.canConvert(callSiteLastArgType, varArgType); |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
202 |
if(!isAssignableFromArray && !isCustomConvertible) { |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
203 |
// Call site signature guarantees the argument can definitely not be converted to an array (i.e. it is |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
204 |
// primitive), and no conversion can help with it either. Link immediately to a vararg-packing method |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
205 |
// handle. |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
206 |
return varArgCollectingInvocation; |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
207 |
} |
20945
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
208 |
|
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
209 |
// This method handle employs language-specific conversions to convert the last argument into an array of |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
210 |
// vararg type. |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
211 |
final MethodHandle arrayConvertingInvocation = createConvertingInvocation(MethodHandles.filterArguments( |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
212 |
fixTarget, fixParamsLen, linkerServices.getTypeConverter(callSiteLastArgType, varArgType)), |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
213 |
linkerServices, callSiteType); |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
214 |
|
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
215 |
// This method handle determines whether the value can be converted to the array of vararg type using a |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
216 |
// language-specific conversion. |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
217 |
final MethodHandle canConvertArgToArray = MethodHandles.insertArguments(CAN_CONVERT_TO, 0, linkerServices, |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
218 |
varArgType); |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
219 |
|
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
220 |
// This one adjusts the previous one for the location of the argument and the call site type. |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
221 |
final MethodHandle canConvertLastArgToArray = MethodHandles.dropArguments(canConvertArgToArray, 0, |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
222 |
MethodType.genericMethodType(fixParamsLen).parameterList()).asType(callSiteType.changeReturnType(boolean.class)); |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
223 |
|
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
224 |
// This one takes the previous ones and combines them into a method handle that converts the argument into |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
225 |
// a vararg array when it can, otherwise falls back to the vararg packer. |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
226 |
final MethodHandle convertToArrayWhenPossible = MethodHandles.guardWithTest(canConvertLastArgToArray, |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
227 |
arrayConvertingInvocation, varArgCollectingInvocation); |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
228 |
|
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
229 |
if(isAssignableFromArray) { |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
230 |
return MethodHandles.guardWithTest( |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
231 |
// Is incoming parameter already a compatible array? |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
232 |
Guards.isInstance(varArgType, fixParamsLen, callSiteType), |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
233 |
// Yes: just pass it to the method |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
234 |
createConvertingInvocation(fixTarget, linkerServices, callSiteType), |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
235 |
// No: either go through a custom conversion, or if it is not possible, go directly to the |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
236 |
// vararg packer. |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
237 |
isCustomConvertible ? convertToArrayWhenPossible : varArgCollectingInvocation); |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
238 |
} |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
239 |
|
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
240 |
// Just do the custom conversion with fallback to the vararg packer logic. |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
241 |
assert isCustomConvertible; |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
242 |
return convertToArrayWhenPossible; |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
243 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
244 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
245 |
// Remaining case: more than one vararg. |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
246 |
return createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
247 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
248 |
|
20945
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
249 |
@SuppressWarnings("unused") |
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
24719
diff
changeset
|
250 |
private static boolean canConvertTo(final LinkerServices linkerServices, final Class<?> to, final Object obj) { |
20945
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
251 |
return obj == null ? false : linkerServices.canConvert(obj.getClass(), to); |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
252 |
} |
11a1b6dc9893
8026397: Fix ambiguity with array conversion, including passing JS NativeArrays in Java variable arity methods' vararg array position
attila
parents:
18841
diff
changeset
|
253 |
|
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
254 |
/** |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
255 |
* Creates a method handle out of the original target that will collect the varargs for the exact component type of |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
256 |
* the varArg array. Note that this will nicely trigger language-specific type converters for exactly those varargs |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
257 |
* for which it is necessary when later passed to linkerServices.convertArguments(). |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
258 |
* |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
259 |
* @param target the original method handle |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
260 |
* @param parameterCount the total number of arguments in the new method handle |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
261 |
* @return a collecting method handle |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
262 |
*/ |
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
24719
diff
changeset
|
263 |
static MethodHandle collectArguments(final MethodHandle target, final int parameterCount) { |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
264 |
final MethodType methodType = target.type(); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
265 |
final int fixParamsLen = methodType.parameterCount() - 1; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
266 |
final Class<?> arrayType = methodType.parameterType(fixParamsLen); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
267 |
return target.asCollector(arrayType, parameterCount - fixParamsLen); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
268 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
269 |
|
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
270 |
private static MethodHandle createConvertingInvocation(final MethodHandle sizedMethod, |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
271 |
final LinkerServices linkerServices, final MethodType callSiteType) { |
24719 | 272 |
return linkerServices.asTypeLosslessReturn(sizedMethod, callSiteType); |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
273 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
274 |
|
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
24719
diff
changeset
|
275 |
private static boolean typeMatchesDescription(final String paramTypes, final MethodType type) { |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
276 |
final StringTokenizer tok = new StringTokenizer(paramTypes, ", "); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
277 |
for(int i = 1; i < type.parameterCount(); ++i) { // i = 1 as we ignore the receiver |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
278 |
if(!(tok.hasMoreTokens() && typeNameMatches(tok.nextToken(), type.parameterType(i)))) { |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
279 |
return false; |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
280 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
281 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
282 |
return !tok.hasMoreTokens(); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
283 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
284 |
|
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
24719
diff
changeset
|
285 |
private static boolean typeNameMatches(final String typeName, final Class<?> type) { |
18841
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
286 |
return typeName.equals(typeName.indexOf('.') == -1 ? type.getSimpleName() : type.getCanonicalName()); |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
287 |
} |
9bbc4b8832b2
8010946: AccessControl.doPrivileged is broken when called from js script
attila
parents:
diff
changeset
|
288 |
} |