[GR-34219] [GR-34235] Backport: Instrumentation-related fixes.

PullRequest: js/2186

Author: gilles-duboscq

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -42,7 +42,10 @@
 
 import com.oracle.truffle.api.instrumentation.LoadSourceEvent;
 import com.oracle.truffle.api.instrumentation.LoadSourceListener;
+import com.oracle.truffle.api.instrumentation.LoadSourceSectionEvent;
+import com.oracle.truffle.api.instrumentation.LoadSourceSectionListener;
 import com.oracle.truffle.api.instrumentation.SourceFilter;
+import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
 import com.oracle.truffle.api.instrumentation.TruffleInstrument;
 import com.oracle.truffle.js.lang.JavaScriptLanguage;
 import org.graalvm.polyglot.Context;
@@ -83,6 +86,12 @@ public void onLoad(LoadSourceEvent event) {
                     // no action needed
                 }
             }, true);
+            env.getInstrumenter().visitLoadedSourceSections(SourceSectionFilter.ANY, new LoadSourceSectionListener() {
+                @Override
+                public void onLoad(LoadSourceSectionEvent event) {
+                    // no action needed
+                }
+            });
         }
     }
 }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/binary/JSTypeofIdenticalNode.java

@@ -59,6 +59,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.js.lang.JavaScriptLanguage;
 import com.oracle.truffle.js.nodes.JavaScriptNode;
 import com.oracle.truffle.js.nodes.access.JSConstantNode;
 import com.oracle.truffle.js.nodes.access.JSConstantNode.JSConstantStringNode;
@@ -181,11 +182,27 @@ public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag
         }
     }
 
+    private JavaScriptLanguage getLanguageSafe() {
+        JavaScriptLanguage language = null;
+        try {
+            language = getRootNode().getLanguage(JavaScriptLanguage.class);
+            if (language == null) {
+                language = getLanguage();
+            }
+        } finally {
+            return language;
+        }
+    }
+
     private Object[] parseMaterializationInfo() {
         String literal;
         boolean identity;
         boolean typeofAsLeftOperand;
-        JSContext context = getLanguage().getJSContext();
+        JavaScriptLanguage language = getLanguageSafe();
+        if (language == null) {
+            return null;
+        }
+        JSContext context = language.getJSContext();
         try {
             Expression expression = context.getEvaluator().parseExpression(context, getSourceSection().getCharacters().toString());
             if (expression instanceof BinaryNode) {

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode.test/src/com/oracle/truffle/trufflenode/test/CoverageLikeInstrument.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2021, 2021, 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.trufflenode.test;
+
+import com.oracle.truffle.api.Option;
+import com.oracle.truffle.api.instrumentation.LoadSourceSectionEvent;
+import com.oracle.truffle.api.instrumentation.LoadSourceSectionListener;
+import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
+import com.oracle.truffle.api.instrumentation.TruffleInstrument;
+import org.graalvm.options.OptionCategory;
+import org.graalvm.options.OptionDescriptors;
+import org.graalvm.options.OptionKey;
+
+/**
+ * Instrument with a source section listener (with a root name filter). It resembles
+ * {@code coverage} instrument.
+ */
+@Option.Group(CoverageLikeInstrument.ID)
+@TruffleInstrument.Registration(id = CoverageLikeInstrument.ID, name = "Coverage-like Instrument")
+public class CoverageLikeInstrument extends TruffleInstrument implements LoadSourceSectionListener {
+    static final String ID = "coverage-like-instrument";
+
+    @Option(name = "", help = "Enable the instrument.", category = OptionCategory.USER) //
+    static final OptionKey<Boolean> ENABLED = new OptionKey<>(true);
+
+    @Override
+    protected OptionDescriptors getOptionDescriptors() {
+        return new CoverageLikeInstrumentOptionDescriptors();
+    }
+
+    @Override
+    protected void onCreate(final TruffleInstrument.Env environment) {
+        SourceSectionFilter filter = SourceSectionFilter.newBuilder().rootNameIs((name) -> true).build();
+        environment.getInstrumenter().attachLoadSourceSectionListener(filter, this, true);
+    }
+
+    @Override
+    public void onLoad(LoadSourceSectionEvent event) {
+    }
+
+}

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/GraalJSAccess.java

@@ -1752,6 +1752,7 @@ private DynamicObject functionTemplateCreateCallback(JSContext context, JSRealm
         if (functionData == null) {
             JSOrdinary instanceLayout = template.getInstanceTemplate().getInternalFieldCount() > 0 ? JSOrdinary.INTERNAL_FIELD_INSTANCE : JSOrdinary.INSTANCE;
             functionData = JSFunctionData.create(context, template.getLength(), template.getClassName(), template.getPrototypeTemplate() != null, false, false, false);
+            template.setFunctionData(functionData);
             CallTarget callTarget = Truffle.getRuntime().createCallTarget(new ExecuteNativeFunctionNode.NativeFunctionRootNode(this, context, template, false, false));
             CallTarget newCallTarget = Truffle.getRuntime().createCallTarget(new ExecuteNativeFunctionNode.NativeFunctionRootNode(this, context, template, true, false));
             CallTarget newTargetCallTarget = Truffle.getRuntime().createCallTarget(new ExecuteNativeFunctionNode.NativeFunctionRootNode(this, context, template, true, true));
@@ -1760,7 +1761,6 @@ private DynamicObject functionTemplateCreateCallback(JSContext context, JSRealm
             functionData.setCallTarget(callTarget);
             functionData.setConstructTarget(constructTarget);
             functionData.setConstructNewTarget(constructNewTarget);
-            template.setFunctionData(functionData);
         }
 
         DynamicObject functionObject = JSFunction.create(realm, functionData);

graal-nodejs/mx.graal-nodejs/mx_graal_nodejs.py

@@ -362,6 +362,7 @@ def testnodeInstrument(args, nonZeroIsFatal=True, out=None, err=None, cwd=None):
     test = join(_suite.dir, 'test', 'graal', 'instrument', 'async-test.js')
     node(['--experimental-options', '--testing-agent', '-ea', test], nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
     node(['--experimental-options', '--broken-instrument', '-e', '6*7'], nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
+    node(['--experimental-options', '--coverage-like-instrument', '-e', '6*7'], nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
 
 def testnode(args, nonZeroIsFatal=True, out=None, err=None, cwd=None):
     mode, vmArgs, progArgs = setupNodeEnvironment(args)