Skip to content

Commit ec1e9c3

Browse files
committed
Fix ctypes on darwin
1 parent 10e6c62 commit ec1e9c3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesModuleBuiltins.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ Object py_dl_sym(VirtualFrame frame, Object obj, Object name,
847847

848848
@Builtin(name = "_dyld_shared_cache_contains_path", minNumOfPositionalArgs = 1)
849849
@GenerateNodeFactory
850-
protected abstract static class DyldSharedCacheConstainsPath extends PythonBinaryBuiltinNode {
850+
protected abstract static class DyldSharedCacheContainsPath extends PythonBinaryBuiltinNode {
851851
@CompilationFinal private static boolean hasDynamicLoaderCacheValue = false;
852852
@CompilationFinal private static boolean hasDynamicLoaderCacheInit = false;
853853

@@ -882,14 +882,14 @@ Object py_dyld_shared_pstring(VirtualFrame frame, PString ppath,
882882
@Cached TruffleString.ParseLongNode parseLongNode,
883883
@Cached TruffleString.SubstringNode substringNode,
884884
@Cached TruffleString.SwitchEncodingNode switchEncodingNode) {
885-
return py_dyld_shared_cache_contains_path(frame, ppath.getValueUncached().toJavaStringUncached(), ilib, codePointLengthNode, formatNode, parseLongNode, substringNode, switchEncodingNode);
885+
return py_dyld_shared_cache_contains_path(frame, ppath.getValueUncached(), ilib, codePointLengthNode, formatNode, parseLongNode, substringNode, switchEncodingNode);
886886
}
887887

888888
@CompilationFinal Object cachedFunction = null;
889889

890890
// TODO: 'path' might need to be processed using FSConverter.
891891
@Specialization
892-
Object py_dyld_shared_cache_contains_path(VirtualFrame frame, String path,
892+
Object py_dyld_shared_cache_contains_path(VirtualFrame frame, TruffleString path,
893893
@CachedLibrary(limit = "1") InteropLibrary ilib,
894894
@Cached TruffleString.CodePointLengthNode codePointLengthNode,
895895
@Cached StringUtils.SimpleTruffleStringFormatNode formatNode,
@@ -1360,13 +1360,13 @@ void _call_function_pointer(int flags,
13601360
if (restype == null) {
13611361
throw raise(RuntimeError, NO_FFI_TYPE_FOR_RESULT);
13621362
}
1363-
1363+
13641364
int cc = FFI_DEFAULT_ABI;
13651365
ffi_cif cif;
13661366
if (FFI_OK != ffi_prep_cif(&cif, cc, argcount, restype, atypes)) {
13671367
throw raise(RuntimeError, FFI_PREP_CIF_FAILED);
13681368
}
1369-
1369+
13701370
Object error_object = null;
13711371
if ((flags & (FUNCFLAG_USE_ERRNO | FUNCFLAG_USE_LASTERROR)) != 0) {
13721372
error_object = state.errno;

0 commit comments

Comments
 (0)