Skip to content

Commit 99ffdc0

Browse files
woessansalond
authored andcommitted
[GR-60615] Backport to 24.2: Upgrade ASM dependency to 9.7.1.
PullRequest: graal/19642
2 parents e0d7ec8 + cb1b51a commit 99ffdc0

File tree

3 files changed

+39
-33
lines changed

3 files changed

+39
-33
lines changed

compiler/mx.compiler/suite.py

+21-15
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" : {
@@ -244,8 +250,8 @@
244250
"dependencies" : [
245251
"jdk.graal.compiler",
246252
"mx:JUNIT",
247-
"ASM_TREE_9.5",
248-
"ASM_UTIL_9.5",
253+
"ASM_TREE_9.7.1",
254+
"ASM_UTIL_9.7.1",
249255
"JAVA_ALLOCATION_INSTRUMENTER",
250256
"truffle:TRUFFLE_SL_TEST",
251257
"truffle:TRUFFLE_TEST",
@@ -499,8 +505,8 @@
499505
"truffle:TRUFFLE_COMPILER",
500506
"truffle:TRUFFLE_RUNTIME",
501507
"regex:TREGEX",
502-
"ASM_TREE_9.5",
503-
"ASM_UTIL_9.5",
508+
"ASM_TREE_9.7.1",
509+
"ASM_UTIL_9.7.1",
504510
],
505511
"exclude" : [
506512
"mx:JUNIT",

espresso/mx.espresso/suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
"javaCompliance" : "17+",
347347
"spotbugs" : "false",
348348
"shadedDependencies" : [
349-
"truffle:ASM_9.5",
349+
"truffle:ASM_9.7.1",
350350
],
351351
"class" : "ShadedLibraryProject",
352352
"shade" : {

truffle/mx.truffle/suite.py

+17-17
Original file line numberDiff line numberDiff line change
@@ -108,38 +108,38 @@
108108
"license": ["MIT"],
109109
},
110110

111-
"ASM_9.5": {
112-
"digest": "sha512:9e65f2983783725bae196ca939b45246958731246df1c495089c8ea5ce646de77c4e01a5a9ba10642016bb3258e1727e9ebcece6e74d9e3c32f528025d76b955",
113-
"sourceDigest": "sha512:64262b68c1acd473a49be3c8a89190200be66808034c55fb23ed08d8a977111c234b6dc77b6ca95310e1f1cbc43437cdc863aadb6217976cc1720d63ef01e937",
111+
"ASM_9.7.1": {
112+
"digest": "sha512:4767b01603dad5c79cc1e2b5f3722f72b1059d928f184f446ba11badeb1b381b3a3a9a801cc43d25d396df950b09d19597c73173c411b1da890de808b94f1f50",
113+
"sourceDigest": "sha512:d7c0de5912d04949a3d06cad366ff35a877da2682d9c74579625d62686032ea9349aff6102b17f92e9ec7eb4e9b1cd906b649c6a3ac798bfb9e31e5425de009d",
114114
"maven": {
115115
"groupId": "org.ow2.asm",
116116
"artifactId": "asm",
117-
"version": "9.5",
117+
"version": "9.7.1",
118118
},
119119
"license": "BSD-new",
120120
},
121121

122-
"ASM_TREE_9.5": {
123-
"digest": "sha512:816de8f84c216a7bd97b2458bde64a4b99a039b7b59fbd1ef52edf8bf869edabb93967736fe0c61e8eb3e1520e0cefe69ba59cda12df30f9f85db75fb6c064f3",
124-
"sourceDigest": "sha512:a107043c05398091e3f3c614270c626be8ea5a1a547e30dc5709ef92069c8c8baa315c385a68f244c3a37bc148c3aeeec26adc8c00afc2a03a1d21a40e076a4c",
122+
"ASM_TREE_9.7.1": {
123+
"digest": "sha512:e55008c392fdd35e95d3404766b12dd4b46e13d5c362fcd0ab42a65751a82737eaf0ebc857691d1916190d34407adfde4437615d69c278785416fd911e00978d",
124+
"sourceDigest": "sha512:3cea80bc7b55679dfa3d2065c6cb6951007cc7817082e9fcf4c5e3cdc073c22eddf7c7899cff60b1092049ec9038e8d3aa9a8828ef731739bda8b5afcec30e86",
125125
"maven": {
126126
"groupId": "org.ow2.asm",
127127
"artifactId": "asm-tree",
128-
"version": "9.5",
128+
"version": "9.7.1",
129129
},
130-
"dependencies" : ["ASM_9.5"],
130+
"dependencies" : ["ASM_9.7.1"],
131131
"license": "BSD-new",
132132
},
133133

134-
"ASM_COMMONS_9.5": {
135-
"digest": "sha512:6121a9d033627a33839d9bd264fce4a531b6a3f974720adc6150816f0316d1522c3d8caf7df039fdd46cb66bedd788e50f709d4a1f75d3525912ad7a4d87f7da",
136-
"sourceDigest": "sha512:688d56a1b4fb6f7d86b79b7493a848851892910d00067a0c5effdaf7132266ec7a1ba57a8248c2fd6c0ebdef18a4918908a36e85f5927b9acb55448047a1e333",
134+
"ASM_COMMONS_9.7.1": {
135+
"digest": "sha512:81daf5765e387e6aeec5d45c4b9e4e1b471fb4f350931e5a214845c7c657a2142768f6902765e49c0ce2c595962e5d008883cba2e4a40c4bdce8f2e92518d2db",
136+
"sourceDigest": "sha512:dea8a2f871024210980821dc06c6796a3fca58293f650614275a086aaf9e2f45066a128f434dadabb85162c52796e99c863a6838e851ec02d6d97c603ed5a6d9",
137137
"maven": {
138138
"groupId": "org.ow2.asm",
139139
"artifactId": "asm-commons",
140-
"version": "9.5",
140+
"version": "9.7.1",
141141
},
142-
"dependencies" : ["ASM_9.5", "ASM_TREE_9.5"],
142+
"dependencies" : ["ASM_9.7.1", "ASM_TREE_9.7.1"],
143143
"license": "BSD-new",
144144
},
145145

@@ -1445,9 +1445,9 @@
14451445
"javaCompliance" : "17+",
14461446
"spotbugsIgnoresGenerated" : True,
14471447
"shadedDependencies" : [
1448-
"truffle:ASM_9.5",
1449-
"truffle:ASM_TREE_9.5",
1450-
"truffle:ASM_COMMONS_9.5",
1448+
"truffle:ASM_9.7.1",
1449+
"truffle:ASM_TREE_9.7.1",
1450+
"truffle:ASM_COMMONS_9.7.1",
14511451
],
14521452
"class" : "ShadedLibraryProject",
14531453
"shade" : {

0 commit comments

Comments
 (0)