Skip to content

Commit 5aa8c45

Browse files
authored
Merge pull request #98 from bulasevich/GR-60578
[Backport][GR-60578] Upgrade ASM dependency from 9.5 to 9.7.1.
2 parents b644352 + a8fa43e commit 5aa8c45

File tree

3 files changed

+27
-21
lines changed

3 files changed

+27
-21
lines changed

compiler/mx.compiler/suite.py

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,33 +85,39 @@
8585
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/batik-all-1.7.jar"],
8686
},
8787

88-
"ASM_9.5" : {
89-
"digest" : "sha512:9e65f2983783725bae196ca939b45246958731246df1c495089c8ea5ce646de77c4e01a5a9ba10642016bb3258e1727e9ebcece6e74d9e3c32f528025d76b955",
88+
"ASM_9.7.1" : {
89+
"digest" : "sha512:4767b01603dad5c79cc1e2b5f3722f72b1059d928f184f446ba11badeb1b381b3a3a9a801cc43d25d396df950b09d19597c73173c411b1da890de808b94f1f50",
90+
"sourceDigest" : "sha512:d7c0de5912d04949a3d06cad366ff35a877da2682d9c74579625d62686032ea9349aff6102b17f92e9ec7eb4e9b1cd906b649c6a3ac798bfb9e31e5425de009d",
9091
"maven" : {
9192
"groupId" : "org.ow2.asm",
9293
"artifactId" : "asm",
93-
"version" : "9.5",
94+
"version" : "9.7.1",
9495
},
96+
"license" : "BSD-new",
9597
},
9698

97-
"ASM_TREE_9.5" : {
98-
"digest" : "sha512:816de8f84c216a7bd97b2458bde64a4b99a039b7b59fbd1ef52edf8bf869edabb93967736fe0c61e8eb3e1520e0cefe69ba59cda12df30f9f85db75fb6c064f3",
99+
"ASM_TREE_9.7.1" : {
100+
"digest" : "sha512:e55008c392fdd35e95d3404766b12dd4b46e13d5c362fcd0ab42a65751a82737eaf0ebc857691d1916190d34407adfde4437615d69c278785416fd911e00978d",
101+
"sourceDigest" : "sha512:3cea80bc7b55679dfa3d2065c6cb6951007cc7817082e9fcf4c5e3cdc073c22eddf7c7899cff60b1092049ec9038e8d3aa9a8828ef731739bda8b5afcec30e86",
99102
"maven" : {
100103
"groupId" : "org.ow2.asm",
101104
"artifactId" : "asm-tree",
102-
"version" : "9.5",
105+
"version" : "9.7.1",
103106
},
104-
"dependencies" : ["ASM_9.5"],
107+
"dependencies" : ["ASM_9.7.1"],
108+
"license" : "BSD-new",
105109
},
106110

107-
"ASM_UTIL_9.5" : {
108-
"digest" : "sha512:f68284d8f8fd029f3f428112225b2035ed3a4216cf3b34e0aacc83c32a6d44ab5e5d128b60a13ef768e3396041a62cf63f7fd3445dc5a05ce0ae03a2b2ed3080",
111+
"ASM_UTIL_9.7.1" : {
112+
"digest" : "sha512:522d793d15a2c5ea6504a50222cf0750f1eab7b881cf289675042539b1aba8b3868197b1bebe729de728dd10020eb028ae16252dcd5d84fdcbf7f925832bc269",
113+
"sourceDigest" : "sha512:387aa887bfec24aec287d9aacebfdc0c2e1ab16a4adce933aecac6fc41545ce43a3eea0ed139db52dd0d0af910cfd2162aa4d6330a81b32b64b36f03b49db66a",
109114
"maven" : {
110115
"groupId" : "org.ow2.asm",
111116
"artifactId" : "asm-util",
112-
"version" : "9.5",
117+
"version" : "9.7.1",
113118
},
114-
"dependencies" : ["ASM_9.5"],
119+
"dependencies" : ["ASM_9.7.1"],
120+
"license" : "BSD-new",
115121
},
116122

117123
"HSDIS" : {
@@ -236,8 +242,8 @@
236242
"dependencies" : [
237243
"jdk.internal.vm.compiler",
238244
"mx:JUNIT",
239-
"ASM_TREE_9.5",
240-
"ASM_UTIL_9.5",
245+
"ASM_TREE_9.7.1",
246+
"ASM_UTIL_9.7.1",
241247
"JAVA_ALLOCATION_INSTRUMENTER",
242248
"truffle:TRUFFLE_SL_TEST",
243249
"truffle:TRUFFLE_TEST",
@@ -456,8 +462,8 @@
456462
"truffle:TRUFFLE_COMPILER",
457463
"truffle:TRUFFLE_RUNTIME",
458464
"regex:TREGEX",
459-
"ASM_TREE_9.5",
460-
"ASM_UTIL_9.5",
465+
"ASM_TREE_9.7.1",
466+
"ASM_UTIL_9.7.1",
461467
],
462468
"exclude" : [
463469
"mx:JUNIT",

espresso/mx.espresso/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"dependencies": [
112112
"truffle:TRUFFLE_API",
113113
"truffle:TRUFFLE_NFI",
114-
"truffle:TRUFFLE_ASM_9.5",
114+
"truffle:TRUFFLE_ASM_9.7.1",
115115
"com.oracle.truffle.espresso.jdwp",
116116
],
117117
"requires": [

truffle/mx.truffle/suite.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@
105105
"license": ["MIT"],
106106
},
107107

108-
"TRUFFLE_ASM_9.5" : {
109-
"digest" : "sha512:7a49aaa0c4b513ca54ce684a74a3848ba4caf486320125f08cb8872720dc1e789538729f45c46d6ccf1b1ea54f7c3770dc9682d13a3f1813a348168ee5c40b82",
110-
"urls": ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/com.oracle.truffle.api.impl.asm-9.5.0.jar"],
108+
"TRUFFLE_ASM_9.7.1" : {
109+
"digest" : "sha512:e677171df27f646c84f078d5a6256a84c871c0b02088953f204c424f61ad453fc52726370fc3f5bd5e6ba6bf70d4c0c735d09a5c3e298db289ae4c9e628b4c57",
110+
"urls": ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/com.oracle.truffle.api.impl.asm-9.7.1.jar"],
111111
},
112112

113113
"ICU4J" : {
@@ -304,7 +304,7 @@
304304
"sourceDirs" : ["src"],
305305
"dependencies" : [
306306
"com.oracle.truffle.api.exception",
307-
"truffle:TRUFFLE_ASM_9.5",
307+
"truffle:TRUFFLE_ASM_9.7.1",
308308
],
309309
"requires" : [
310310
"java.sql",
@@ -638,7 +638,7 @@
638638
"sourceDirs" : ["src"],
639639
"dependencies" : [
640640
"com.oracle.truffle.api",
641-
"truffle:TRUFFLE_ASM_9.5",
641+
"truffle:TRUFFLE_ASM_9.7.1",
642642
],
643643
"requires" : [
644644
"jdk.unsupported", # sun.misc.Unsafe

0 commit comments

Comments
 (0)