Skip to content

Commit f799cf1

Browse files
committed
8360303: Remove two unused invoke files
Reviewed-by: rriggs, jrose
1 parent 56c7545 commit f799cf1

File tree

4 files changed

+2
-79
lines changed

4 files changed

+2
-79
lines changed

src/java.base/share/classes/java/lang/invoke/InvokeDynamic.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import jdk.internal.vm.annotation.ForceInline;
3737
import jdk.internal.vm.annotation.Hidden;
3838
import jdk.internal.vm.annotation.Stable;
39-
import sun.invoke.empty.Empty;
4039
import sun.invoke.util.ValueConversions;
4140
import sun.invoke.util.VerifyType;
4241
import sun.invoke.util.Wrapper;
@@ -983,7 +982,7 @@ static MethodHandle throwException(MethodType type) {
983982
return makePairwiseConvert(getFunction(NF_throwException).resolvedHandle(), type, false, true);
984983
}
985984

986-
static <T extends Throwable> Empty throwException(T t) throws T { throw t; }
985+
static <T extends Throwable> Void throwException(T t) throws T { throw t; }
987986

988987
static MethodHandle[] FAKE_METHOD_HANDLE_INVOKE = new MethodHandle[2];
989988
static MethodHandle fakeMethodHandleInvoke(MemberName method) {

src/java.base/share/classes/sun/invoke/empty/Empty.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/java.base/share/classes/sun/invoke/util/VerifyType.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
2626
package sun.invoke.util;
2727

2828
import java.lang.invoke.MethodType;
29-
import sun.invoke.empty.Empty;
3029

3130
/**
3231
* This class centralizes information about the JVM verifier
@@ -93,8 +92,6 @@ public static boolean isNullType(Class<?> type) {
9392
// Therefore, it can be safely treated as a value of any
9493
// other type that admits null, i.e., a reference type.
9594
if (type == Void.class) return true;
96-
// Locally known null-only class:
97-
if (type == Empty.class) return true;
9895
return false;
9996
}
10097

0 commit comments

Comments
 (0)