removed not necessary brach profiles before "throw raise()"

tomasstupka · tomasstupka · commit 6cefdca2f71e · 2021-11-18T12:11:53.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/ChainBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/ChainBuiltins.java
@@ -176,35 +176,28 @@ Object setState(VirtualFrame frame, PChain self, Object state,
                         @Cached LenNode lenNode,
                         @Cached GetItemNode getItemNode,
                         @Cached PyObjectLookupAttr getAttrNode,
-                        @Cached BranchProfile isNotTupleProfile,
-                        @Cached BranchProfile wrongLenProfile,
-                        @Cached BranchProfile len2Profile,
-                        @Cached BranchProfile sourceIteratorProfile,
-                        @Cached BranchProfile activeIteratorProfile) {
+                        @Cached BranchProfile len2Profile) {
             if (!(state instanceof PTuple)) {
-                isNotTupleProfile.enter();
                 throw raise(TypeError, IS_NOT_A, "state", "a length 1 or 2 tuple");
             }
             int len = (int) lenNode.execute(frame, state);
             if (len < 1 || len > 2) {
-                wrongLenProfile.enter();
                 throw raise(TypeError, IS_NOT_A, "state", "a length 1 or 2 tuple");
             }
             Object source = getItemNode.execute(frame, state, 0);
-            checkIterator(frame, getAttrNode, source, sourceIteratorProfile);
+            checkIterator(frame, getAttrNode, source);
             self.setSource(source);
             if (len == 2) {
                 len2Profile.enter();
                 Object active = getItemNode.execute(frame, state, 1);
-                checkIterator(frame, getAttrNode, active, activeIteratorProfile);
+                checkIterator(frame, getAttrNode, active);
                 self.setActive(active);
             }
             return PNone.NONE;
         }
 
-        private void checkIterator(VirtualFrame frame, PyObjectLookupAttr getAttrNode, Object obj, BranchProfile profile) throws PException {
+        private void checkIterator(VirtualFrame frame, PyObjectLookupAttr getAttrNode, Object obj) throws PException {
             if (getAttrNode.execute(frame, obj, __NEXT__) == PNone.NO_VALUE) {
-                profile.enter();
                 throw raise(TypeError, ARGUMENTS_MUST_BE_ITERATORS);
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/CombinationsBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/CombinationsBuiltins.java
@@ -232,12 +232,10 @@ Object setState(VirtualFrame frame, PAbstractCombinations self, Object state,
                         @Cached ConditionProfile noResultProfile,
                         @Cached LoopConditionProfile indicesProfile) {
             if (!(state instanceof PTuple)) {
-                isNotTupleProfile.enter();
                 throw raise(TypeError, IS_NOT_A, "state", "a length 1 or 2 tuple");
             }
             int len = (int) lenNode.execute(frame, state);
             if (len != 3) {
-                wrongLenProfile.enter();
                 throw raise(TypeError, IS_NOT_A, "state", "a length 1 or 2 tuple");
             }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/CycleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/CycleBuiltins.java
@@ -214,10 +214,8 @@ Object setState(VirtualFrame frame, PCycle self, Object state,
                         @Cached GetItemNode getItemNode,
                         @Cached IsBuiltinClassProfile isTypeErrorProfile,
                         @Cached ToArrayNode toArrayNode,
-                        @Cached PyNumberAsSizeNode asSizeNode,
-                        @Cached BranchProfile isNotTupleProfile) {
+                        @Cached PyNumberAsSizeNode asSizeNode) {
             if (!((state instanceof PTuple) && ((int) lenNode.execute(frame, state) == 2))) {
-                isNotTupleProfile.enter();
                 throw raise(TypeError, IS_NOT_A, "state", "2-tuple");
             }
             Object obj = getItemNode.execute(frame, state, 0);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/DropwhileBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/DropwhileBuiltins.java
@@ -129,12 +129,10 @@ Object reduce(PDropwhile self,
     public abstract static class SetStateNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object setState(PDropwhile self, Object state,
-                        @Cached CastToJavaBooleanNode castToBoolean,
-                        @Cached BranchProfile exceptionProfile) {
+                        @Cached CastToJavaBooleanNode castToBoolean) {
             try {
                 self.setDoneDropping(castToBoolean.execute(state));
             } catch (CannotCastException e) {
-                exceptionProfile.enter();
                 throw raise(ValueError, INVALID_ARGS, __SETSTATE__);
             }
             return PNone.NONE;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/GroupByBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/GroupByBuiltins.java
@@ -179,10 +179,8 @@ public abstract static class SetStateNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object setState(VirtualFrame frame, PGroupBy self, Object state,
                         @Cached TupleBuiltins.LenNode lenNode,
-                        @Cached TupleBuiltins.GetItemNode getItemNode,
-                        @Cached BranchProfile isNotTupleProfile) {
+                        @Cached TupleBuiltins.GetItemNode getItemNode) {
             if (!(state instanceof PTuple) || (int) lenNode.execute(frame, state) != 3) {
-                isNotTupleProfile.enter();
                 throw raise(TypeError, IS_NOT_A, "state", "3-tuple");
             }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/PermutationsBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/PermutationsBuiltins.java
@@ -189,18 +189,14 @@ Object setState(VirtualFrame frame, PPermutations self, Object state,
                         @Cached PyObjectSizeNode sizeNode,
                         @Cached GetItemNode getItemNode,
                         @Cached LoopConditionProfile indicesProfile,
-                        @Cached LoopConditionProfile cyclesProfile,
-                        @Cached BranchProfile wrongStateSizeProfile,
-                        @Cached BranchProfile wrongValuesSizeProfile) {
+                        @Cached LoopConditionProfile cyclesProfile) {
             if (sizeNode.execute(frame, state) != 3) {
-                wrongStateSizeProfile.enter();
                 throw raise(ValueError, INVALID_ARGS, __SETSTATE__);
             }
             Object indices = getItemNode.execute(frame, state, 0);
             Object cycles = getItemNode.execute(frame, state, 1);
             int poolLen = self.getPool().length;
             if (sizeNode.execute(frame, indices) != poolLen || sizeNode.execute(frame, cycles) != self.getR()) {
-                wrongValuesSizeProfile.enter();
                 throw raise(ValueError, INVALID_ARGS, __SETSTATE__);
             }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/TeeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/TeeBuiltins.java
@@ -79,7 +79,6 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(extendClasses = {PythonBuiltinClassType.PTee})
@@ -177,18 +176,13 @@ public abstract static class SetStateNode extends PythonBinaryBuiltinNode {
         Object setState(VirtualFrame frame, PTee self, Object state,
                         @Cached LenNode lenNode,
                         @Cached TupleBuiltins.GetItemNode getItemNode,
-                        @Cached CastToJavaIntLossyNode castToIntNode,
-                        @Cached BranchProfile isNotTupleProfile,
-                        @Cached BranchProfile isNotTeeDOProfile,
-                        @Cached BranchProfile wrongIndexProfile) {
+                        @Cached CastToJavaIntLossyNode castToIntNode) {
 
             if (!(state instanceof PTuple) || (int) lenNode.execute(frame, state) != 2) {
-                isNotTupleProfile.enter();
                 throw raise(TypeError, IS_NOT_A, "state", "2-tuple");
             }
             Object dataObject = getItemNode.execute(frame, state, 0);
             if (!(dataObject instanceof PTeeDataObject)) {
-                isNotTeeDOProfile.enter();
                 throw raise(TypeError, IS_NOT_A, "state", "_tee_dataobject");
             }
             self.setDataObj((PTeeDataObject) dataObject);
@@ -200,7 +194,6 @@ Object setState(VirtualFrame frame, PTee self, Object state,
                 throw raise(TypeError, INTEGER_REQUIRED_GOT, secondElement);
             }
             if (index < 0 || index > LINKCELLS) {
-                wrongIndexProfile.enter();
                 throw raise(ValueError, INDEX_OUT_OF_RANGE);
             }
             self.setIndex(index);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/TeeDataObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/TeeDataObjectBuiltins.java
@@ -124,22 +124,16 @@ private static void init(PTeeDataObject self, Object it, PTeeDataObject nxt) {
         Object init(VirtualFrame frame, PTeeDataObject self, Object it, PList values, Object nxt,
                         @Cached LenNode lenNode,
                         @Cached GetSequenceStorageNode getStorageNode,
-                        @Cached BranchProfile numreadLCProfile,
-                        @Cached BranchProfile numreadTooHighProfile,
-                        @Cached BranchProfile nxtNotDOProfile,
-                        @Cached BranchProfile nxtNotNoneProfile) {
+                        @Cached BranchProfile numreadLCProfile) {
             int numread = (int) lenNode.execute(frame, values);
             if (numread == LINKCELLS) {
                 numreadLCProfile.enter();
                 if (!(nxt instanceof PTeeDataObject)) {
-                    nxtNotDOProfile.enter();
                     throw raise(ValueError, S_MUST_BE_S, "_tee_dataobject next link", "_tee_dataobject");
                 }
             } else if (numread > LINKCELLS) {
-                numreadTooHighProfile.enter();
                 throw raise(ValueError, TDATAOBJECT_SHOULD_NOT_HAVE_MORE_LINKS, LINKCELLS);
             } else if (!(nxt instanceof PNone)) {
-                nxtNotNoneProfile.enter();
                 throw raise(ValueError, TDATAOBJECT_SHOULDNT_HAVE_NEXT);
             }
             self.setIt(it);

Original file line number	Diff line number	Diff line change
`@@ -232,12 +232,10 @@ Object setState(VirtualFrame frame, PAbstractCombinations self, Object state,`
`232`	`232`	`@Cached ConditionProfile noResultProfile,`
`233`	`233`	`@Cached LoopConditionProfile indicesProfile) {`
`234`	`234`	`if (!(state instanceof PTuple)) {`
`235`		`- isNotTupleProfile.enter();`
`236`	`235`	`throw raise(TypeError, IS_NOT_A, "state", "a length 1 or 2 tuple");`
`237`	`236`	`}`
`238`	`237`	`int len = (int) lenNode.execute(frame, state);`
`239`	`238`	`if (len != 3) {`
`240`		`- wrongLenProfile.enter();`
`241`	`239`	`throw raise(TypeError, IS_NOT_A, "state", "a length 1 or 2 tuple");`
`242`	`240`	`}`
`243`	`241`