[GR-27493] Cleanup python library declarations.

chumer · chumer · commit aa50351cddcf · 2020-11-25T09:11:07.000Z
PullRequest: graalpython/1420
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java
@@ -30,7 +30,6 @@
 import com.oracle.graal.python.builtins.objects.common.IndexNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
-import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
@@ -39,13 +38,14 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.library.ExportMessage.Ignore;
 import com.oracle.truffle.api.object.Shape;
 
-@ExportLibrary(PythonObjectLibrary.class)
+@ExportLibrary(InteropLibrary.class)
 public final class PByteArray extends PBytesLike {
 
     public PByteArray(Object cls, Shape instanceShape, byte[] bytes) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PBytes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PBytes.java
@@ -35,12 +35,14 @@
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.library.ExportMessage.Ignore;
 import com.oracle.truffle.api.object.Shape;
 
 @ExportLibrary(PythonObjectLibrary.class)
+@ExportLibrary(InteropLibrary.class)
 public final class PBytes extends PBytesLike {
 
     public PBytes(Object cls, Shape instanceShape, byte[] bytes) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ManagedMethodWrappers.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ManagedMethodWrappers.java
@@ -111,7 +111,6 @@ public Object getNativeType() {
     }
 
     @ExportLibrary(InteropLibrary.class)
-    @ExportLibrary(NativeTypeLibrary.class)
     static class MethKeywords extends MethodWrapper {
 
         public MethKeywords(Object method, Object typeid) {
@@ -151,7 +150,6 @@ public Object execute(Object[] arguments,
     }
 
     @ExportLibrary(InteropLibrary.class)
-    @ExportLibrary(NativeTypeLibrary.class)
     static class MethVarargs extends MethodWrapper {
 
         public MethVarargs(Object method) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeObjectReferenceArrayWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeObjectReferenceArrayWrapper.java
@@ -77,7 +77,6 @@ Object readArrayElement(long i) {
 
     abstract Object get(long i);
 
-    @ExportLibrary(InteropLibrary.class)
     static final class PointerArrayWrapper extends NativeObjectReferenceArrayWrapper {
         PointerArrayWrapper(NativeObjectReference[] data) {
             super(data);
@@ -89,7 +88,6 @@ Object get(long i) {
         }
     }
 
-    @ExportLibrary(InteropLibrary.class)
     static final class RefCountArrayWrapper extends NativeObjectReferenceArrayWrapper {
         RefCountArrayWrapper(NativeObjectReference[] data) {
             super(data);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyUnicodeWrappers.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyUnicodeWrappers.java
@@ -130,7 +130,6 @@ Object getNativeType() {
      * A native wrapper for the {@code data} member of {@code PyUnicodeObject}.
      */
     @ExportLibrary(InteropLibrary.class)
-    @ExportLibrary(NativeTypeLibrary.class)
     public static class PyUnicodeData extends PyUnicodeWrapper {
         public PyUnicodeData(PString delegate) {
             super(delegate);
@@ -185,7 +184,6 @@ Object readMember(String member,
      * A native wrapper for the {@code state} member of {@code PyASCIIObject}.
      */
     @ExportLibrary(InteropLibrary.class)
-    @ExportLibrary(NativeTypeLibrary.class)
     public static class PyUnicodeState extends PyUnicodeWrapper {
         @CompilationFinal private CharsetEncoder asciiEncoder;
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java
@@ -419,7 +419,6 @@ private RootCallTarget ensureCallTarget() {
 
     }
 
-    @ExportLibrary(InteropLibrary.class)
     public static final class GraalHPyUnaryArithmetic extends GraalHPyArithmetic {
         private final UnaryArithmetic unaryOperator;
 
@@ -442,7 +441,6 @@ protected RootCallTarget createCallTarget(PythonLanguage language) {
         }
     }
 
-    @ExportLibrary(InteropLibrary.class)
     public static final class GraalHPyBinaryArithmetic extends GraalHPyArithmetic {
         private final BinaryArithmetic binaryOperator;
 
@@ -465,7 +463,6 @@ protected RootCallTarget createCallTarget(PythonLanguage language) {
         }
     }
 
-    @ExportLibrary(InteropLibrary.class)
     public static final class GraalHPyTernaryArithmetic extends GraalHPyArithmetic {
         private final TernaryArithmetic ternaryOperator;
 
@@ -488,7 +485,6 @@ protected RootCallTarget createCallTarget(PythonLanguage language) {
         }
     }
 
-    @ExportLibrary(InteropLibrary.class)
     public static final class GraalHPyInplaceArithmetic extends GraalHPyArithmetic {
         private final InplaceArithmetic inplaceOperator;
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PBuiltinFunction.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PBuiltinFunction.java
@@ -58,13 +58,15 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @ExportLibrary(PythonObjectLibrary.class)
+@ExportLibrary(InteropLibrary.class)
 public final class PBuiltinFunction extends PythonBuiltinObject implements BoundBuiltinCallable<PBuiltinFunction> {
 
     private final String name;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java
@@ -64,6 +64,7 @@
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @ExportLibrary(InteropLibrary.class)
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PInt extends PythonBuiltinObject {
 
     public static final BigInteger MAX_INT = BigInteger.valueOf(Integer.MAX_VALUE);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PBaseSetIterator.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PBaseSetIterator.java
@@ -28,12 +28,9 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary.HashingStorageIterator;
 import com.oracle.graal.python.builtins.objects.dict.PHashingStorageIterator;
-import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.set.PBaseSet;
-import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.object.Shape;
 
-@ExportLibrary(PythonObjectLibrary.class)
 public final class PBaseSetIterator extends PHashingStorageIterator<Object> {
     private final PBaseSet set;
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/PBuiltinMethod.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/PBuiltinMethod.java
@@ -31,13 +31,15 @@
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.library.ExportMessage.Ignore;
 import com.oracle.truffle.api.object.Shape;
 
 // Corresponds to PyCFunction, but that name is just confusing
 @ExportLibrary(PythonObjectLibrary.class)
+@ExportLibrary(InteropLibrary.class)
 public final class PBuiltinMethod extends PythonBuiltinObject {
 
     private final PBuiltinFunction function;
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
@@ -41,16 +41,18 @@
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Shape;
 
 @ImportStatic(HiddenAttributes.class)
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PythonModule extends PythonObject {
     public PythonModule(Object clazz, Shape instanceShape) {
         super(clazz, instanceShape);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java
@@ -45,6 +45,7 @@
  * A Python built-in class that is immutable.
  */
 @ExportLibrary(InteropLibrary.class)
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PythonBuiltinClass extends PythonManagedClass {
     private final PythonBuiltinClassType type;
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java
@@ -43,6 +43,7 @@
  * Mutable class.
  */
 @ExportLibrary(InteropLibrary.class)
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PythonClass extends PythonManagedClass {
 
     public PythonClass(PythonLanguage lang, Object typeClass, Shape instanceShape, String name, PythonAbstractClass[] baseClasses) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonManagedClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonManagedClass.java
@@ -38,6 +38,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonClassNativeWrapper;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.ComputeMroNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetSubclassesNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -53,10 +54,12 @@
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Shape;
 
+@ExportLibrary(PythonObjectLibrary.class)
 public abstract class PythonManagedClass extends PythonObject implements PythonAbstractClass {
     @CompilationFinal(dimensions = 1) private PythonAbstractClass[] baseClasses;
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java
@@ -130,6 +130,7 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 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.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -280,16 +281,18 @@ Object doit(Object klass,
     @GenerateNodeFactory
     public abstract static class MroNode extends PythonBuiltinNode {
         @Specialization(guards = "lib.isLazyPythonClass(klass)")
+        @SuppressWarnings("unused")
         Object doit(Object klass,
-                        @Cached("create()") GetMroNode getMroNode,
-                        @SuppressWarnings("unused") @CachedLibrary(limit = "2") PythonObjectLibrary lib) {
+                        @Cached GetMroNode getMroNode,
+                        @Shared("pythonLib") @CachedLibrary(limit = "2") PythonObjectLibrary lib) {
             PythonAbstractClass[] mro = getMroNode.execute(klass);
             return factory().createList(Arrays.copyOf(mro, mro.length, Object[].class));
         }
 
         @Specialization(guards = "!lib.isLazyPythonClass(object)")
+        @SuppressWarnings("unused")
         Object doit(Object object,
-                        @SuppressWarnings("unused") @CachedLibrary(limit = "2") PythonObjectLibrary lib) {
+                        @Shared("pythonLib") @CachedLibrary(limit = "2") PythonObjectLibrary lib) {
             throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, MRO, "type", object);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,6 @@ public Object getNativeType() {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`@ExportLibrary(InteropLibrary.class)`
`114`		`- @ExportLibrary(NativeTypeLibrary.class)`
`115`	`114`	`static class MethKeywords extends MethodWrapper {`
`116`	`115`
`117`	`116`	`public MethKeywords(Object method, Object typeid) {`
`@@ -151,7 +150,6 @@ public Object execute(Object[] arguments,`
`151`	`150`	`}`
`152`	`151`
`153`	`152`	`@ExportLibrary(InteropLibrary.class)`
`154`		`- @ExportLibrary(NativeTypeLibrary.class)`
`155`	`153`	`static class MethVarargs extends MethodWrapper {`
`156`	`154`
`157`	`155`	`public MethVarargs(Object method) {`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ Object readArrayElement(long i) {`
`77`	`77`
`78`	`78`	`abstract Object get(long i);`
`79`	`79`
`80`		`- @ExportLibrary(InteropLibrary.class)`
`81`	`80`	`static final class PointerArrayWrapper extends NativeObjectReferenceArrayWrapper {`
`82`	`81`	`PointerArrayWrapper(NativeObjectReference[] data) {`
`83`	`82`	`super(data);`
`@@ -89,7 +88,6 @@ Object get(long i) {`
`89`	`88`	`}`
`90`	`89`	`}`
`91`	`90`
`92`		`- @ExportLibrary(InteropLibrary.class)`
`93`	`91`	`static final class RefCountArrayWrapper extends NativeObjectReferenceArrayWrapper {`
`94`	`92`	`RefCountArrayWrapper(NativeObjectReference[] data) {`
`95`	`93`	`super(data);`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,6 @@ private RootCallTarget ensureCallTarget() {`
`419`	`419`
`420`	`420`	`}`
`421`	`421`
`422`		`- @ExportLibrary(InteropLibrary.class)`
`423`	`422`	`public static final class GraalHPyUnaryArithmetic extends GraalHPyArithmetic {`
`424`	`423`	`private final UnaryArithmetic unaryOperator;`
`425`	`424`
`@@ -442,7 +441,6 @@ protected RootCallTarget createCallTarget(PythonLanguage language) {`
`442`	`441`	`}`
`443`	`442`	`}`
`444`	`443`
`445`		`- @ExportLibrary(InteropLibrary.class)`
`446`	`444`	`public static final class GraalHPyBinaryArithmetic extends GraalHPyArithmetic {`
`447`	`445`	`private final BinaryArithmetic binaryOperator;`
`448`	`446`
`@@ -465,7 +463,6 @@ protected RootCallTarget createCallTarget(PythonLanguage language) {`
`465`	`463`	`}`
`466`	`464`	`}`
`467`	`465`
`468`		`- @ExportLibrary(InteropLibrary.class)`
`469`	`466`	`public static final class GraalHPyTernaryArithmetic extends GraalHPyArithmetic {`
`470`	`467`	`private final TernaryArithmetic ternaryOperator;`
`471`	`468`
`@@ -488,7 +485,6 @@ protected RootCallTarget createCallTarget(PythonLanguage language) {`
`488`	`485`	`}`
`489`	`486`	`}`
`490`	`487`
`491`		`- @ExportLibrary(InteropLibrary.class)`
`492`	`488`	`public static final class GraalHPyInplaceArithmetic extends GraalHPyArithmetic {`
`493`	`489`	`private final InplaceArithmetic inplaceOperator;`
`494`	`490`