[GR-21563] JS nodes are repeatedly materialized.

PullRequest: js/1392

Author: jchalou

graal-js/src/com.oracle.truffle.js.test.instrumentation/src/com/oracle/truffle/js/test/instrumentation/ElementsAccessTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -45,10 +45,10 @@
 
 import org.junit.Test;
 
-import com.oracle.truffle.js.nodes.instrumentation.JSTags.ReadElementTag;
-import com.oracle.truffle.js.nodes.instrumentation.JSTags.WriteElementTag;
 import com.oracle.truffle.js.nodes.instrumentation.JSTags.LiteralTag;
+import com.oracle.truffle.js.nodes.instrumentation.JSTags.ReadElementTag;
 import com.oracle.truffle.js.nodes.instrumentation.JSTags.ReadPropertyTag;
+import com.oracle.truffle.js.nodes.instrumentation.JSTags.WriteElementTag;
 import com.oracle.truffle.js.runtime.builtins.JSArray;
 import com.oracle.truffle.js.runtime.builtins.JSFunction;
 import com.oracle.truffle.js.runtime.objects.Undefined;
@@ -209,7 +209,7 @@ public void nestedInvokeReads() {
                         "}", ReadElementTag.class);
 
         for (int i = 0; i < 3; i++) {
-            // First to reads are to retrieve the invoke "target"
+            // First two reads are to retrieve the invoke "target"
             enter(ReadElementTag.class, (e, elem) -> {
                 enter(ReadElementTag.class, (e1, elem1) -> {
                     elem1.input(assertJSArrayInput);

graal-js/src/com.oracle.truffle.js.test.instrumentation/src/com/oracle/truffle/js/test/instrumentation/FineGrainedAccessTest.java

@@ -55,6 +55,7 @@
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotAccess;
+import org.graalvm.polyglot.Source;
 import org.junit.After;
 import org.junit.Before;
 
@@ -368,21 +369,45 @@ public static Object getAttributeFrom(EventContext cx, String name) {
         }
     }
 
-    protected void evalWithTag(String src, Class<? extends Tag> tag) {
-        evalWithTags(src, new Class[]{tag});
+    protected Source evalWithTag(String src, Class<? extends Tag> tag) {
+        return evalWithTags(src, new Class[]{tag});
     }
 
-    protected void evalAllTags(String src) {
-        evalWithTags(src, JSTags.ALL);
+    protected Source evalAllTags(String src) {
+        return evalWithTags(src, JSTags.ALL);
     }
 
-    protected void evalWithTags(String src, Class<?>[] filterTags) {
-        evalWithTags(src, filterTags, new Class[]{StandardTags.ExpressionTag.class, JSTags.InputNodeTag.class});
+    protected Source evalWithTags(String src, Class<?>[] filterTags) {
+        return evalWithTags(src, filterTags, new Class[]{StandardTags.ExpressionTag.class, JSTags.InputNodeTag.class});
     }
 
-    protected void evalWithTags(String src, Class<?>[] sourceSectionTags, Class<?>[] inputGeneratingTags) {
+    protected Source eval(String src) {
+        Source source = Source.create("js", src);
+        context.eval(source);
+        return source;
+    }
+
+    protected Source evalWithTags(String src, Class<?>[] sourceSectionTags, Class<?>[] inputGeneratingTags) {
+        binding = initAgent(sourceSectionTags, inputGeneratingTags);
+        Source source = Source.create("js", src);
+        evalWithCurrentBinding(source);
+        return source;
+    }
+
+    protected Source evalWithCurrentBinding(Source source) {
+        context.eval(source);
+        return source;
+    }
+
+    protected Source evalWithTags(Source source, Class<?>[] sourceSectionTags, Class<?>[] inputGeneratingTags) {
         binding = initAgent(sourceSectionTags, inputGeneratingTags);
-        context.eval("js", src);
+        context.eval(source);
+        return source;
+    }
+
+    protected Source evalWithNewTags(Source source, Class<?>[] sourceSectionTags, Class<?>[] inputGeneratingTags) {
+        binding.dispose();
+        return evalWithTags(source, sourceSectionTags, inputGeneratingTags);
     }
 
     protected void declareInteropSymbol(String name, ForeignTestObject foreignObject) {

graal-js/src/com.oracle.truffle.js.test.instrumentation/src/com/oracle/truffle/js/test/instrumentation/IfStatementTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

graal-js/src/com.oracle.truffle.js.test.instrumentation/src/com/oracle/truffle/js/test/instrumentation/InstrumentedNodesExecutionEventListener.java

@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.js.test.instrumentation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.EventContext;
+import com.oracle.truffle.api.instrumentation.ExecutionEventListener;
+import com.oracle.truffle.api.nodes.Node;
+
+public class InstrumentedNodesExecutionEventListener implements ExecutionEventListener {
+    List<Node> enteredNodes = new ArrayList<>();
+    List<Node> exitedNodes = new ArrayList<>();
+    List<Node> exceptionNodes = new ArrayList<>();
+
+    private final Set<Class<?>> classFilter;
+
+    public InstrumentedNodesExecutionEventListener(Class<?>... classFilter) {
+        this.classFilter = new HashSet<>(Arrays.asList(classFilter));
+    }
+
+    private boolean filter(Node node) {
+        return classFilter.isEmpty() || classFilter.stream().anyMatch(clazz -> clazz.isAssignableFrom(node.getClass()));
+    }
+
+    @Override
+    public void onEnter(EventContext context, VirtualFrame frame) {
+        if (filter(context.getInstrumentedNode())) {
+            enteredNodes.add(context.getInstrumentedNode());
+        }
+    }
+
+    @Override
+    public void onReturnValue(EventContext context, VirtualFrame frame, Object result) {
+        if (filter(context.getInstrumentedNode())) {
+            exitedNodes.add(context.getInstrumentedNode());
+        }
+    }
+
+    @Override
+    public void onReturnExceptional(EventContext context, VirtualFrame frame, Throwable exception) {
+        if (filter(context.getInstrumentedNode())) {
+            exceptionNodes.add(context.getInstrumentedNode());
+        }
+    }
+
+    public void checkEnteredNodes(List<? extends Node> expected) {
+        checkNodes(expected, enteredNodes);
+    }
+
+    public void checkExitedNodes(List<? extends Node> expected) {
+        checkNodes(expected, enteredNodes);
+    }
+
+    private static void checkNodes(List<? extends Node> expected, List<? extends Node> actual) {
+        assertEquals(expected.size(), actual.size());
+        for (int i = 0; i < expected.size(); i++) {
+            assertSame(expected.get(i), actual.get(i));
+        }
+    }
+}