1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8163946: java/lang/String/concat/WithSecurityManager.java fails after 8163878

Browse Source 
Reviewed-by: mhaupt
This commit is contained in:
Claes Redestad 2016-08-12 17:35:01 +02:00
parent fff5c5bf8d
commit 7ccd401ac7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
View File

@ -38,7 +38,6 @@ import sun.invoke.empty.Empty;
import sun.invoke.util.ValueConversions; import sun.invoke.util.ValueConversions;
import sun.invoke.util.VerifyType; import sun.invoke.util.VerifyType;
import sun.invoke.util.Wrapper; import sun.invoke.util.Wrapper;
import sun.security.action.GetPropertyAction;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.Arrays; import java.util.Arrays;
@ -59,10 +58,6 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
* @author jrose * @author jrose
*/ */
/*non-public*/ abstract class MethodHandleImpl { /*non-public*/ abstract class MethodHandleImpl {
// Do not adjust this except for special platforms:
private static final int MAX_ARITY = Integer.decode(
GetPropertyAction.privilegedGetProperty(
MethodHandleImpl.class.getName()+".MAX_ARITY", "255"));
/// Factory methods to create method handles: /// Factory methods to create method handles:

5
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java
View File

@ -53,6 +53,7 @@ import java.util.Properties;
static final boolean PROFILE_GWT; static final boolean PROFILE_GWT;
static final int CUSTOMIZE_THRESHOLD; static final int CUSTOMIZE_THRESHOLD;
static final boolean VAR_HANDLE_GUARDS; static final boolean VAR_HANDLE_GUARDS;
static final int MAX_ARITY;
static { static {
Properties props = GetPropertyAction.privilegedGetProperties(); Properties props = GetPropertyAction.privilegedGetProperties();
@ -79,6 +80,10 @@ import java.util.Properties;
VAR_HANDLE_GUARDS = Boolean.parseBoolean( VAR_HANDLE_GUARDS = Boolean.parseBoolean(
props.getProperty("java.lang.invoke.VarHandle.VAR_HANDLE_GUARDS", "true")); props.getProperty("java.lang.invoke.VarHandle.VAR_HANDLE_GUARDS", "true"));
// Do not adjust this except for special platforms:
MAX_ARITY = Integer.parseInt(
props.getProperty("java.lang.invoke.MethodHandleImpl.MAX_ARITY", "255"));
if (CUSTOMIZE_THRESHOLD < -1 || CUSTOMIZE_THRESHOLD > 127) { if (CUSTOMIZE_THRESHOLD < -1 || CUSTOMIZE_THRESHOLD > 127) {
throw newInternalError("CUSTOMIZE_THRESHOLD should be in [-1...127] range"); throw newInternalError("CUSTOMIZE_THRESHOLD should be in [-1...127] range");
} }