[GR-66462] Implement warnings.warn skip_file_prefixes argument

PullRequest: graalpython/3857

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/test_warnings.py

@@ -0,0 +1,60 @@
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import os
+import unittest
+import warnings
+from tests import warntest
+
+
+class TestWarnings(unittest.TestCase):
+    def test_skip_file_prefixes(self):
+        with warnings.catch_warnings(record=True) as w:
+            # First check that the stacklevels behave as expected for the test module
+            warntest.warn_indirect("Some warning")
+            self.assertEqual(w[-1].filename, warntest.__file__)
+            warntest.warn_indirect("Some warning", stacklevel=1)
+            self.assertEqual(w[-1].filename, warntest.__file__)
+            warntest.warn_indirect("Some warning", stacklevel=2)
+            self.assertEqual(w[-1].filename, warntest.__file__)
+            warntest.warn_indirect("Some warning", stacklevel=3)
+            self.assertEqual(w[-1].filename, __file__)
+            # Now test skip_file_prefixes
+            warntest.warn_indirect("Some warning", skip_file_prefixes=(os.path.dirname(warntest.__file__),))
+            self.assertEqual(w[-1].filename, __file__)

graalpython/com.oracle.graal.python.test/src/tests/warntest/__init__.py

@@ -0,0 +1,47 @@
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import warnings
+
+def warn(*args, **kwargs):
+    warnings.warn(*args, **kwargs)
+
+
+def warn_indirect(*args, **kwarg):
+    warn(*args, **kwarg)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -1209,7 +1209,7 @@ public static IndirectCallData lookupIndirectCallData(Node node) {
 
     public static IndirectCallData createIndirectCallData(Node node) {
         CompilerAsserts.neverPartOfCompilation();
-        return get(node).indirectCallDataMap.computeIfAbsent(node, n -> new IndirectCallData(node));
+        return get(node).indirectCallDataMap.computeIfAbsent(node, n -> new IndirectCallData());
     }
 
     public Source getOrCreateSource(Function<Object, Source> rootNodeFunction, Object key) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -310,7 +310,7 @@ public enum PythonBuiltinClassType implements TruffleObject {
                     When called, it accepts no arguments and returns a new featureless
                     instance that has no instance attributes and cannot be given any.
                     """)),
-    PythonClass("type", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict().slots(TypeBuiltins.SLOTS).doc("""
+    PythonClass("type", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict(264).slots(TypeBuiltins.SLOTS).doc("""
                     type(object) -> the object's type
                     type(name, bases, dict, **kwds) -> a new type""")),
     PArray("array", PythonObject, newBuilder().publishInModule("array").basetype().slots(ArrayBuiltins.SLOTS)),
@@ -361,7 +361,7 @@ public enum PythonBuiltinClassType implements TruffleObject {
                       - any object implementing the buffer API.
                       - an integer""")),
     PCell("cell", PythonObject, newBuilder().slots(CellBuiltins.SLOTS)),
-    PSimpleNamespace("SimpleNamespace", PythonObject, newBuilder().publishInModule("types").basetype().addDict().slots(SimpleNamespaceBuiltins.SLOTS).doc("""
+    PSimpleNamespace("SimpleNamespace", PythonObject, newBuilder().publishInModule("types").basetype().addDict(16).slots(SimpleNamespaceBuiltins.SLOTS).doc("""
                     A simple attribute-based namespace.
 
                     SimpleNamespace(**kwargs)""")),
@@ -405,7 +405,7 @@ This is equivalent to (real + imag*1j) where imag defaults to 0.""")),
                     dict(**kwargs) -> new dictionary initialized with the name=value pairs
                         in the keyword argument list.  For example:  dict(one=1, two=2)""")),
     PDefaultDict(J_DEFAULTDICT, PDict, newBuilder().moduleName("collections").publishInModule("_collections").basetype().slots(DefaultDictBuiltins.SLOTS)),
-    POrderedDict(J_ORDERED_DICT, PDict, newBuilder().publishInModule("_collections").basetype().addDict().slots(OrderedDictBuiltins.SLOTS)),
+    POrderedDict(J_ORDERED_DICT, PDict, newBuilder().publishInModule("_collections").basetype().addDict(96).slots(OrderedDictBuiltins.SLOTS)),
     PDictItemIterator(J_DICT_ITEMITERATOR, PythonObject, newBuilder().disallowInstantiation().slots(IteratorBuiltins.SLOTS)),
     PDictReverseItemIterator(J_DICT_REVERSE_ITEMITERATOR, PythonObject, newBuilder().slots(IteratorBuiltins.SLOTS)),
     PDictItemsView(J_DICT_ITEMS, PythonObject, newBuilder().disallowInstantiation().slots(DictViewBuiltins.SLOTS, DictReprBuiltin.SLOTS)),
@@ -579,7 +579,7 @@ or repr(object).
                     If iterable is specified the tuple is initialized from iterable's items.
 
                     If the argument is a tuple, the return value is the same object.""")),
-    PythonModule("module", PythonObject, newBuilder().basetype().addDict().slots(ModuleBuiltins.SLOTS).doc("""
+    PythonModule("module", PythonObject, newBuilder().basetype().addDict(16).slots(ModuleBuiltins.SLOTS).doc("""
                     Create a module object.
 
                     The name must be a string; the optional doc argument can have any type.""")),
@@ -624,7 +624,7 @@ passed as positional arguments to zip().  The i-th element in every tuple
     PSemLock("SemLock", PythonObject, newBuilder().publishInModule("_multiprocessing").basetype().slots(SemLockBuiltins.SLOTS)),
     PGraalPySemLock("SemLock", PythonObject, newBuilder().publishInModule("_multiprocessing_graalpy").basetype().slots(GraalPySemLockBuiltins.SLOTS)),
     PSocket("socket", PythonObject, newBuilder().publishInModule(J__SOCKET).basetype().slots(SocketBuiltins.SLOTS)),
-    PStaticmethod("staticmethod", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict().slots(StaticmethodBuiltins.SLOTS).doc("""
+    PStaticmethod("staticmethod", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict(24).slots(StaticmethodBuiltins.SLOTS).doc("""
                     staticmethod(function) -> method
 
                     Convert a function to be a static method.
@@ -643,7 +643,7 @@ It can be called either on the class (e.g. C.f()) or on an instance
 
                     Static methods in Python are similar to those found in Java or C++.
                     For a more advanced concept, see the classmethod builtin.""")),
-    PClassmethod("classmethod", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict().slots(ClassmethodCommonBuiltins.SLOTS, ClassmethodBuiltins.SLOTS).doc("""
+    PClassmethod("classmethod", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict(24).slots(ClassmethodCommonBuiltins.SLOTS, ClassmethodBuiltins.SLOTS).doc("""
                     classmethod(function) -> method
 
                     Convert a function to be a class method.
@@ -715,7 +715,7 @@ It can be called either on the class (e.g. C.f()) or on an instance
     // Errors and exceptions:
 
     // everything after BaseException is considered to be an exception
-    PBaseException("BaseException", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict().slots(BaseExceptionBuiltins.SLOTS).doc("""
+    PBaseException("BaseException", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict(16).slots(BaseExceptionBuiltins.SLOTS).doc("""
                     Common base class for all exceptions""")),
     PBaseExceptionGroup("BaseExceptionGroup", PBaseException, newBuilder().publishInModule(J_BUILTINS).basetype().addDict().slots(BaseExceptionGroupBuiltins.SLOTS).doc("""
                     A combination of multiple unrelated exceptions.""")),
@@ -1440,6 +1440,7 @@ private static final class TypeBuilder {
         private boolean basetype;
         private boolean heaptype;
         private boolean addDict;
+        private int dictoffset;
         private boolean disallowInstantiation;
         private TpSlots slots;
         private String doc;
@@ -1472,6 +1473,12 @@ public TypeBuilder addDict() {
             return this;
         }
 
+        public TypeBuilder addDict(int dictoffset) {
+            this.addDict = true;
+            this.dictoffset = dictoffset;
+            return this;
+        }
+
         public TypeBuilder disallowInstantiation() {
             this.disallowInstantiation = true;
             return this;
@@ -1507,6 +1514,7 @@ public TypeBuilder doc(String doc) {
     private final TruffleString printName;
     private final boolean basetype;
     private final boolean isBuiltinWithDict;
+    private final int dictoffset;
     private final boolean disallowInstantiation;
     private final TruffleString doc;
 
@@ -1536,6 +1544,13 @@ public TypeBuilder doc(String doc) {
         }
         this.basetype = builder.basetype;
         this.isBuiltinWithDict = builder.addDict;
+        int dictoffset = 0;
+        if (builder.dictoffset != 0) {
+            dictoffset = builder.dictoffset;
+        } else if (base != null) {
+            dictoffset = base.dictoffset;
+        }
+        this.dictoffset = dictoffset;
         this.weaklistoffset = -1;
         this.declaredSlots = builder.slots != null ? builder.slots : TpSlots.createEmpty();
         boolean disallowInstantiation = builder.disallowInstantiation;
@@ -1582,6 +1597,10 @@ public boolean isBuiltinWithDict() {
         return isBuiltinWithDict;
     }
 
+    public int getDictoffset() {
+        return dictoffset;
+    }
+
     public boolean disallowInstantiation() {
         return disallowInstantiation;
     }

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

@@ -2514,12 +2514,12 @@ class InitializeBuildClass {
                     // will use the explicitly given object as it is
                 }
             }
-            Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+            Object savedState = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);
             InitializeBuildClass init;
             try {
                 init = new InitializeBuildClass(ctx);
             } finally {
-                IndirectCallContext.exit(frame, indirectCallData, savedState);
+                IndirectCallContext.exit(frame, inliningTarget, indirectCallData, savedState);
             }
 
             Object ns;

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

@@ -159,7 +159,7 @@ static boolean compare(VirtualFrame frame, Object left, Object right,
                 if (!bufferAcquireLib.hasBuffer(left) || !bufferAcquireLib.hasBuffer(right)) {
                     throw raiseNode.raise(inliningTarget, TypeError, ErrorMessages.UNSUPPORTED_OPERAND_TYPES_OR_COMBINATION_OF_TYPES, left, right);
                 }
-                Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+                Object savedState = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);
                 Object leftBuffer = bufferAcquireLib.acquireReadonly(left);
                 try {
                     Object rightBuffer = bufferAcquireLib.acquireReadonly(right);
@@ -170,7 +170,7 @@ static boolean compare(VirtualFrame frame, Object left, Object right,
                     }
                 } finally {
                     bufferLib.release(leftBuffer);
-                    IndirectCallContext.exit(frame, indirectCallData, savedState);
+                    IndirectCallContext.exit(frame, inliningTarget, indirectCallData, savedState);
                 }
             }
         }