[GR-27300] Backport topScope fix.

PullRequest: truffleruby/2149

Author: wirthi

src/main/java/org/truffleruby/debug/TopScopeObject.java

@@ -227,7 +227,7 @@ void removeMember(String member,
             @Shared("interop") @CachedLibrary(limit = "LIMIT") InteropLibrary interop)
             throws UnsupportedMessageException, UnknownIdentifierException {
         int length = NAMES.length;
-        for (int i = 0; i < length; i++) {
+        for (int i = scopeIndex; i < length; i++) {
             Object scope = this.objects[i];
             if (interop.isMemberRemovable(scope, member)) {
                 interop.removeMember(scope, member);

src/test/java/org/truffleruby/PolyglotInteropTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *
@@ -218,4 +218,18 @@ public void testTopScopes() {
             assertEquals(formatMethod.execute("hello").asString(), "hello");
         }
     }
+
+    @Test
+    //GR-27300
+    public void testTopScopeRemoveBindings() {
+        try (Context context = Context.create()) {
+            Value bindings = context.getBindings("ruby");
+
+            assertFalse(bindings.hasMember("@foo"));
+            context.eval("ruby", "@foo=42;");
+            assertTrue(bindings.hasMember("@foo"));
+            assertTrue(bindings.removeMember("@foo"));
+            assertFalse(bindings.hasMember("@foo"));
+        }
+    }
 }