Skip to content

Commit 4ccfc49

Browse files
committed
Suppress deprecation warning temporarily
1 parent 9054057 commit 4ccfc49

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
7171
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
7272
import com.oracle.truffle.api.RootCallTarget;
73-
import com.oracle.truffle.api.Scope;
7473
import com.oracle.truffle.api.Truffle;
7574
import com.oracle.truffle.api.TruffleFile;
7675
import com.oracle.truffle.api.TruffleLanguage;
@@ -469,14 +468,17 @@ protected boolean isVisible(PythonContext context, Object value) {
469468

470469
@Override
471470
@TruffleBoundary
472-
protected Iterable<Scope> findLocalScopes(PythonContext context, Node node, Frame frame) {
473-
ArrayList<Scope> scopes = new ArrayList<>();
474-
for (Scope s : super.findLocalScopes(context, node, frame)) {
471+
// Remove in GR-26206
472+
@SuppressWarnings("deprecation")
473+
protected Iterable<com.oracle.truffle.api.Scope> findLocalScopes(PythonContext context, Node node, Frame frame) {
474+
ArrayList<com.oracle.truffle.api.Scope> scopes = new ArrayList<>();
475+
for (com.oracle.truffle.api.Scope s : super.findLocalScopes(context, node, frame)) {
475476
if (frame == null) {
476477
PFunctionArgsFinder argsFinder = new PFunctionArgsFinder(node);
477478

478-
Scope.Builder scopeBuilder = Scope.newBuilder(s.getName(), s.getVariables()).node(s.getNode()).receiver(s.getReceiverName(), s.getReceiver()).rootInstance(
479-
s.getRootInstance()).arguments(argsFinder.collectArgs());
479+
com.oracle.truffle.api.Scope.Builder scopeBuilder = com.oracle.truffle.api.Scope.newBuilder(s.getName(), s.getVariables()).node(s.getNode()).receiver(s.getReceiverName(),
480+
s.getReceiver()).rootInstance(
481+
s.getRootInstance()).arguments(argsFinder.collectArgs());
480482

481483
scopes.add(scopeBuilder.build());
482484
} else {
@@ -487,11 +489,11 @@ protected Iterable<Scope> findLocalScopes(PythonContext context, Node node, Fram
487489
if (frame != null) {
488490
PythonObject globals = PArguments.getGlobalsSafe(frame);
489491
if (globals != null) {
490-
scopes.add(Scope.newBuilder("globals()", scopeFromObject(globals)).build());
492+
scopes.add(com.oracle.truffle.api.Scope.newBuilder("globals()", scopeFromObject(globals)).build());
491493
}
492494
Frame generatorFrame = PArguments.getGeneratorFrameSafe(frame);
493495
if (generatorFrame != null) {
494-
for (Scope s : super.findLocalScopes(context, node, generatorFrame)) {
496+
for (com.oracle.truffle.api.Scope s : super.findLocalScopes(context, node, generatorFrame)) {
495497
scopes.add(s);
496498
}
497499
}
@@ -508,12 +510,14 @@ private static InteropMap scopeFromObject(PythonObject globals) {
508510
}
509511

510512
@Override
511-
protected Iterable<Scope> findTopScopes(PythonContext context) {
512-
ArrayList<Scope> scopes = new ArrayList<>();
513+
// Remove in GR-26206
514+
@SuppressWarnings("deprecation")
515+
protected Iterable<com.oracle.truffle.api.Scope> findTopScopes(PythonContext context) {
516+
ArrayList<com.oracle.truffle.api.Scope> scopes = new ArrayList<>();
513517
if (context.getBuiltins() != null) {
514518
// false during initialization
515-
scopes.add(Scope.newBuilder(BuiltinNames.__MAIN__, context.getMainModule()).build());
516-
scopes.add(Scope.newBuilder(BuiltinNames.BUILTINS, scopeFromObject(context.getBuiltins())).build());
519+
scopes.add(com.oracle.truffle.api.Scope.newBuilder(BuiltinNames.__MAIN__, context.getMainModule()).build());
520+
scopes.add(com.oracle.truffle.api.Scope.newBuilder(BuiltinNames.BUILTINS, scopeFromObject(context.getBuiltins())).build());
517521
}
518522
return scopes;
519523
}

0 commit comments

Comments
 (0)