cleanup docs and obsolete fields

Author: timfel

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

@@ -80,7 +80,7 @@ public void initialize(PythonCore core) {
             Object builtinDoc = builtin.doc().isEmpty() ? PNone.NONE : builtin.doc();
             if (constructsClass != PythonBuiltinClassType.nil) {
                 assert !builtin.isGetter() && !builtin.isSetter() && !builtin.isClassmethod() && !builtin.isStaticmethod();
-                // we explicitly do not make these "classmethods" here, since CPython also doesn't
+                // we explicitly do not make these "staticmethods" here, since CPython also doesn't
                 // for builtin types
                 PBuiltinFunction newFunc = core.factory().createBuiltinFunction(__NEW__, constructsClass, numDefaults(builtin), callTarget);
                 PythonBuiltinClass builtinClass = core.lookupType(constructsClass);
@@ -129,7 +129,7 @@ private void initializeEachFactoryWith(BiConsumer<NodeFactory<? extends PythonBu
                 if (!constructsClass) {
                     constructsClass = builtin.constructsClass() != PythonBuiltinClassType.nil;
                 } else {
-                    // we rely on this in PythonTpNewBuiltinNode#getOwner
+                    // we rely on this in WrapTpNew#getOwner
                     throw new IllegalStateException(String.format("Implementation error in %s: only one @Builtin annotation can declare a class constructor.", factory.getNodeClass().getName()));
                 }
                 func.accept(factory, builtin);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/WrapTpNew.java

@@ -72,8 +72,6 @@ public final class WrapTpNew extends SlotWrapper {
     private static final short NOT_SUBTP_STATE = 0b10000000;
     private static final short NOT_CLASS_STATE = 0b01000000;
     private static final short IS_UNSAFE_STATE = 0b00100000;
-    private static final short NONCONSTANT_MRO = 0b00010000;
-    private static final short MRO_LENGTH_MASK = 0b00001111;
 
     public WrapTpNew(BuiltinCallNode func) {
         super(func);
@@ -188,13 +186,11 @@ private PythonBuiltinClassType getOwner() {
 
     @Override
     public NodeCost getCost() {
-        if (state == 0) {
-            return NodeCost.UNINITIALIZED;
-        } else if ((state & ~MRO_LENGTH_MASK) == 0) {
-            // no error states, single mro
+        if (isType == null) {
+            // only run with owner
             return NodeCost.MONOMORPHIC;
-        } else if (((state & ~MRO_LENGTH_MASK) & NONCONSTANT_MRO) == NONCONSTANT_MRO) {
-            // no error states, multiple mros
+        } else if (state == 0) {
+            // no error states, but we did see a subtype
             return NodeCost.POLYMORPHIC;
         } else {
             // error states