archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2022-01-10 17:06:23 +00:00
commit d9b1bb5860
24 changed files with 538 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
View file

@ -683,6 +683,7 @@ class InvokerBytecodeGenerator {
}
private static MemberName resolveFrom(String name, MethodType type, Class<?> holder) {
assert(!UNSAFE.shouldBeInitialized(holder)) : holder + "not initialized";
MemberName member = new MemberName(holder, name, type, REF_invokeStatic);
MemberName resolvedMember = MemberName.getFactory().resolveOrNull(REF_invokeStatic, member, holder, LM_TRUSTED);
traceLambdaForm(name, type, holder, resolvedMember);

6
src/java.base/share/classes/java/nio/Buffer.java
View file

@ -767,7 +767,11 @@ public abstract class Buffer {
final void checkScope() {
ScopedMemoryAccess.Scope scope = scope();
if (scope != null) {
scope.checkValidState();
try {
scope.checkValidState();
} catch (ScopedMemoryAccess.Scope.ScopedAccessError e) {
throw new IllegalStateException("This segment is already closed");
}
}
}