Skip to content

Commit 7b2ae14

Browse files
committed
Module BuiltinConstructors missing specialization
- fix builtinconstructors for module
1 parent 26c81c6 commit 7b2ae14

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
8989
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.PCallCapiFunction;
9090
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory;
91+
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
9192
import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
9293
import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
9394
import com.oracle.graal.python.builtins.objects.code.CodeNodes;
@@ -2390,7 +2391,7 @@ private CastToStringNode ensureCastToStringNode() {
23902391
}
23912392
}
23922393

2393-
@Builtin(name = MODULE, minNumOfPositionalArgs = 1, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PythonObject, isPublic = false)
2394+
@Builtin(name = MODULE, minNumOfPositionalArgs = 1, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PythonModule, isPublic = false)
23942395
@GenerateNodeFactory
23952396
@TypeSystemReference(PythonArithmeticTypes.class)
23962397
public abstract static class ModuleNode extends PythonBuiltinNode {
@@ -2411,6 +2412,12 @@ Object doManaged(PythonManagedClass self, Object[] varargs, PKeyword[] kwargs) {
24112412
Object doType(PythonBuiltinClassType self, Object[] varargs, PKeyword[] kwargs) {
24122413
return factory().createPythonModule(self);
24132414
}
2415+
2416+
@Specialization
2417+
@SuppressWarnings("unused")
2418+
Object doNative(PythonAbstractNativeObject self, Object[] varargs, PKeyword[] kwargs) {
2419+
return factory().createPythonModule(self);
2420+
}
24142421
}
24152422

24162423
@Builtin(name = "NotImplementedType", minNumOfPositionalArgs = 1, constructsClass = PythonBuiltinClassType.PNotImplemented, isPublic = false)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixResources.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
import java.util.Locale;
5555
import java.util.Map;
5656
import java.util.SortedMap;
57-
import java.util.concurrent.ConcurrentHashMap;
58-
import java.util.concurrent.ConcurrentSkipListMap;
57+
import java.util.TreeMap;
5958

6059
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
6160
import com.oracle.truffle.api.TruffleFile;
@@ -173,8 +172,8 @@ void setNewChannel(OutputStream outputStream) {
173172
}
174173

175174
public PosixResources() {
176-
files = new ConcurrentSkipListMap<>();
177-
filePaths = new ConcurrentHashMap<>();
175+
files = Collections.synchronizedSortedMap(new TreeMap<>());
176+
filePaths = Collections.synchronizedMap(new HashMap<>());
178177

179178
children = Collections.synchronizedList(new ArrayList<>());
180179
String osProperty = System.getProperty("os.name");

0 commit comments

Comments
 (0)