Skip to content

Commit afc6c0a

Browse files
committed
Fix deprecation warnings
1 parent db9eaf6 commit afc6c0a

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PBuiltinFunction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2021, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2022, Oracle and/or its affiliates.
33
* Copyright (c) 2013, Regents of the University of California
44
*
55
* All rights reserved.
@@ -27,6 +27,7 @@
2727

2828
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DOC__;
2929

30+
import java.lang.invoke.VarHandle;
3031
import java.util.Arrays;
3132

3233
import com.oracle.graal.python.PythonLanguage;
@@ -50,7 +51,6 @@
5051
import com.oracle.truffle.api.interop.InteropLibrary;
5152
import com.oracle.truffle.api.library.ExportLibrary;
5253
import com.oracle.truffle.api.library.ExportMessage;
53-
import com.oracle.truffle.api.memory.MemoryFence;
5454
import com.oracle.truffle.api.nodes.RootNode;
5555
import com.oracle.truffle.api.object.Shape;
5656

@@ -235,7 +235,7 @@ public void setDescriptor(BuiltinMethodDescriptor value) {
235235
assert value.getName().equals(getName()) && getBuiltinNodeFactory() == value.getFactory() : getName() + " vs " + value;
236236
// Only make sure that info is fully initialized, otherwise it is fine if it is set multiple
237237
// times from different threads, all of them should set the same value
238-
MemoryFence.storeStore();
238+
VarHandle.storeStoreFence();
239239
BuiltinMethodDescriptor local = descriptor;
240240
assert local == null || local == value : value;
241241
this.descriptor = value;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import java.io.InputStream;
3838
import java.io.OutputStream;
3939
import java.io.PrintWriter;
40+
import java.lang.invoke.VarHandle;
4041
import java.lang.ref.WeakReference;
4142
import java.nio.file.LinkOption;
4243
import java.security.NoSuchAlgorithmException;
@@ -63,7 +64,6 @@
6364
import java.util.concurrent.locks.ReentrantLock;
6465
import java.util.logging.Level;
6566

66-
import com.oracle.graal.python.builtins.objects.function.PFunction;
6767
import org.graalvm.nativeimage.ImageInfo;
6868
import org.graalvm.options.OptionKey;
6969

@@ -91,6 +91,7 @@
9191
import com.oracle.graal.python.builtins.objects.dict.PDict;
9292
import com.oracle.graal.python.builtins.objects.frame.PFrame;
9393
import com.oracle.graal.python.builtins.objects.frame.PFrame.Reference;
94+
import com.oracle.graal.python.builtins.objects.function.PFunction;
9495
import com.oracle.graal.python.builtins.objects.function.PKeyword;
9596
import com.oracle.graal.python.builtins.objects.list.PList;
9697
import com.oracle.graal.python.builtins.objects.module.PythonModule;
@@ -138,7 +139,6 @@
138139
import com.oracle.truffle.api.interop.ExceptionType;
139140
import com.oracle.truffle.api.interop.InteropLibrary;
140141
import com.oracle.truffle.api.interop.UnsupportedMessageException;
141-
import com.oracle.truffle.api.memory.MemoryFence;
142142
import com.oracle.truffle.api.nodes.LanguageInfo;
143143
import com.oracle.truffle.api.nodes.Node;
144144
import com.oracle.truffle.api.source.Source;
@@ -1827,7 +1827,7 @@ public void setSingletonNativeWrapper(PythonAbstractObject obj, PythonNativeWrap
18271827
assert PythonLanguage.getSingletonNativeWrapperIdx(obj) != -1 : "invalid special singleton object";
18281828
assert singletonNativePtrs[PythonLanguage.getSingletonNativeWrapperIdx(obj)] == null;
18291829
// Other threads must see the nativeWrapper fully initialized once it becomes non-null
1830-
MemoryFence.storeStore();
1830+
VarHandle.storeStoreFence();
18311831
singletonNativePtrs[PythonLanguage.getSingletonNativeWrapperIdx(obj)] = nativePtr;
18321832
}
18331833

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PException.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import com.oracle.truffle.api.dsl.Cached;
5858
import com.oracle.truffle.api.dsl.Cached.Exclusive;
5959
import com.oracle.truffle.api.exception.AbstractTruffleException;
60+
import com.oracle.truffle.api.frame.FrameInstance;
6061
import com.oracle.truffle.api.frame.VirtualFrame;
6162
import com.oracle.truffle.api.interop.ExceptionType;
6263
import com.oracle.truffle.api.interop.InteropLibrary;
@@ -238,7 +239,7 @@ public void expect(PythonBuiltinClassType error, IsBuiltinClassProfile profile)
238239
@TruffleBoundary
239240
public Iterable<TruffleStackTraceElement> getTruffleStackTrace() {
240241
if (tracebackCutoffTarget == null) {
241-
tracebackCutoffTarget = Truffle.getRuntime().getCurrentFrame().getCallTarget();
242+
tracebackCutoffTarget = Truffle.getRuntime().iterateFrames(FrameInstance::getCallTarget, 0);
242243
}
243244
// Cause may contain wrapped Java exception
244245
if (getCause() != null) {

0 commit comments

Comments
 (0)