Skip to content

Commit a7fb66b

Browse files
msimacektimfel
authored andcommitted
Ad PyObjectTypeCheck
1 parent e1d24b3 commit a7fb66b

File tree

2 files changed

+71
-3
lines changed

2 files changed

+71
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -669,10 +669,10 @@ protected Object getPaths(String key) {
669669
@Builtin(name = "type_check", minNumOfPositionalArgs = 2)
670670
@GenerateNodeFactory
671671
public abstract static class TypeCheckNode extends PythonBinaryBuiltinNode {
672-
@Specialization(limit = "3")
672+
@Specialization
673673
boolean typeCheck(Object instance, Object cls,
674-
@CachedLibrary("instance") PythonObjectLibrary lib) {
675-
return lib.typeCheck(instance, cls);
674+
@Cached PyObjectTypeCheck typeCheckNode) {
675+
return typeCheckNode.execute(instance, cls);
676676
}
677677
}
678678

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/*
2+
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.graal.python.lib;
42+
43+
import com.oracle.graal.python.builtins.objects.type.TypeNodes;
44+
import com.oracle.graal.python.nodes.PNodeWithContext;
45+
import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
46+
import com.oracle.graal.python.nodes.object.GetClassNode;
47+
import com.oracle.truffle.api.dsl.Cached;
48+
import com.oracle.truffle.api.dsl.GenerateUncached;
49+
import com.oracle.truffle.api.dsl.Specialization;
50+
51+
/**
52+
* Equivalent of CPython's {@code PyObject_TypeCheck}. Performs a subclass check of an object
53+
* without considering changed {@code __class__} and without calling into {@code __instancecheck__}
54+
* or {@code __subclasscheck__}.
55+
*/
56+
@GenerateUncached
57+
public abstract class PyObjectTypeCheck extends PNodeWithContext {
58+
public abstract boolean execute(Object object, Object type);
59+
60+
@Specialization
61+
static boolean doGeneric(Object object, Object type,
62+
@Cached GetClassNode getClassNode,
63+
@Cached TypeNodes.IsSameTypeNode isSameTypeNode,
64+
@Cached IsSubtypeNode isSubtypeNode) {
65+
Object objectType = getClassNode.execute(object);
66+
return isSameTypeNode.execute(type, objectType) || isSubtypeNode.execute(objectType, type);
67+
}
68+
}

0 commit comments

Comments
 (0)