[GR-13795] Removed deprecated DebugStackFrame#iterator and DebugStackFrame#getValue.

PullRequest: graal/2982

Author: boris-spas

truffle/CHANGELOG.md

@@ -41,6 +41,7 @@ This changelog summarizes major changes between Truffle versions relevant to lan
     - GraalTruffleRuntime.getQueuedCallTargets
     - PrimitiveValueProfile.exactCompare
     - BranchProfile.isVisited
+    - DebugStackFrame.iterator and DebugStackFrame.getValue
 * The [@Option](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/Option.html) annotation can now specify the [stability](https://www.graalvm.org/truffle/javadoc/org/graalvm/options/OptionStability.html) of an option.
 * Fixed the case of the method [`TruffleStackTrace.getStacktrace`](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleStackTrace.html#getStacktrace-java.lang.Throwable-) to `TruffleStackTrace.getStackTrace`.
 

truffle/src/com.oracle.truffle.api.debug/snapshot.sigtest

@@ -112,19 +112,14 @@ supr java.lang.Object
 hfds debugger,event,frame,iterator,language,parent,root,scope,variables
 
 CLSS public final com.oracle.truffle.api.debug.DebugStackFrame
-intf java.lang.Iterable<com.oracle.truffle.api.debug.DebugValue>
 meth public boolean equals(java.lang.Object)
 meth public boolean isInternal()
 meth public com.oracle.truffle.api.debug.DebugScope getScope()
 meth public com.oracle.truffle.api.debug.DebugValue eval(java.lang.String)
-meth public com.oracle.truffle.api.debug.DebugValue getValue(java.lang.String)
- anno 0 java.lang.Deprecated()
 meth public com.oracle.truffle.api.nodes.LanguageInfo getLanguage()
 meth public com.oracle.truffle.api.source.SourceSection getSourceSection()
 meth public int hashCode()
 meth public java.lang.String getName()
-meth public java.util.Iterator<com.oracle.truffle.api.debug.DebugValue> iterator()
- anno 0 java.lang.Deprecated()
 supr java.lang.Object
 hfds currentFrame,depth,event
 

truffle/src/com.oracle.truffle.api.debug/src/com/oracle/truffle/api/debug/DebugStackFrame.java

@@ -40,10 +40,7 @@
  */
 package com.oracle.truffle.api.debug;
 
-import java.util.HashSet;
 import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.Set;
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.RootCallTarget;
@@ -78,7 +75,7 @@
  * @see SuspendedEvent#getTopStackFrame()
  * @since 0.17
  */
-public final class DebugStackFrame implements Iterable<DebugValue> {
+public final class DebugStackFrame {
 
     final SuspendedEvent event;
     private final FrameInstance currentFrame;
@@ -236,38 +233,6 @@ public DebugScope getScope() throws DebugException {
         }
     }
 
-    /**
-     * Lookup a stack value with a given name. If no value is available in the current stack frame
-     * with that name <code>null</code> is returned. Stack values are only accessible as as long as
-     * the {@link DebugStackFrame debug stack frame} is valid. Debug stack frames are only valid as
-     * long as the source {@link SuspendedEvent suspended event} is valid.
-     * <p>
-     * This method is not thread-safe and will throw an {@link IllegalStateException} if called on
-     * another thread than it was created with.
-     *
-     * @param name the name of the local variable to query.
-     * @return the value from the stack
-     * @since 0.17
-     * @deprecated Use {@link #getScope()} and {@link DebugScope#getDeclaredValue(java.lang.String)}
-     *             .
-     */
-    @Deprecated
-    public DebugValue getValue(String name) {
-        DebugScope scope = getScope();
-        while (scope != null) {
-            DebugValue value = scope.getDeclaredValue(name);
-            if (value != null) {
-                return value;
-            }
-            // Search for the value up to the function root, to be compatible.
-            if (scope.isFunctionScope()) {
-                break;
-            }
-            scope = scope.getParent();
-        }
-        return null;
-    }
-
     DebugValue wrapHeapValue(Object result) {
         LanguageInfo language;
         RootNode root = findCurrentRoot();
@@ -302,79 +267,6 @@ public DebugValue eval(String code) throws DebugException {
         return wrapHeapValue(result);
     }
 
-    /**
-     * Returns an {@link Iterator iterator} for all stack values available in this frame. The
-     * returned stack values remain valid as long as the current stack frame remains valid.
-     *
-     * <p>
-     * This method is not thread-safe and will throw an {@link IllegalStateException} if called on
-     * another thread than it was created with.
-     *
-     * @since 0.17
-     * @deprecated Use {@link #getScope()} and {@link DebugScope#getDeclaredValues()}.
-     */
-    @Deprecated
-    public Iterator<DebugValue> iterator() {
-        DebugScope cscope = getScope();
-        // Merge non-masked variables from all scopes:
-        return new Iterator<DebugValue>() {
-            private DebugScope scope = cscope;
-            private Iterator<DebugValue> variables;
-            private DebugValue nextVar;
-            private Set<String> names = new HashSet<>();
-
-            @Override
-            public boolean hasNext() {
-                if (nextVar != null) {
-                    return true;
-                }
-                for (;;) {
-                    if (variables == null && scope != null) {
-                        variables = scope.getDeclaredValues().iterator();
-                        if (!variables.hasNext()) {
-                            variables = null;
-                        }
-                        if (scope.isFunctionScope()) {
-                            // Stop at the function, do not go to closures, to be compatible.
-                            scope = null;
-                        } else {
-                            scope = scope.getParent();
-                        }
-                        if (variables == null) {
-                            continue;
-                        }
-                    }
-                    if (variables != null && variables.hasNext()) {
-                        nextVar = variables.next();
-                        String name = nextVar.getName();
-                        if (!names.contains(name)) {
-                            names.add(name);
-                            return true;
-                        }
-                    } else {
-                        variables = null;
-                        if (scope == null) {
-                            return false;
-                        }
-                    }
-                }
-            }
-
-            @Override
-            public DebugValue next() {
-                if (nextVar == null) {
-                    hasNext();
-                }
-                DebugValue var = nextVar;
-                if (var == null) {
-                    throw new NoSuchElementException();
-                }
-                nextVar = null;
-                return var;
-            }
-        };
-    }
-
     /**
      * @since 1.0
      */

vm/mx.vm/suite.py

@@ -37,7 +37,7 @@
             },
             {
                 "name": "truffleruby",
-                "version": "dd198f9c34e4e7bb5e1ed599b5d88eafb999b332",
+                "version": "ea48af25ccebf1af8ce752b8cc886204d27566a3",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},
@@ -61,7 +61,7 @@
             },
             {
                 "name": "fastr",
-                "version": "6af23b2db13ba09242a46a7a7114a289a048abf5",
+                "version": "2358e9762f9b102d3539a2e673e653e470a1bbf3",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/fastr.git", "kind": "git"},