Skip to content

Commit

Permalink
Fix build issue with OpenJDK 17.0.2-dev
Browse files Browse the repository at this point in the history
JDK-8271862 got backported to OpenJDK 17.0.2 (current jdk17u
development tree). This patch accounts for those changes which
introduce a new method: Reference.refersToImpl(T obj). Update
Reference substitutions accordingly.

Closes #3837
  • Loading branch information
jerboaa committed Sep 27, 2021
1 parent 0820ac2 commit e42a7ec
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import com.oracle.svm.core.annotate.UnknownClass;
import com.oracle.svm.core.jdk.JDK11OrLater;
import com.oracle.svm.core.jdk.JDK16OrLater;
import com.oracle.svm.core.jdk.JDK17_0_2OrLater;
import com.oracle.svm.core.jdk.JDK8OrEarlier;
import com.oracle.svm.core.util.VMError;
import com.oracle.svm.util.ReflectionUtil;
Expand Down Expand Up @@ -138,6 +139,12 @@ private void clear0() {
clear();
}

@Substitute
@TargetElement(onlyWith = JDK17_0_2OrLater.class)
boolean refersToImpl(T obj) {
return ReferenceInternals.refersTo(SubstrateUtil.cast(this, Reference.class), obj);
}

@KeepOriginal
@TargetElement(onlyWith = JDK16OrLater.class)
public native boolean refersTo(T obj);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright (c) 2021, 2021, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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 com.oracle.svm.core.jdk;

import java.util.function.BooleanSupplier;

import org.graalvm.compiler.serviceprovider.GraalServices;
import org.graalvm.compiler.serviceprovider.JavaVersionUtil;

public class JDK17_0_2OrLater implements BooleanSupplier {

@Override
public boolean getAsBoolean() {
return JavaVersionUtil.JAVA_SPEC > 17 ||
(JavaVersionUtil.JAVA_SPEC == 17 && GraalServices.getJavaUpdateVersion() > 1);
}

}

0 comments on commit e42a7ec

Please sign in to comment.