Skip to content

Commit c51dedc

Browse files
djoooooeeregon
authored andcommitted
[GR-61411] Update JCodings to 1.0.63.
PullRequest: graal/20192
2 parents 490e1f1 + 7d33961 commit c51dedc

File tree

2 files changed

+6
-34
lines changed

2 files changed

+6
-34
lines changed

truffle/mx.truffle/suite.py

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@
9797
"digest": "sha512:22569a011d207fb8f33e7e71162542a5748cc3daa67eec59cbdc2aeb0894c331dfb8b6100ea88529c6cea72672cbddd77ca6134ddf331685d68b3e72b4e0a914",
9898
},
9999

100-
"JCODINGS_1.0.58": {
101-
"digest" : "sha512:625210aa07d1e08bf2f5fdc9da6c491a4e5a56e7db297cba1aa73636670ac1d62f3fd763716ef6ede862456b17169272ed9c8461d07100f95262163dc9c18ef8",
102-
"sourceDigest" : "sha512:d0f883f658310f7ad091aea08df28f1f5fe12080d6cb266cd91aec7e34cda1d57736d32618e8632b329854367d6e4d5fc91b5eb8ac9b823b26113fae3f75f50c",
100+
"JCODINGS_1.0.63": {
101+
"digest" : "sha512:280e989a1af7679da82bb9adb27a8c4e08c8da09f0bb93c380a36bfe7071c62bc9e7248b634d9e04f3ab275ec0672a44f8ab41dca8c10128c4351b6302275e84",
102+
"sourceDigest" : "sha512:f6843609284be7dbfdbc7530e34c15e6aea7d3a45c4ee8e6836ee42fafbb9306f7234e20d8abbfc6a13e28d885eb5d743d69bfbbf738932db1fe42e031a835e3",
103103
"maven": {
104104
"groupId": "org.jruby.jcodings",
105105
"artifactId": "jcodings",
106-
"version": "1.0.58",
106+
"version": "1.0.63",
107107
},
108108
"license": ["MIT"],
109109
},
@@ -1476,7 +1476,7 @@
14761476
"TRUFFLE_API"
14771477
],
14781478
"shadedDependencies" : [
1479-
"truffle:JCODINGS_1.0.58",
1479+
"truffle:JCODINGS_1.0.63",
14801480
],
14811481
"class" : "ShadedLibraryProject",
14821482
"shade" : {
@@ -1499,34 +1499,6 @@
14991499
"org/jcodings/util/ArrayReader.java" : {
15001500
"\"/tables/\"" : "\"/org/graalvm/shadowed/org/jcodings/tables/\"",
15011501
},
1502-
# Fix CESU8Encoding.leftAdjustCharHead by applying a stripped down version of:
1503-
# https://github.com/jruby/jcodings/pull/61/ (not in 1.0.58; remove when updating to a newer version).
1504-
"org/jcodings/specific/CESU8Encoding.java" : {
1505-
"""
1506-
(public int leftAdjustCharHead\\(byte\\[\\] bytes, int p, int s, int end\\) {
1507-
if \\(s <= p\\)
1508-
return s;
1509-
int p_ = s;
1510-
while \\(!utf8IsLead\\(bytes\\[p_\\] & 0xff\\) && p_ > p\\)
1511-
p_--;)(
1512-
return p_;
1513-
})
1514-
""" : """
1515-
\\1
1516-
if (p_ > p && s - p_ == 2 && Character.isLowSurrogate((char) utf8Decode3ByteSequence(bytes, p_))) {
1517-
int pSurrogatePair = p_ - 1;
1518-
while (!utf8IsLead(bytes[pSurrogatePair] & 0xff) && pSurrogatePair > p)
1519-
pSurrogatePair--;
1520-
if (p_ - pSurrogatePair == 3 && Character.isHighSurrogate((char) utf8Decode3ByteSequence(bytes, pSurrogatePair))) {
1521-
return pSurrogatePair;
1522-
}
1523-
}\\2
1524-
1525-
private static int utf8Decode3ByteSequence(byte[] bytes, int p) {
1526-
return ((bytes[p] & 0xF) << 12) | ((bytes[p + 1] & 0xff & 0x3f) << 6) | (bytes[p + 2] & 0xff & 0x3f);
1527-
}
1528-
""",
1529-
},
15301502
"org/jcodings/Encoding.java" : {
15311503
"(public static Encoding load\\([^()]*\\) \\{\\s*)[^{}]*(?:\\{[^{}]*\\}[^{}]*)*(\\s*\\})" : "\\1throw new InternalException(ErrorMessages.ERR_ENCODING_CLASS_DEF_NOT_FOUND, name);\\2"
15321504
},

vm/mx.vm/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
},
5050
{
5151
"name": "truffleruby",
52-
"version": "89ceb11eee2a96c6e587884fbbe75baa03f4901d",
52+
"version": "5dbebab55682e4c059d4ad606fb6e54d89e20ac4",
5353
"dynamic": True,
5454
"urls": [
5555
{"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},

0 commit comments

Comments
 (0)