Skip to content

Commit 013ccc1

Browse files
woesswoess
committed
[GR-65802] Insight only dumps block variables in GraalJS.
PullRequest: graal/21084
2 parents 3ff820f + 0489e12 commit 013ccc1

File tree

7 files changed

+132
-113
lines changed

7 files changed

+132
-113
lines changed

‎tools/src/com.oracle.truffle.tools.agentscript/src/com/oracle/truffle/tools/agentscript/impl/CurrentScopeView.java

Lines changed: 0 additions & 110 deletions
This file was deleted.

‎tools/src/com.oracle.truffle.tools.agentscript/src/com/oracle/truffle/tools/agentscript/impl/EventContextObject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private static Object iterateFrames(Object[] args, EventContextObject obj) throw
132132
Node instrumentableNode = findInstrumentableParent(n);
133133
if (instrumentableNode != null && lib.hasScope(instrumentableNode, frame)) {
134134
try {
135-
Object frameVars = new CurrentScopeView(lib.getScope(instrumentableNode, frame, false));
135+
Object frameVars = lib.getScope(instrumentableNode, frame, false);
136136
Object ret = iop.execute(callback, location, frameVars);
137137
return iop.isNull(ret) ? null : ret;
138138
} catch (UnsupportedMessageException | UnsupportedTypeException | ArityException ex) {

‎vm/mx.vm/ce-js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle
2-
COMPONENTS=cmp,cov,dap,gvm,icu4j,ins,insight,insightheap,js,jsl,jss,lg,lsp,nfi,nfi-libffi,ni,nic,nil,pro,rgx,sdk,sdkl,svm,svmt,svmnfi,svmsl,tfl,tfla,tflc,tflm,truffle-json
2+
COMPONENTS=cmp,cov,dap,gvm,icu4j,ins,insight,insightheap,js,jsl,jss,lg,lsp,nfi,nfi-libffi,ni,nic,nil,pro,rgx,sdk,sdkl,svm,svmt,svmnfi,svmsl,tfl,tfla,tflc,tflm,tflsm,truffle-json
33
NATIVE_IMAGES=lib:jsvm,lib:jvmcicompiler
44
NON_REBUILDABLE_IMAGES=lib:jvmcicompiler

‎vm/mx.vm/mx_vm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def local_path_to_url(args):
149149
mx_sdk_vm.register_vm_config('community', ce_unchained_components, _suite, env_file='ce-darwin-aarch64')
150150
mx_sdk_vm.register_vm_config('community', ce_unchained_components, _suite, env_file='ce')
151151
# Other GraalVMs
152-
mx_sdk_vm.register_vm_config('ce', ce_components + ['icu4j', 'xz', 'js', 'jsl', 'jss', 'rgx', 'bnative-image', 'snative-image-agent', 'snative-image-diagnostics-agent'], _suite, dist_name='ce-js', env_file='ce-js')
152+
mx_sdk_vm.register_vm_config('ce', ce_components + ['icu4j', 'xz', 'js', 'jsl', 'jss', 'rgx', 'bnative-image', 'snative-image-agent', 'snative-image-diagnostics-agent', 'tflsm'], _suite, dist_name='ce-js', env_file='ce-js')
153153
mx_sdk_vm.register_vm_config('ce', ce_components + ['gwal', 'gwa', 'icu4j', 'xz', 'js', 'jsl', 'jss', 'libpoly', 'njs', 'njsl', 'rgx', 'sjsvm', 'spolyglot', 'swasmvm'], _suite, dist_name='ce', env_file='ce-nodejs')
154154
mx_sdk_vm.register_vm_config('ce', ce_components_minimal + ['antlr4', 'llrn', 'llp', 'llrc', 'llrl', 'llrlf'], _suite, env_file='ce-llvm')
155155
mx_sdk_vm.register_vm_config('ce-python', ce_python_components, _suite)

‎vm/tests/all/agentscript/agent-blockscope-js.test

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
2+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3+
#
4+
# This code is free software; you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License version 2 only, as
6+
# published by the Free Software Foundation. Oracle designates this
7+
# particular file as subject to the "Classpath" exception as provided
8+
# by Oracle in the LICENSE file that accompanied this code.
9+
#
10+
# This code is distributed in the hope that it will be useful, but WITHOUT
11+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12+
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13+
# version 2 for more details (a copy is included in the LICENSE file that
14+
# accompanied this code).
15+
#
16+
# You should have received a copy of the GNU General Public License version
17+
# 2 along with this work; if not, write to the Free Software Foundation,
18+
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19+
#
20+
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
21+
# or visit www.oracle.com if you need additional information or have any
22+
# questions.
23+
#
24+
> js --insight=blockscopeinsight.js blockscope.js
25+
=== on enter at sumEvenNumbers (blockscope.js:32) : {i=0, limit=5, sum=0}
26+
frame at sumEvenNumbers (blockscope.js:32) : {i=0, limit=5, sum=0}
27+
=== on leave at sumEvenNumbers (blockscope.js:32) : {i=0, limit=5, sum=0}
28+
frame at sumEvenNumbers (blockscope.js:32) : {i=0, limit=5, sum=0}
29+
=== on enter at sumEvenNumbers (blockscope.js:32) : {i=2, limit=5, sum=0}
30+
frame at sumEvenNumbers (blockscope.js:32) : {i=2, limit=5, sum=0}
31+
=== on leave at sumEvenNumbers (blockscope.js:32) : {i=2, limit=5, sum=2}
32+
frame at sumEvenNumbers (blockscope.js:32) : {i=2, limit=5, sum=2}
33+
=== on enter at sumEvenNumbers (blockscope.js:32) : {i=4, limit=5, sum=2}
34+
frame at sumEvenNumbers (blockscope.js:32) : {i=4, limit=5, sum=2}
35+
=== on leave at sumEvenNumbers (blockscope.js:32) : {i=4, limit=5, sum=6}
36+
frame at sumEvenNumbers (blockscope.js:32) : {i=4, limit=5, sum=6}
37+
=== on leave at sumEvenNumbers (blockscope.js:26) : {sum=6}
38+
6

‎vm/tests/all/agentscript/blockscope.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
function sumEvenNumbers() {
27+
let sum = 0;
28+
{
29+
const limit = 5;
30+
for (let i = 0; i < limit; i++) {
31+
if (i % 2 === 0) {
32+
sum += i;
33+
}
34+
}
35+
}
36+
return sum;
37+
}
38+
39+
console.log(sumEvenNumbers());

‎vm/tests/all/agentscript/blockscopeinsight.js

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
function dumpVars(vars) {
27+
return Object.entries(vars).filter(([name]) => name != "this").map(([name, value]) => `${name}=${value}`).join(", ");
28+
}
29+
30+
for (let [eventId, eventName = eventId] of [["enter"], ["return", "leave"]]) {
31+
insight.on(eventId, function(ctx, frame) {
32+
console.log(`=== on ${eventName} at ${ctx.name} (${ctx.source.name}:${ctx.line}) : {${dumpVars(frame)}}`);
33+
ctx.iterateFrames((at, frameVars) => {
34+
if (at.name.endsWith("sumEvenNumbers")) {
35+
console.log(` frame at ${at.name} (${at.source.name}:${at.line}) : {${dumpVars(frameVars)}}`);
36+
}
37+
});
38+
}, {
39+
statements: true,
40+
at: {
41+
sourcePath: ".*blockscope.*",
42+
line: 32,
43+
}
44+
});
45+
}
46+
47+
insight.on("return", function(ctx, frame) {
48+
console.log(`=== on leave at ${ctx.name} (${ctx.source.name}:${ctx.line}) : {${dumpVars(frame)}}`);
49+
}, {
50+
roots: true,
51+
rootNameFilter: "sumEvenNumbers",
52+
});

0 commit comments

Comments
 (0)