Change imports to shadowed jcodings and joni.

woess · woess · commit 6da8181c56c4 · 2024-02-26T16:40:57.000+01:00
diff --git a/src/main/java/org/truffleruby/cext/CExtNodes.java b/src/main/java/org/truffleruby/cext/CExtNodes.java
@@ -25,8 +25,8 @@
 import com.oracle.truffle.api.strings.MutableTruffleString;
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.api.strings.TruffleString.ErrorHandling;
-import org.jcodings.Encoding;
-import org.jcodings.IntHolder;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.IntHolder;
 import org.truffleruby.Layouts;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
@@ -1675,7 +1675,7 @@ public abstract static class RbTrMbcPutNode extends CoreMethodArrayArgumentsNode
         Object rbTrEncMbcPut(RubyEncoding enc, int code,
                 @Cached TruffleString.FromByteArrayNode fromByteArrayNode) {
             final Encoding encoding = enc.jcoding;
-            final byte buf[] = new byte[org.jcodings.Config.ENC_CODE_TO_MBC_MAXLEN];
+            final byte buf[] = new byte[org.graalvm.shadowed.org.jcodings.Config.ENC_CODE_TO_MBC_MAXLEN];
             final int resultLength = encoding.codeToMbc(code, buf, 0);
             final byte result[] = new byte[resultLength];
             if (resultLength > 0) {
diff --git a/src/main/java/org/truffleruby/core/CoreLibrary.java b/src/main/java/org/truffleruby/core/CoreLibrary.java
@@ -24,7 +24,7 @@
 
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
-import org.jcodings.transcode.EConvFlags;
+import org.graalvm.shadowed.org.jcodings.transcode.EConvFlags;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.annotations.CoreMethod;
diff --git a/src/main/java/org/truffleruby/core/encoding/EncodingConverterNodes.java b/src/main/java/org/truffleruby/core/encoding/EncodingConverterNodes.java
@@ -20,13 +20,13 @@
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.strings.InternalByteArray;
 import com.oracle.truffle.api.strings.TruffleString;
-import org.jcodings.Encoding;
-import org.jcodings.Ptr;
-import org.jcodings.transcode.EConv;
-import org.jcodings.transcode.EConvFlags;
-import org.jcodings.transcode.EConvResult;
-import org.jcodings.transcode.Transcoder;
-import org.jcodings.transcode.TranscoderDB;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.Ptr;
+import org.graalvm.shadowed.org.jcodings.transcode.EConv;
+import org.graalvm.shadowed.org.jcodings.transcode.EConvFlags;
+import org.graalvm.shadowed.org.jcodings.transcode.EConvResult;
+import org.graalvm.shadowed.org.jcodings.transcode.Transcoder;
+import org.graalvm.shadowed.org.jcodings.transcode.TranscoderDB;
 import org.truffleruby.annotations.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.CoreMethodNode;
diff --git a/src/main/java/org/truffleruby/core/encoding/EncodingManager.java b/src/main/java/org/truffleruby/core/encoding/EncodingManager.java
@@ -24,8 +24,8 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ProcessProperties;
-import org.jcodings.Encoding;
-import org.jcodings.EncodingDB;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.EncodingDB;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.annotations.SuppressFBWarnings;
diff --git a/src/main/java/org/truffleruby/core/encoding/EncodingNodes.java b/src/main/java/org/truffleruby/core/encoding/EncodingNodes.java
@@ -22,8 +22,8 @@
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.strings.AbstractTruffleString;
 import com.oracle.truffle.api.strings.TruffleString;
-import org.jcodings.Config;
-import org.jcodings.EncodingDB;
+import org.graalvm.shadowed.org.jcodings.Config;
+import org.graalvm.shadowed.org.jcodings.EncodingDB;
 import org.truffleruby.annotations.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.annotations.CoreModule;
diff --git a/src/main/java/org/truffleruby/core/encoding/Encodings.java b/src/main/java/org/truffleruby/core/encoding/Encodings.java
@@ -15,16 +15,16 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.strings.TruffleString;
-import org.jcodings.Encoding;
-import org.jcodings.EncodingDB;
-import org.jcodings.specific.ASCIIEncoding;
-import org.jcodings.specific.ISO8859_1Encoding;
-import org.jcodings.specific.USASCIIEncoding;
-import org.jcodings.specific.UTF16BEEncoding;
-import org.jcodings.specific.UTF16LEEncoding;
-import org.jcodings.specific.UTF32BEEncoding;
-import org.jcodings.specific.UTF32LEEncoding;
-import org.jcodings.specific.UTF8Encoding;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.EncodingDB;
+import org.graalvm.shadowed.org.jcodings.specific.ASCIIEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.ISO8859_1Encoding;
+import org.graalvm.shadowed.org.jcodings.specific.USASCIIEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.UTF16BEEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.UTF16LEEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.UTF32BEEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.UTF32LEEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.string.FrozenStringLiterals;
 import org.truffleruby.core.string.ImmutableRubyString;
diff --git a/src/main/java/org/truffleruby/core/encoding/RubyEncoding.java b/src/main/java/org/truffleruby/core/encoding/RubyEncoding.java
@@ -15,9 +15,9 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.strings.TruffleString;
-import org.jcodings.Encoding;
-import org.jcodings.specific.ASCIIEncoding;
-import org.jcodings.specific.USASCIIEncoding;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.specific.ASCIIEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.USASCIIEncoding;
 import org.truffleruby.RubyContext;
 import org.truffleruby.core.kernel.KernelNodes;
 import org.truffleruby.core.klass.RubyClass;
diff --git a/src/main/java/org/truffleruby/core/encoding/RubyEncodingConverter.java b/src/main/java/org/truffleruby/core/encoding/RubyEncodingConverter.java
@@ -10,7 +10,7 @@
 package org.truffleruby.core.encoding;
 
 import com.oracle.truffle.api.object.Shape;
-import org.jcodings.transcode.EConv;
+import org.graalvm.shadowed.org.jcodings.transcode.EConv;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.language.RubyDynamicObject;
 
diff --git a/src/main/java/org/truffleruby/core/encoding/TStringUtils.java b/src/main/java/org/truffleruby/core/encoding/TStringUtils.java
@@ -17,7 +17,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.strings.AbstractTruffleString;
-import org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.Encoding;
 
 import com.oracle.truffle.api.strings.TruffleString;
 import org.truffleruby.core.array.ArrayUtils;
diff --git a/src/main/java/org/truffleruby/core/encoding/TranscodingManager.java b/src/main/java/org/truffleruby/core/encoding/TranscodingManager.java
@@ -38,11 +38,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jcodings.transcode.TranscoderDB;
-import org.jcodings.unicode.UnicodeCodeRange;
-import org.jcodings.unicode.UnicodeEncoding;
-import org.jcodings.util.CaseInsensitiveBytesHash;
-import org.jcodings.util.Hash;
+import org.graalvm.shadowed.org.jcodings.transcode.TranscoderDB;
+import org.graalvm.shadowed.org.jcodings.unicode.UnicodeCodeRange;
+import org.graalvm.shadowed.org.jcodings.unicode.UnicodeEncoding;
+import org.graalvm.shadowed.org.jcodings.util.CaseInsensitiveBytesHash;
+import org.graalvm.shadowed.org.jcodings.util.Hash;
 
 import com.oracle.truffle.api.TruffleOptions;
 import org.truffleruby.core.string.StringUtils;
diff --git a/src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java b/src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java
@@ -41,15 +41,15 @@
 
 import com.oracle.truffle.api.strings.AbstractTruffleString;
 import com.oracle.truffle.api.strings.TruffleStringBuilder;
-import org.jcodings.Encoding;
-import org.jcodings.specific.EUCJPEncoding;
-import org.jcodings.specific.SJISEncoding;
-import org.jcodings.specific.USASCIIEncoding;
-import org.jcodings.specific.UTF8Encoding;
-import org.joni.Option;
-import org.joni.Regex;
-import org.joni.Syntax;
-import org.joni.exception.JOniException;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.specific.EUCJPEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.SJISEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.USASCIIEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.UTF8Encoding;
+import org.graalvm.shadowed.org.joni.Option;
+import org.graalvm.shadowed.org.joni.Regex;
+import org.graalvm.shadowed.org.joni.Syntax;
+import org.graalvm.shadowed.org.joni.exception.JOniException;
 import org.truffleruby.RubyContext;
 import org.truffleruby.annotations.SuppressFBWarnings;
 import org.truffleruby.collections.ByteArrayBuilder;
diff --git a/src/main/java/org/truffleruby/core/regexp/EncodingCache.java b/src/main/java/org/truffleruby/core/regexp/EncodingCache.java
@@ -14,7 +14,7 @@
 import java.util.function.Function;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import org.joni.Regex;
+import org.graalvm.shadowed.org.joni.Regex;
 import org.truffleruby.collections.ConcurrentOperations;
 import org.truffleruby.core.encoding.RubyEncoding;
 
diff --git a/src/main/java/org/truffleruby/core/regexp/MatchDataNodes.java b/src/main/java/org/truffleruby/core/regexp/MatchDataNodes.java
@@ -22,10 +22,10 @@
 import com.oracle.truffle.api.profiles.InlinedLoopConditionProfile;
 import com.oracle.truffle.api.strings.AbstractTruffleString;
 import com.oracle.truffle.api.strings.TruffleString;
-import org.joni.NameEntry;
-import org.joni.Regex;
-import org.joni.Region;
-import org.joni.exception.ValueException;
+import org.graalvm.shadowed.org.joni.NameEntry;
+import org.graalvm.shadowed.org.joni.Regex;
+import org.graalvm.shadowed.org.joni.Region;
+import org.graalvm.shadowed.org.joni.exception.ValueException;
 import org.truffleruby.annotations.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.annotations.CoreModule;
diff --git a/src/main/java/org/truffleruby/core/regexp/RegexWarnCallback.java b/src/main/java/org/truffleruby/core/regexp/RegexWarnCallback.java
@@ -9,7 +9,7 @@
  */
 package org.truffleruby.core.regexp;
 
-import org.joni.WarnCallback;
+import org.graalvm.shadowed.org.joni.WarnCallback;
 import org.truffleruby.parser.RubyWarnings;
 
 public final class RegexWarnCallback implements WarnCallback {
diff --git a/src/main/java/org/truffleruby/core/regexp/RegexWarnDeferredCallback.java b/src/main/java/org/truffleruby/core/regexp/RegexWarnDeferredCallback.java
@@ -9,7 +9,7 @@
  */
 package org.truffleruby.core.regexp;
 
-import org.joni.WarnCallback;
+import org.graalvm.shadowed.org.joni.WarnCallback;
 import org.truffleruby.parser.RubyDeferredWarnings;
 
 public final class RegexWarnDeferredCallback implements WarnCallback {
diff --git a/src/main/java/org/truffleruby/core/regexp/RegexpNodes.java b/src/main/java/org/truffleruby/core/regexp/RegexpNodes.java
@@ -16,7 +16,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.strings.TruffleString;
-import org.joni.NameEntry;
+import org.graalvm.shadowed.org.joni.NameEntry;
 import org.truffleruby.annotations.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.annotations.CoreModule;
diff --git a/src/main/java/org/truffleruby/core/regexp/RegexpOptions.java b/src/main/java/org/truffleruby/core/regexp/RegexpOptions.java
@@ -9,8 +9,8 @@
  */
 package org.truffleruby.core.regexp;
 
-import org.jcodings.Encoding;
-import org.jcodings.specific.ASCIIEncoding;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.specific.ASCIIEncoding;
 import org.truffleruby.core.string.KCode;
 import org.truffleruby.parser.ReOptions;
 
diff --git a/src/main/java/org/truffleruby/core/regexp/RubyMatchData.java b/src/main/java/org/truffleruby/core/regexp/RubyMatchData.java
@@ -11,7 +11,7 @@
 
 import java.util.Set;
 
-import org.joni.Region;
+import org.graalvm.shadowed.org.joni.Region;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.ImmutableRubyString;
diff --git a/src/main/java/org/truffleruby/core/regexp/RubyRegexp.java b/src/main/java/org/truffleruby/core/regexp/RubyRegexp.java
@@ -19,7 +19,7 @@
 import com.oracle.truffle.api.nodes.Node;
 
 import com.oracle.truffle.api.strings.TruffleString;
-import org.joni.Regex;
+import org.graalvm.shadowed.org.joni.Regex;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.encoding.Encodings;
diff --git a/src/main/java/org/truffleruby/core/regexp/TruffleRegexpNodes.java b/src/main/java/org/truffleruby/core/regexp/TruffleRegexpNodes.java
@@ -38,10 +38,10 @@
 import com.oracle.truffle.api.profiles.InlinedLoopConditionProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.api.strings.TruffleString.AsTruffleStringNode;
-import org.joni.Matcher;
-import org.joni.Option;
-import org.joni.Regex;
-import org.joni.Region;
+import org.graalvm.shadowed.org.joni.Matcher;
+import org.graalvm.shadowed.org.joni.Option;
+import org.graalvm.shadowed.org.joni.Regex;
+import org.graalvm.shadowed.org.joni.Region;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.annotations.CoreMethod;
diff --git a/src/main/java/org/truffleruby/core/string/EncodingUtils.java b/src/main/java/org/truffleruby/core/string/EncodingUtils.java
@@ -30,9 +30,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jcodings.Encoding;
-import org.jcodings.ascii.AsciiTables;
-import org.jcodings.specific.ASCIIEncoding;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.ascii.AsciiTables;
+import org.graalvm.shadowed.org.jcodings.specific.ASCIIEncoding;
 
 public final class EncodingUtils {
 
diff --git a/src/main/java/org/truffleruby/core/string/KCode.java b/src/main/java/org/truffleruby/core/string/KCode.java
@@ -28,11 +28,11 @@
  ***** END LICENSE BLOCK *****/
 package org.truffleruby.core.string;
 
-import org.jcodings.Encoding;
-import org.jcodings.specific.ASCIIEncoding;
-import org.jcodings.specific.EUCJPEncoding;
-import org.jcodings.specific.UTF8Encoding;
-import org.jcodings.specific.Windows_31JEncoding;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.specific.ASCIIEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.EUCJPEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.UTF8Encoding;
+import org.graalvm.shadowed.org.jcodings.specific.Windows_31JEncoding;
 
 public enum KCode {
 
diff --git a/src/main/java/org/truffleruby/core/string/StringGuards.java b/src/main/java/org/truffleruby/core/string/StringGuards.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.strings.AbstractTruffleString;
 import com.oracle.truffle.api.strings.TruffleString;
-import org.jcodings.Config;
+import org.graalvm.shadowed.org.jcodings.Config;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.string.StringHelperNodes.SingleByteOptimizableNode;
 
diff --git a/src/main/java/org/truffleruby/core/string/StringNodes.java b/src/main/java/org/truffleruby/core/string/StringNodes.java
@@ -95,10 +95,10 @@
 import com.oracle.truffle.api.strings.TruffleString.GetByteCodeRangeNode;
 import com.oracle.truffle.api.strings.TruffleStringIterator;
 import org.graalvm.collections.Pair;
-import org.jcodings.Config;
-import org.jcodings.Encoding;
-import org.jcodings.ascii.AsciiTables;
-import org.jcodings.specific.ASCIIEncoding;
+import org.graalvm.shadowed.org.jcodings.Config;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.ascii.AsciiTables;
+import org.graalvm.shadowed.org.jcodings.specific.ASCIIEncoding;
 import org.truffleruby.Layouts;
 import org.truffleruby.annotations.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
diff --git a/src/main/java/org/truffleruby/core/string/StringOperations.java b/src/main/java/org/truffleruby/core/string/StringOperations.java
@@ -25,7 +25,7 @@
 package org.truffleruby.core.string;
 
 import com.oracle.truffle.api.strings.AbstractTruffleString;
-import org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.Encoding;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.encoding.Encodings;
diff --git a/src/main/java/org/truffleruby/core/string/StringSupport.java b/src/main/java/org/truffleruby/core/string/StringSupport.java
@@ -41,14 +41,14 @@
 import com.oracle.truffle.api.strings.TruffleString.ErrorHandling;
 import com.oracle.truffle.api.strings.TruffleString.FromByteArrayNode;
 import org.graalvm.collections.Pair;
-import org.jcodings.Config;
-import org.jcodings.Encoding;
-import org.jcodings.IntHolder;
-import org.jcodings.ascii.AsciiTables;
-import org.jcodings.constants.CharacterType;
-import org.jcodings.specific.ASCIIEncoding;
-import org.jcodings.specific.UTF8Encoding;
-import org.jcodings.util.IntHash;
+import org.graalvm.shadowed.org.jcodings.Config;
+import org.graalvm.shadowed.org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.IntHolder;
+import org.graalvm.shadowed.org.jcodings.ascii.AsciiTables;
+import org.graalvm.shadowed.org.jcodings.constants.CharacterType;
+import org.graalvm.shadowed.org.jcodings.specific.ASCIIEncoding;
+import org.graalvm.shadowed.org.jcodings.specific.UTF8Encoding;
+import org.graalvm.shadowed.org.jcodings.util.IntHash;
 import org.truffleruby.RubyContext;
 import org.truffleruby.collections.ByteArrayBuilder;
 import org.truffleruby.collections.IntHashMap;
@@ -650,7 +650,7 @@ public enum NeighborChar {
     // MRI: str_succ
     @TruffleBoundary
     public static TStringBuilder succCommon(RubyString original, Node node) {
-        byte carry[] = new byte[org.jcodings.Config.ENC_CODE_TO_MBC_MAXLEN];
+        byte carry[] = new byte[org.graalvm.shadowed.org.jcodings.Config.ENC_CODE_TO_MBC_MAXLEN];
         int carryP = 0;
         carry[0] = 1;
         int carryLen = 1;
@@ -794,7 +794,7 @@ public static NeighborChar succChar(RubyEncoding encoding, byte[] bytes, int p,
     private static NeighborChar succAlnumChar(RubyEncoding encoding, byte[] bytes, int p, int len, byte[] carry,
             int carryP, Node node) {
         Encoding enc = encoding.jcoding;
-        byte save[] = new byte[org.jcodings.Config.ENC_CODE_TO_MBC_MAXLEN];
+        byte save[] = new byte[org.graalvm.shadowed.org.jcodings.Config.ENC_CODE_TO_MBC_MAXLEN];
         int c = enc.mbcToCode(bytes, p, p + len);
 
         final int cType;
diff --git a/src/main/java/org/truffleruby/core/string/TStringBuilder.java b/src/main/java/org/truffleruby/core/string/TStringBuilder.java
@@ -11,7 +11,7 @@
 
 import com.oracle.truffle.api.strings.InternalByteArray;
 import com.oracle.truffle.api.strings.TruffleString;
-import org.jcodings.Encoding;
+import org.graalvm.shadowed.org.jcodings.Encoding;
 import org.truffleruby.collections.ByteArrayBuilder;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.RubyEncoding;
diff --git a/src/main/java/org/truffleruby/parser/RubyDeferredWarnings.java b/src/main/java/org/truffleruby/parser/RubyDeferredWarnings.java
@@ -33,7 +33,7 @@
 
 import java.util.ArrayList;
 
-import org.joni.WarnCallback;
+import org.graalvm.shadowed.org.joni.WarnCallback;
 
 public final class RubyDeferredWarnings implements WarnCallback {
 
diff --git a/src/main/java/org/truffleruby/parser/RubyWarnings.java b/src/main/java/org/truffleruby/parser/RubyWarnings.java
@@ -34,7 +34,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
-import org.joni.WarnCallback;
+import org.graalvm.shadowed.org.joni.WarnCallback;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.string.RubyString;
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
