stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8332586: Avoid cloning empty arrays in java.lang.reflect.{Method,Constructor}

Browse Source 
Reviewed-by: shade, rriggs, liach
This commit is contained in:
John Engebretson 2024-06-03 13:38:48 +00:00 committed by Aleksey Shipilev
parent 1c514b34c0
commit 27af19d921
4 changed files with 176 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java.base/share/classes/java/lang/reflect/Constructor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2024, 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
@ -266,7 +266,7 @@ public final class Constructor<T> extends Executable {
*/
@Override
public Class<?>[] getParameterTypes() {
return parameterTypes.clone();
return parameterTypes.length == 0 ? parameterTypes : parameterTypes.clone();
}
/**
@ -292,10 +292,9 @@ public final class Constructor<T> extends Executable {
*/
@Override
public Class<?>[] getExceptionTypes() {
return exceptionTypes.clone();
return exceptionTypes.length == 0 ? exceptionTypes : exceptionTypes.clone();
}
/**
* {@inheritDoc}
* @throws GenericSignatureFormatError {@inheritDoc}

6
src/java.base/share/classes/java/lang/reflect/Method.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2024, 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
@ -315,7 +315,7 @@ public final class Method extends Executable {
*/
@Override
public Class<?>[] getParameterTypes() {
return parameterTypes.clone();
return parameterTypes.length == 0 ? parameterTypes: parameterTypes.clone();
}
/**
@ -342,7 +342,7 @@ public final class Method extends Executable {
*/
@Override
public Class<?>[] getExceptionTypes() {
return exceptionTypes.clone();
return exceptionTypes.length == 0 ? exceptionTypes : exceptionTypes.clone();
}
/**

85
test/micro/org/openjdk/bench/java/lang/reflect/ConstructorBenchmark.java Normal file
View File

@ -0,0 +1,85 @@
/*
* Copyright Amazon.com Inc. 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.
*/
package org.openjdk.bench.java.lang.reflect;
import java.lang.reflect.Constructor;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
import org.openjdk.jmh.annotations.Measurement;
import org.openjdk.jmh.annotations.Mode;
import org.openjdk.jmh.annotations.OutputTimeUnit;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.Warmup;
/**
* Benchmark measuring the speed of Method/Constructor.getExceptionTypes() and
* getParameterTypes(), in cases where the result array is length zero.
*/
@BenchmarkMode(Mode.AverageTime)
@State(Scope.Benchmark)
@OutputTimeUnit(TimeUnit.NANOSECONDS)
@Fork(1)
@Warmup(iterations = 3, time = 2, timeUnit = TimeUnit.SECONDS)
@Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
public class ConstructorBenchmark {
Constructor<?> emptyExceptionsConstructor;
Constructor<?> emptyParametersConstructor;
Constructor<?> oneExceptionConstructor;
Constructor<?> oneParameterConstructor;
public ConstructorBenchmark() {
try {
emptyParametersConstructor = Object.class.getConstructor();
oneParameterConstructor = String.class.getConstructor(String.class);
emptyExceptionsConstructor = emptyParametersConstructor;
oneExceptionConstructor = String.class.getConstructor(byte[].class, String.class);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@Benchmark
public Object[] getExceptionTypes() throws Exception {
return oneExceptionConstructor.getExceptionTypes();
}
@Benchmark
public Object[] getExceptionTypesEmpty() throws Exception {
return emptyExceptionsConstructor.getExceptionTypes();
}
@Benchmark
public Object[] getParameterTypes() throws Exception {
return oneParameterConstructor.getParameterTypes();
}
@Benchmark
public Object[] getParameterTypesEmpty() throws Exception {
return emptyParametersConstructor.getParameterTypes();
}
}

85
test/micro/org/openjdk/bench/java/lang/reflect/MethodBenchmark.java Normal file
View File

@ -0,0 +1,85 @@
/*
* Copyright Amazon.com Inc. 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.
*/
package org.openjdk.bench.java.lang.reflect;
import java.lang.reflect.Method;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
import org.openjdk.jmh.annotations.Measurement;
import org.openjdk.jmh.annotations.Mode;
import org.openjdk.jmh.annotations.OutputTimeUnit;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.Warmup;
/**
* Benchmark measuring the speed of Method/Method.getExceptionTypes() and
* getParameterTypes(), in cases where the result array is length zero.
*/
@BenchmarkMode(Mode.AverageTime)
@State(Scope.Benchmark)
@OutputTimeUnit(TimeUnit.NANOSECONDS)
@Fork(1)
@Warmup(iterations = 3, time = 2, timeUnit = TimeUnit.SECONDS)
@Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
public class MethodBenchmark {
Method emptyExceptionsMethod;
Method emptyParametersMethod;
Method oneExceptionMethod;
Method oneParameterMethod;
public MethodBenchmark() {
try {
emptyParametersMethod = Object.class.getDeclaredMethod("hashCode");
oneParameterMethod = String.class.getDeclaredMethod("getBytes", String.class);
emptyExceptionsMethod = emptyParametersMethod;
oneExceptionMethod = oneParameterMethod;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@Benchmark
public Object[] getExceptionTypes() throws Exception {
return oneExceptionMethod.getExceptionTypes();
}
@Benchmark
public Object[] getExceptionTypesEmpty() throws Exception {
return emptyExceptionsMethod.getExceptionTypes();
}
@Benchmark
public Object[] getParameterTypes() throws Exception {
return oneParameterMethod.getParameterTypes();
}
@Benchmark
public Object[] getParameterTypesEmpty() throws Exception {
return emptyParametersMethod.getParameterTypes();
}
}