Fix style

fangerer · fangerer · commit 684dbef4f344 · 2021-05-17T11:43:53.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java
@@ -219,8 +219,8 @@ public NodeFactory getNodeFactory() {
     }
 
     /**
-     * <b>DO NOT DIRECTLY USE THIS METHOD !!!</b>
-     * Instead, use {@link PythonContext#getThreadState(PythonLanguage)}}.
+     * <b>DO NOT DIRECTLY USE THIS METHOD !!!</b> Instead, use
+     * {@link PythonContext#getThreadState(PythonLanguage)}}.
      */
     public ContextThreadLocal<PythonThreadState> getThreadStateLocal() {
         return threadState;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java
@@ -79,7 +79,6 @@
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
-import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonContext.GetThreadStateNode;
 import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
 import com.oracle.graal.python.util.PythonUtils;
@@ -89,7 +88,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -583,8 +581,7 @@ private Object readObjectBoundary(byte[] dataBytes) {
 
         @Specialization
         Object readObject(VirtualFrame frame, byte[] dataBytes, @SuppressWarnings("unused") int version,
-                        @Cached GetThreadStateNode getThreadStateNode,
-                        @CachedContext(PythonLanguage.class) PythonContext context) {
+                        @Cached GetThreadStateNode getThreadStateNode) {
             PythonThreadState threadState = getThreadStateNode.execute();
             Object state = IndirectCallContext.enter(frame, threadState, this);
             try {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PThreadState.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PThreadState.java
@@ -390,7 +390,7 @@ static Object doOverflowed(PythonThreadState threadState, String key, int value)
         }
 
         @Specialization(guards = {"!isCurrentExceptionMember(key)", "!isCaughtExceptionMember(key)"})
-        static Object doGeneric(PythonThreadState threadState, Object key, @SuppressWarnings("unused") Object value) throws UnknownIdentifierException {
+        static Object doGeneric(@SuppressWarnings("unused") PythonThreadState threadState, Object key, @SuppressWarnings("unused") Object value) throws UnknownIdentifierException {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             throw UnknownIdentifierException.create(key.toString());
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java
@@ -197,8 +197,8 @@ public final void execute(GraalHPyContext nativeContext, PException e) {
 
         @Specialization
         static void setCurrentException(Frame frame, GraalHPyContext nativeContext, PException e,
-                                        @Cached GetCurrentFrameRef getCurrentFrameRef,
-                                        @Cached GetThreadStateNode getThreadStateNode) {
+                        @Cached GetCurrentFrameRef getCurrentFrameRef,
+                        @Cached GetThreadStateNode getThreadStateNode) {
             // TODO connect f_back
             getCurrentFrameRef.execute(frame).markAsEscaped();
             getThreadStateNode.setCurrentException(nativeContext.getContext(), e);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java
@@ -97,7 +97,6 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleLanguage.LanguageReference;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java
@@ -54,19 +54,13 @@
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsSameTypeNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodesFactory.IsSameTypeNodeGen;
 import com.oracle.graal.python.nodes.ErrorMessages;
-import com.oracle.graal.python.nodes.IndirectCallNode;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNodeGen;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
-import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonContext.GetThreadStateNode;
-import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -1037,11 +1031,11 @@ public boolean isBuffer(Object receiver) {
     /**
      * Returns the length of the buffer, i.e. number of bytes.
      *
-     * @param receiver a buffer object. Use {@See isBuffer} to check if the receiver is a buffer or
-     *            not.
+     * @param receiver a buffer object. Use {@link #isBuffer(Object)} to check if the receiver is a
+     *            buffer or not.
      * @return Returns the length of the buffer
-     * @throws UnsupportedMessageException if the object is not a buffer. Use {@See isBuffer} to
-     *             check if the receiver is a buffer or not.
+     * @throws UnsupportedMessageException if the object is not a buffer. Use
+     *             {@link #isBuffer(Object)} to check if the receiver is a buffer or not.
      */
     @Abstract(ifExported = {"isBuffer", "getBufferBytes"})
     public int getBufferLength(Object receiver) throws UnsupportedMessageException {
@@ -1054,8 +1048,8 @@ public int getBufferLength(Object receiver) throws UnsupportedMessageException {
      * 
      * @param receiver a buffer object.
      * @return a byte array copy of the receiver's storage.
-     * @throws UnsupportedMessageException if the object is not a buffer. Use {@See isBuffer} to
-     *             check if the receiver is a buffer or not.
+     * @throws UnsupportedMessageException if the object is not a buffer. Use
+     *             {@link #isBuffer(Object)} to check if the receiver is a buffer or not.
      */
     @Abstract(ifExported = {"isBuffer", "getBufferLength"})
     public byte[] getBufferBytes(Object receiver) throws UnsupportedMessageException {
@@ -1070,7 +1064,7 @@ public byte[] getBufferBytes(Object receiver) throws UnsupportedMessageException
      *      {@code DefaultPythonObjectExports} implements the logic of how an unknown object is
      *      being checked.
      *
-     * @param receiver
+     * @param receiver the receiver Object
      * @return True if the receiver is a Foreign Object
      */
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java
@@ -132,7 +132,6 @@
 import com.oracle.graal.python.nodes.util.CastToJavaStringNodeGen;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonContext.GetThreadStateNode;
 import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -148,7 +147,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
-import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.CachedLanguage;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/IsSubtypeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/IsSubtypeNode.java
@@ -120,8 +120,9 @@ protected PythonBuiltinClassType getType(Object cls, ConditionProfile builtinTyp
     }
 
     @Specialization(guards = "isSameType(isSameTypeNode, derived, cls)")
+    @SuppressWarnings("unused")
     static boolean isIdentical(Object derived, Object cls,
-                    @SuppressWarnings("unused") @Cached IsSameTypeNode isSameTypeNode) {
+                    @Cached IsSameTypeNode isSameTypeNode) {
         // trivial case: derived == cls
         return true;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/TopLevelExceptionHandler.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/TopLevelExceptionHandler.java
@@ -75,7 +75,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
-import com.oracle.truffle.api.TruffleLanguage.LanguageReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ExceptionType;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -84,12 +83,11 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 
-public class TopLevelExceptionHandler extends RootNode {
+public final class TopLevelExceptionHandler extends RootNode {
     private final RootCallTarget innerCallTarget;
     private final PException exception;
     private final SourceSection sourceSection;
     private final Source source;
-    @CompilationFinal private LanguageReference<PythonLanguage> language;
     @CompilationFinal private ContextReference<PythonContext> context;
 
     @Child private GilNode gilNode = GilNode.create();
@@ -111,11 +109,7 @@ public TopLevelExceptionHandler(PythonLanguage language, PException exception) {
     }
 
     private PythonLanguage getPythonLanguage() {
-        if (language == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            language = lookupLanguageReference(PythonLanguage.class);
-        }
-        return language.get();
+        return getLanguage(PythonLanguage.class);
     }
 
     private PythonContext getContext() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/CastToListExpressionNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/CastToListExpressionNode.java
@@ -167,7 +167,7 @@ protected PList starredGeneric(VirtualFrame frame, Object v,
                         @Cached ConstructListNode constructListNode,
                         @Cached IsBuiltinClassProfile attrProfile,
                         @Cached PRaiseNode raise,
-                                       @Shared("getThreadStateNode") @Cached GetThreadStateNode getThreadStateNode) {
+                        @Shared("getThreadStateNode") @Cached GetThreadStateNode getThreadStateNode) {
             PythonThreadState threadState = getThreadStateNode.execute();
             Object state = IndirectCallContext.enter(frame, threadState, this);
             try {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadCallerFrameNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadCallerFrameNode.java
@@ -42,6 +42,7 @@
 
 import java.util.Objects;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.nodes.IndirectCallNode;
@@ -274,9 +275,9 @@ private static Frame getFrame(Node requestingNode, PFrame.Reference startFrame,
              * the stack (or not). That last Python caller before the Python frame we need must push
              * the info.
              *
-             * This can easily be seen when this is used to {@link PythonContext#peekTopFrameInfo()}
-             * , because in that case, that info must be set by the caller that is somewhere up the
-             * stack.
+             * This can easily be seen when this is used to
+             * {@link PythonContext#peekTopFrameInfo(PythonLanguage)} , because in that case, that
+             * info must be set by the caller that is somewhere up the stack.
              *
              * <pre>
              *                      ================
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java
@@ -104,6 +104,7 @@
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
+import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.TruffleSafepoint;
@@ -331,18 +332,17 @@ public final PFrame.Reference getTopFrameInfo() {
         @SuppressWarnings("unused")
         static PythonThreadState doNoShutdown(PythonContext noContext,
                         @Shared("language") @CachedLanguage PythonLanguage language,
-                        @Shared("context") @CachedContext(PythonLanguage.class) PythonContext context,
-                        @Bind("getThreadState(language, context)") PythonThreadState curThreadState) {
+                        @Bind("getThreadState(language)") PythonThreadState curThreadState) {
             return curThreadState;
         }
 
         @Specialization(guards = {"noContext == null"}, replaces = "doNoShutdown")
         static PythonThreadState doGeneric(@SuppressWarnings("unused") PythonContext noContext,
                         @Shared("language") @CachedLanguage PythonLanguage language,
-                        @Shared("context") @CachedContext(PythonLanguage.class) PythonContext context) {
-            PythonThreadState curThreadState = language.getThreadStateLocal().get(context.env.getContext());
+                        @Shared("context") @CachedContext(PythonLanguage.class) ContextReference<PythonContext> context) {
+            PythonThreadState curThreadState = language.getThreadStateLocal().get();
             if (curThreadState.isShuttingDown()) {
-                context.killThread();
+                context.get().killThread();
             }
             return curThreadState;
         }
@@ -351,7 +351,7 @@ static PythonThreadState doGeneric(@SuppressWarnings("unused") PythonContext noC
         @SuppressWarnings("unused")
         static PythonThreadState doNoShutdownWithContext(PythonContext context,
                         @Shared("language") @CachedLanguage PythonLanguage language,
-                        @Bind("getThreadState(language, context)") PythonThreadState curThreadState) {
+                        @Bind("getThreadState(language)") PythonThreadState curThreadState) {
             return curThreadState;
         }
 
@@ -365,8 +365,8 @@ static PythonThreadState doGenericWithContext(PythonContext context,
             return curThreadState;
         }
 
-        static PythonThreadState getThreadState(PythonLanguage language, PythonContext context) {
-            return language.getThreadStateLocal().get(context.env.getContext());
+        static PythonThreadState getThreadState(PythonLanguage language) {
+            return language.getThreadStateLocal().get();
         }
     }
 
@@ -607,28 +607,28 @@ public void setCurrentException(PythonLanguage language, PException e) {
         getThreadState(language).currentException = e;
     }
 
-    public PException getCurrentException(PythonLanguage language) {
-        return getThreadState(language).currentException;
+    public PException getCurrentException(PythonLanguage lang) {
+        return getThreadState(lang).currentException;
     }
 
-    public void setCaughtException(PythonLanguage language, PException e) {
-        getThreadState(language).caughtException = e;
+    public void setCaughtException(PythonLanguage lang, PException e) {
+        getThreadState(lang).caughtException = e;
     }
 
-    public PException getCaughtException(PythonLanguage language) {
-        return getThreadState(language).caughtException;
+    public PException getCaughtException(PythonLanguage lang) {
+        return getThreadState(lang).caughtException;
     }
 
-    public void setTopFrameInfo(PythonLanguage language, PFrame.Reference topframeref) {
-        getThreadState(language).topframeref = topframeref;
+    public void setTopFrameInfo(PythonLanguage lang, PFrame.Reference topframeref) {
+        getThreadState(lang).topframeref = topframeref;
     }
 
-    public PFrame.Reference popTopFrameInfo(PythonLanguage language) {
-        return getThreadState(language).popTopFrameInfo();
+    public PFrame.Reference popTopFrameInfo(PythonLanguage lang) {
+        return getThreadState(lang).popTopFrameInfo();
     }
 
-    public PFrame.Reference peekTopFrameInfo(PythonLanguage language) {
-        return getThreadState(language).topframeref;
+    public PFrame.Reference peekTopFrameInfo(PythonLanguage lang) {
+        return getThreadState(lang).topframeref;
     }
 
     @TruffleBoundary
@@ -1382,8 +1382,8 @@ public Thread[] getThreads() {
         return threadStateMapping.keySet().toArray(new Thread[0]);
     }
 
-    public PythonThreadState getThreadState(PythonLanguage language) {
-        PythonThreadState curThreadState = language.getThreadStateLocal().get();
+    public PythonThreadState getThreadState(PythonLanguage lang) {
+        PythonThreadState curThreadState = lang.getThreadStateLocal().get();
         if (CompilerDirectives.injectBranchProbability(CompilerDirectives.SLOWPATH_PROBABILITY, curThreadState.isShuttingDown())) {
             killThread();
         }

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ static Object doOverflowed(PythonThreadState threadState, String key, int value)`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`@Specialization(guards = {"!isCurrentExceptionMember(key)", "!isCaughtExceptionMember(key)"})`
`393`		`- static Object doGeneric(PythonThreadState threadState, Object key, @SuppressWarnings("unused") Object value) throws UnknownIdentifierException {`
	`393`	`+ static Object doGeneric(@SuppressWarnings("unused") PythonThreadState threadState, Object key, @SuppressWarnings("unused") Object value) throws UnknownIdentifierException {`
`394`	`394`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`395`	`395`	`throw UnknownIdentifierException.create(key.toString());`
`396`	`396`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,9 @@ protected PythonBuiltinClassType getType(Object cls, ConditionProfile builtinTyp`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`@Specialization(guards = "isSameType(isSameTypeNode, derived, cls)")`
	`123`	`+ @SuppressWarnings("unused")`
`123`	`124`	`static boolean isIdentical(Object derived, Object cls,`
`124`		`- @SuppressWarnings("unused") @Cached IsSameTypeNode isSameTypeNode) {`
	`125`	`+ @Cached IsSameTypeNode isSameTypeNode) {`
`125`	`126`	`// trivial case: derived == cls`
`126`	`127`	`return true;`
`127`	`128`	`}`