Remove unchecked cast

otethal · otethal · commit ba6c31fe02d3 · 2024-04-23T09:53:51.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ReadlineModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ReadlineModuleBuiltins.java
@@ -106,7 +106,7 @@ public void postInitialize(Python3Core core) {
     abstract static class GetCompleterNode extends PythonUnaryBuiltinNode {
         @Specialization
         static Object getCompleter(PythonModule self) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             if (data.completer != null) {
                 return data.completer;
             } else {
@@ -120,7 +120,7 @@ static Object getCompleter(PythonModule self) {
     abstract static class SetCompleterNode extends PythonBinaryBuiltinNode {
         @Specialization
         PNone setCompleter(PythonModule self, Object callable) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             data.completer = callable;
             return PNone.NONE;
         }
@@ -134,7 +134,7 @@ abstract static class ParseAndBindNode extends PythonBinaryBuiltinNode {
         PNone setCompleter(PythonModule self, TruffleString tspec) {
             String spec = tspec.toJavaStringUncached();
             if (spec.startsWith("tab:")) {
-                LocalData data = self.getModuleState();
+                LocalData data = self.getModuleState(LocalData.class);
                 data.bindings.put("tab", spec.split(":")[1].trim());
                 return PNone.NONE;
             } else {
@@ -159,7 +159,7 @@ abstract static class GetHistoryLengthNode extends PythonUnaryBuiltinNode {
         @Specialization
         @TruffleBoundary
         int setCompleter(PythonModule self) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             return data.history.size();
         }
     }
@@ -170,7 +170,7 @@ abstract static class SetHistoryLengthNode extends PythonBinaryBuiltinNode {
         @Specialization
         @TruffleBoundary
         TruffleString setCompleter(PythonModule self, int index) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             try {
                 return data.history.get(index);
             } catch (IndexOutOfBoundsException e) {
@@ -192,7 +192,7 @@ TruffleString setCompleter(PythonModule self, int index, PString string,
         @Specialization
         @TruffleBoundary
         TruffleString setCompleter(PythonModule self, int index, TruffleString string) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             try {
                 return data.history.set(index, string);
             } catch (IndexOutOfBoundsException e) {
@@ -207,7 +207,7 @@ abstract static class DeleteItemNode extends PythonBinaryBuiltinNode {
         @Specialization
         @TruffleBoundary
         TruffleString setCompleter(PythonModule self, int index) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             try {
                 return data.history.remove(index);
             } catch (IndexOutOfBoundsException e) {
@@ -229,7 +229,7 @@ static PNone addHistory(PythonModule self, PString item,
         @Specialization
         @TruffleBoundary
         static PNone addHistory(PythonModule self, TruffleString item) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             data.history.add(item);
             return PNone.NONE;
         }
@@ -249,7 +249,7 @@ PNone setCompleter(PythonModule self, PString path,
         @TruffleBoundary
         @SuppressWarnings("try")
         PNone setCompleter(PythonModule self, TruffleString path) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             try (GilNode.UncachedRelease gil = GilNode.uncachedRelease()) {
                 BufferedReader reader = getContext().getEnv().getPublicTruffleFile(path.toJavaStringUncached()).newBufferedReader();
                 String line;
@@ -277,7 +277,7 @@ PNone setCompleter(PythonModule self, PString path,
         @Specialization
         @TruffleBoundary
         PNone setCompleter(PythonModule self, TruffleString path) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             try {
                 BufferedWriter writer = getContext().getEnv().getPublicTruffleFile(path.toJavaStringUncached()).newBufferedWriter(StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
                 for (TruffleString l : data.history) {
@@ -298,7 +298,7 @@ abstract static class ClearNode extends PythonUnaryBuiltinNode {
         @Specialization
         @TruffleBoundary
         static PNone setCompleter(PythonModule self) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             data.history.clear();
             return PNone.NONE;
         }
@@ -327,7 +327,7 @@ static PNone setCompleter() {
     abstract static class GetAutoHistoryNode extends PythonUnaryBuiltinNode {
         @Specialization
         static boolean setCompleter(PythonModule self) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             return data.autoHistory;
         }
     }
@@ -337,7 +337,7 @@ static boolean setCompleter(PythonModule self) {
     abstract static class SetAutoHistoryNode extends PythonBinaryBuiltinNode {
         @Specialization
         static PNone setCompleter(PythonModule self, boolean enabled) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             data.autoHistory = enabled;
             return PNone.NONE;
         }
@@ -348,7 +348,7 @@ static PNone setCompleter(PythonModule self, boolean enabled) {
     abstract static class SetCompleterDelimsNode extends PythonBinaryBuiltinNode {
         @Specialization
         static PNone setCompleterDelims(PythonModule self, TruffleString completerDelims) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             data.completerDelims = completerDelims;
             return PNone.NONE;
         }
@@ -359,7 +359,7 @@ static PNone setCompleterDelims(PythonModule self, TruffleString completerDelims
     abstract static class GetCompleterDelimsNode extends PythonBuiltinNode {
         @Specialization
         static Object getCompleterDelims(PythonModule self) {
-            LocalData data = self.getModuleState();
+            LocalData data = self.getModuleState(LocalData.class);
             return (data.completerDelims != null) ? data.completerDelims : PNone.NONE;
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SignalModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SignalModuleBuiltins.java
@@ -160,7 +160,7 @@ public void postInitialize(Python3Core core) {
     }
 
     public static void resetSignalHandlers(PythonModule mod) {
-        ModuleData data = mod.getModuleState();
+        ModuleData data = mod.getModuleState(ModuleData.class);
         if (data != null) {
             for (Map.Entry<Integer, SignalHandler> entry : data.defaultSignalHandlers.entrySet()) {
                 Signals.setSignalHandler(entry.getKey(), entry.getValue());
@@ -227,7 +227,7 @@ abstract static class AlarmNode extends PythonBinaryClinicBuiltinNode {
         @TruffleBoundary
         int alarm(PythonModule module, int seconds) {
             int remaining = 0;
-            ModuleData data = module.getModuleState();
+            ModuleData data = module.getModuleState(ModuleData.class);
             Signals.Alarm currentAlarm = data.currentAlarm;
             if (currentAlarm != null) {
                 if (currentAlarm.isRunning()) {
@@ -277,7 +277,7 @@ abstract static class GetSignalNode extends PythonBinaryClinicBuiltinNode {
         @Specialization
         @TruffleBoundary
         static Object getsignal(PythonModule mod, int signum) {
-            ModuleData data = mod.getModuleState();
+            ModuleData data = mod.getModuleState(ModuleData.class);
             return handlerToPython(Signals.getCurrentSignalHandler(signum), signum, data);
         }
 
@@ -305,7 +305,7 @@ abstract static class SignalNode extends PythonTernaryBuiltinNode {
         @TruffleBoundary
         static Object signalHandler(PythonModule self, Object signal, Object handler,
                         @Bind("this") Node inliningTarget) {
-            ModuleData data = self.getModuleState();
+            ModuleData data = self.getModuleState(ModuleData.class);
             int signum = PyNumberAsSizeNode.executeExactUncached(signal);
             if (PyCallableCheckNode.executeUncached(handler)) {
                 return signal(inliningTarget, signum, handler, data);
@@ -424,7 +424,7 @@ Object doIt(VirtualFrame frame, PythonModule self, int which, Object seconds, Ob
                         @Cached PyTimeFromObjectNode timeFromObjectNode,
                         @Cached PConstructAndRaiseNode.Lazy constructAndRaiseNode,
                         @Cached PythonObjectFactory factory) {
-            ModuleData moduleData = self.getModuleState();
+            ModuleData moduleData = self.getModuleState(ModuleData.class);
             long usDelay = toMicroseconds(frame, inliningTarget, seconds, timeFromObjectNode);
             long usInterval = toMicroseconds(frame, inliningTarget, interval, timeFromObjectNode);
             if (which != ITIMER_REAL) {
@@ -492,7 +492,7 @@ static Object doIt(VirtualFrame frame, PythonModule self, int which,
                         @Bind("this") Node inliningTarget,
                         @Cached PConstructAndRaiseNode.Lazy constructAndRaiseNode,
                         @Cached PythonObjectFactory factory) {
-            ModuleData moduleData = self.getModuleState();
+            ModuleData moduleData = self.getModuleState(ModuleData.class);
             if (which != ITIMER_REAL) {
                 throw constructAndRaiseNode.get(inliningTarget).raiseOSError(frame, OSErrorEnum.EINVAL);
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SocketModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SocketModuleBuiltins.java
@@ -231,7 +231,7 @@ public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments,
     public abstract static class GetDefaultTimeoutNode extends PythonUnaryBuiltinNode {
         @Specialization
         static Object get(PythonModule module) {
-            long timeout = module.getModuleState();
+            long timeout = module.getModuleState(Long.class);
             return timeout < 0 ? PNone.NONE : TimeUtils.pyTimeAsSecondsDouble(timeout);
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ThreadModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ThreadModuleBuiltins.java
@@ -177,7 +177,7 @@ abstract static class GetThreadCountNode extends PythonUnaryBuiltinNode {
         @Specialization
         @TruffleBoundary
         long getCount(PythonModule self) {
-            return self.<Integer> getModuleState();
+            return self.getModuleState(Integer.class);
         }
     }
 
@@ -230,7 +230,7 @@ long start(VirtualFrame frame, Object cls, Object callable, Object args, Object
             TruffleThreadBuilder threadBuilder = env.newTruffleThreadBuilder(() -> {
                 try (GilNode.UncachedAcquire gil = GilNode.uncachedAcquire()) {
                     // the increment is protected by the gil
-                    int curCount = threadModule.getModuleState();
+                    int curCount = threadModule.getModuleState(Integer.class);
                     threadModule.setModuleState(curCount + 1);
                     try {
                         // n.b.: It is important to pass 'null' frame here because each thread has
@@ -246,7 +246,7 @@ long start(VirtualFrame frame, Object cls, Object callable, Object args, Object
                         }
                         // SystemExit is silently ignored (see _threadmodule.c: thread_run)
                     } finally {
-                        curCount = threadModule.getModuleState();
+                        curCount = threadModule.getModuleState(Integer.class);
                         threadModule.setModuleState(curCount - 1);
                     }
                 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TimeModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TimeModuleBuiltins.java
@@ -339,7 +339,7 @@ static PTuple localtime(VirtualFrame frame, PythonModule module, Object seconds,
                         @Bind("this") Node inliningTarget,
                         @Cached ToLongTime toLongTime,
                         @Cached PythonObjectFactory factory) {
-            ModuleState moduleState = module.getModuleState();
+            ModuleState moduleState = module.getModuleState(ModuleState.class);
             return factory.createStructSeq(STRUCT_TIME_DESC, getTimeStruct(moduleState.currentZoneId, toLongTime.execute(frame, inliningTarget, seconds)));
         }
     }
@@ -440,7 +440,7 @@ abstract static class ProcessTimeNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
         Object getProcesTime(PythonModule self) {
-            ModuleState moduleState = self.getModuleState();
+            ModuleState moduleState = self.getModuleState(ModuleState.class);
             return (System.nanoTime() - PythonContext.get(this).getPerfCounterStart() - moduleState.timeSlept) / 1000_000_000.0;
         }
     }
@@ -452,7 +452,7 @@ abstract static class ProcessTimeNsNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
         Object getProcesNsTime(PythonModule self) {
-            ModuleState moduleState = self.getModuleState();
+            ModuleState moduleState = self.getModuleState(ModuleState.class);
             return (System.nanoTime() - PythonContext.get(this).getPerfCounterStart() - moduleState.timeSlept);
         }
     }
@@ -497,7 +497,7 @@ Object sleep(PythonModule self, long seconds,
                 doSleep(this, seconds, deadline);
             } finally {
                 gil.acquire();
-                ModuleState moduleState = self.getModuleState();
+                ModuleState moduleState = self.getModuleState(ModuleState.class);
                 moduleState.timeSlept = nanoTime() - t + moduleState.timeSlept;
             }
             PythonContext.triggerAsyncActions(this);
@@ -521,7 +521,7 @@ Object sleep(PythonModule self, double seconds,
                 doSleep(this, seconds, deadline);
             } finally {
                 gil.acquire();
-                ModuleState moduleState = self.getModuleState();
+                ModuleState moduleState = self.getModuleState(ModuleState.class);
                 moduleState.timeSlept = nanoTime() - t + moduleState.timeSlept;
             }
             PythonContext.triggerAsyncActions(this);
@@ -933,7 +933,7 @@ static TruffleString formatTime(PythonModule module, TruffleString format, @Supp
             if (byteIndexOfCodePointNode.execute(format, 0, 0, format.byteLength(TS_ENCODING), TS_ENCODING) >= 0) {
                 throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.ValueError, ErrorMessages.EMBEDDED_NULL_CHARACTER);
             }
-            ModuleState moduleState = module.getModuleState();
+            ModuleState moduleState = module.getModuleState(ModuleState.class);
             return format(toJavaStringNode.execute(format), getIntLocalTimeStruct(moduleState.currentZoneId, (long) timeSeconds()), fromJavaStringNode);
         }
 
@@ -985,7 +985,7 @@ static double mktime(VirtualFrame frame, PythonModule module, PTuple tuple,
             for (int i = 0; i < ELEMENT_COUNT; i++) {
                 integers[i] = asSizeNode.executeExact(frame, inliningTarget, items[i]);
             }
-            ModuleState moduleState = module.getModuleState();
+            ModuleState moduleState = module.getModuleState(ModuleState.class);
             return op(moduleState.currentZoneId, integers);
         }
 
@@ -1006,7 +1006,7 @@ public static TruffleString localtime(VirtualFrame frame, PythonModule module, O
                         @Bind("this") Node inliningTarget,
                         @Cached ToLongTime toLongTime,
                         @Cached TruffleString.FromJavaStringNode fromJavaStringNode) {
-            ModuleState moduleState = module.getModuleState();
+            ModuleState moduleState = module.getModuleState(ModuleState.class);
             int[] tm = getIntLocalTimeStruct(moduleState.currentZoneId, toLongTime.execute(frame, inliningTarget, seconds));
             return format(tm, fromJavaStringNode);
         }
@@ -1032,7 +1032,7 @@ public abstract static class ASCTimeNode extends PythonBinaryBuiltinNode {
         @Specialization
         static TruffleString localtime(PythonModule module, @SuppressWarnings("unused") PNone time,
                         @Shared("js2ts") @Cached TruffleString.FromJavaStringNode fromJavaStringNode) {
-            ModuleState moduleState = module.getModuleState();
+            ModuleState moduleState = module.getModuleState(ModuleState.class);
             return format(getIntLocalTimeStruct(moduleState.currentZoneId, (long) timeSeconds()), fromJavaStringNode);
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WarningsModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WarningsModuleBuiltins.java
@@ -445,28 +445,28 @@ private PFrame getCallerFrame(VirtualFrame frame, int stackLevel) {
          * uncached.
          */
         private static long getStateFiltersVersion(PythonModule warningsModule) {
-            return warningsModule.<ModuleState> getModuleState().filtersVersion;
+            return warningsModule.getModuleState(ModuleState.class).filtersVersion;
         }
 
         /**
          * On fast path.
          */
         private Object getStateFilters(PythonModule warningsModule) {
-            return warningsModule.<ModuleState> getModuleState().filters;
+            return warningsModule.getModuleState(ModuleState.class).filters;
         }
 
         /**
          * On slow path.
          */
         private static Object getStateOnceRegistry(PythonModule warningsModule) {
-            return warningsModule.<ModuleState> getModuleState().onceRegistry;
+            return warningsModule.getModuleState(ModuleState.class).onceRegistry;
         }
 
         /**
          * On fast path.
          */
         private Object getStateDefaultAction(PythonModule warningsModule) {
-            return warningsModule.<ModuleState> getModuleState().defaultAction;
+            return warningsModule.getModuleState(ModuleState.class).defaultAction;
         }
 
         /**
@@ -572,8 +572,7 @@ private TruffleString getDefaultAction(VirtualFrame frame, PythonModule module)
         private TruffleString getFilter(VirtualFrame frame, PythonModule _warnings, Object category, Object text, int lineno, Object module, Object[] item) {
             Object filters = getWarningsAttr(frame, T_FILTERS);
             if (filters != null) {
-                ModuleState moduleState = _warnings.getModuleState();
-                moduleState.filters = filters;
+                _warnings.getModuleState(ModuleState.class).filters = filters;
             } else {
                 filters = getStateFilters(_warnings);
             }
@@ -1067,7 +1066,7 @@ protected ArgumentClinicProvider getArgumentClinic() {
     abstract static class FiltersMutated extends PythonBuiltinNode {
         @Specialization
         static PNone mutate(PythonModule self) {
-            ModuleState moduleState = self.getModuleState();
+            ModuleState moduleState = self.getModuleState(ModuleState.class);
             moduleState.filtersVersion++;
             return PNone.NONE;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ast/AstModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ast/AstModuleBuiltins.java
@@ -132,7 +132,7 @@ PythonObject generic(Object cls, @SuppressWarnings("unused") Object[] varargs, @
     }
 
     private static AstState getAstState(PythonContext context) {
-        return context.lookupBuiltinModule(T__AST).getModuleState();
+        return context.lookupBuiltinModule(T__AST).getModuleState(AstState.class);
     }
 
     @TruffleBoundary
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/functools/LruCacheWrapperBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/functools/LruCacheWrapperBuiltins.java
@@ -187,7 +187,7 @@ static Object lruCacheNew(VirtualFrame frame, Object type,
             obj.misses = obj.hits = 0;
             obj.maxsize = maxsize;
 
-            obj.kwdMark = PythonContext.get(inliningTarget).lookupBuiltinModule(T_FUNCTOOLS).getModuleState();
+            obj.kwdMark = PythonContext.get(inliningTarget).lookupBuiltinModule(T_FUNCTOOLS).getModuleState(Object.class);
 
             obj.cacheInfoType = cache_info_type;
             // obj.dict = null;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/hashlib/HashlibModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/hashlib/HashlibModuleBuiltins.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/PythonModule.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/PythonModule.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/socket/SocketBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/socket/SocketBuiltins.java

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments,`
`231`	`231`	`public abstract static class GetDefaultTimeoutNode extends PythonUnaryBuiltinNode {`
`232`	`232`	`@Specialization`
`233`	`233`	`static Object get(PythonModule module) {`
`234`		`- long timeout = module.getModuleState();`
	`234`	`+ long timeout = module.getModuleState(Long.class);`
`235`	`235`	`return timeout < 0 ? PNone.NONE : TimeUtils.pyTimeAsSecondsDouble(timeout);`
`236`	`236`	`}`
`237`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ abstract static class GetThreadCountNode extends PythonUnaryBuiltinNode {`
`177`	`177`	`@Specialization`
`178`	`178`	`@TruffleBoundary`
`179`	`179`	`long getCount(PythonModule self) {`
`180`		`- return self.<Integer> getModuleState();`
	`180`	`+ return self.getModuleState(Integer.class);`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`
`@@ -230,7 +230,7 @@ long start(VirtualFrame frame, Object cls, Object callable, Object args, Object`
`230`	`230`	`TruffleThreadBuilder threadBuilder = env.newTruffleThreadBuilder(() -> {`
`231`	`231`	`try (GilNode.UncachedAcquire gil = GilNode.uncachedAcquire()) {`
`232`	`232`	`// the increment is protected by the gil`
`233`		`- int curCount = threadModule.getModuleState();`
	`233`	`+ int curCount = threadModule.getModuleState(Integer.class);`
`234`	`234`	`threadModule.setModuleState(curCount + 1);`
`235`	`235`	`try {`
`236`	`236`	`// n.b.: It is important to pass 'null' frame here because each thread has`
`@@ -246,7 +246,7 @@ long start(VirtualFrame frame, Object cls, Object callable, Object args, Object`
`246`	`246`	`}`
`247`	`247`	`// SystemExit is silently ignored (see _threadmodule.c: thread_run)`
`248`	`248`	`} finally {`
`249`		`- curCount = threadModule.getModuleState();`
	`249`	`+ curCount = threadModule.getModuleState(Integer.class);`
`250`	`250`	`threadModule.setModuleState(curCount - 1);`
`251`	`251`	`}`
`252`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ static PTuple localtime(VirtualFrame frame, PythonModule module, Object seconds,`
`339`	`339`	`@Bind("this") Node inliningTarget,`
`340`	`340`	`@Cached ToLongTime toLongTime,`
`341`	`341`	`@Cached PythonObjectFactory factory) {`
`342`		`- ModuleState moduleState = module.getModuleState();`
	`342`	`+ ModuleState moduleState = module.getModuleState(ModuleState.class);`
`343`	`343`	`return factory.createStructSeq(STRUCT_TIME_DESC, getTimeStruct(moduleState.currentZoneId, toLongTime.execute(frame, inliningTarget, seconds)));`
`344`	`344`	`}`
`345`	`345`	`}`
`@@ -440,7 +440,7 @@ abstract static class ProcessTimeNode extends PythonBuiltinNode {`
`440`	`440`	`@Specialization`
`441`	`441`	`@TruffleBoundary`
`442`	`442`	`Object getProcesTime(PythonModule self) {`
`443`		`- ModuleState moduleState = self.getModuleState();`
	`443`	`+ ModuleState moduleState = self.getModuleState(ModuleState.class);`
`444`	`444`	`return (System.nanoTime() - PythonContext.get(this).getPerfCounterStart() - moduleState.timeSlept) / 1000_000_000.0;`
`445`	`445`	`}`
`446`	`446`	`}`
`@@ -452,7 +452,7 @@ abstract static class ProcessTimeNsNode extends PythonBuiltinNode {`
`452`	`452`	`@Specialization`
`453`	`453`	`@TruffleBoundary`
`454`	`454`	`Object getProcesNsTime(PythonModule self) {`
`455`		`- ModuleState moduleState = self.getModuleState();`
	`455`	`+ ModuleState moduleState = self.getModuleState(ModuleState.class);`
`456`	`456`	`return (System.nanoTime() - PythonContext.get(this).getPerfCounterStart() - moduleState.timeSlept);`
`457`	`457`	`}`
`458`	`458`	`}`
`@@ -497,7 +497,7 @@ Object sleep(PythonModule self, long seconds,`
`497`	`497`	`doSleep(this, seconds, deadline);`
`498`	`498`	`} finally {`
`499`	`499`	`gil.acquire();`
`500`		`- ModuleState moduleState = self.getModuleState();`
	`500`	`+ ModuleState moduleState = self.getModuleState(ModuleState.class);`
`501`	`501`	`moduleState.timeSlept = nanoTime() - t + moduleState.timeSlept;`
`502`	`502`	`}`
`503`	`503`	`PythonContext.triggerAsyncActions(this);`
`@@ -521,7 +521,7 @@ Object sleep(PythonModule self, double seconds,`
`521`	`521`	`doSleep(this, seconds, deadline);`
`522`	`522`	`} finally {`
`523`	`523`	`gil.acquire();`
`524`		`- ModuleState moduleState = self.getModuleState();`
	`524`	`+ ModuleState moduleState = self.getModuleState(ModuleState.class);`
`525`	`525`	`moduleState.timeSlept = nanoTime() - t + moduleState.timeSlept;`
`526`	`526`	`}`
`527`	`527`	`PythonContext.triggerAsyncActions(this);`
`@@ -933,7 +933,7 @@ static TruffleString formatTime(PythonModule module, TruffleString format, @Supp`
`933`	`933`	`if (byteIndexOfCodePointNode.execute(format, 0, 0, format.byteLength(TS_ENCODING), TS_ENCODING) >= 0) {`
`934`	`934`	`throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.ValueError, ErrorMessages.EMBEDDED_NULL_CHARACTER);`
`935`	`935`	`}`
`936`		`- ModuleState moduleState = module.getModuleState();`
	`936`	`+ ModuleState moduleState = module.getModuleState(ModuleState.class);`
`937`	`937`	`return format(toJavaStringNode.execute(format), getIntLocalTimeStruct(moduleState.currentZoneId, (long) timeSeconds()), fromJavaStringNode);`
`938`	`938`	`}`
`939`	`939`
`@@ -985,7 +985,7 @@ static double mktime(VirtualFrame frame, PythonModule module, PTuple tuple,`
`985`	`985`	`for (int i = 0; i < ELEMENT_COUNT; i++) {`
`986`	`986`	`integers[i] = asSizeNode.executeExact(frame, inliningTarget, items[i]);`
`987`	`987`	`}`
`988`		`- ModuleState moduleState = module.getModuleState();`
	`988`	`+ ModuleState moduleState = module.getModuleState(ModuleState.class);`
`989`	`989`	`return op(moduleState.currentZoneId, integers);`
`990`	`990`	`}`
`991`	`991`
`@@ -1006,7 +1006,7 @@ public static TruffleString localtime(VirtualFrame frame, PythonModule module, O`
`1006`	`1006`	`@Bind("this") Node inliningTarget,`
`1007`	`1007`	`@Cached ToLongTime toLongTime,`
`1008`	`1008`	`@Cached TruffleString.FromJavaStringNode fromJavaStringNode) {`
`1009`		`- ModuleState moduleState = module.getModuleState();`
	`1009`	`+ ModuleState moduleState = module.getModuleState(ModuleState.class);`
`1010`	`1010`	`int[] tm = getIntLocalTimeStruct(moduleState.currentZoneId, toLongTime.execute(frame, inliningTarget, seconds));`
`1011`	`1011`	`return format(tm, fromJavaStringNode);`
`1012`	`1012`	`}`
`@@ -1032,7 +1032,7 @@ public abstract static class ASCTimeNode extends PythonBinaryBuiltinNode {`
`1032`	`1032`	`@Specialization`
`1033`	`1033`	`static TruffleString localtime(PythonModule module, @SuppressWarnings("unused") PNone time,`
`1034`	`1034`	`@Shared("js2ts") @Cached TruffleString.FromJavaStringNode fromJavaStringNode) {`
`1035`		`- ModuleState moduleState = module.getModuleState();`
	`1035`	`+ ModuleState moduleState = module.getModuleState(ModuleState.class);`
`1036`	`1036`	`return format(getIntLocalTimeStruct(moduleState.currentZoneId, (long) timeSeconds()), fromJavaStringNode);`
`1037`	`1037`	`}`
`1038`	`1038`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ PythonObject generic(Object cls, @SuppressWarnings("unused") Object[] varargs, @`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`private static AstState getAstState(PythonContext context) {`
`135`		`- return context.lookupBuiltinModule(T__AST).getModuleState();`
	`135`	`+ return context.lookupBuiltinModule(T__AST).getModuleState(AstState.class);`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`@TruffleBoundary`