Put reprLeave in finally blocks

msimacek · msimacek · commit 6e616854c262 · 2021-05-03T09:18:09.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedIOMixinBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedIOMixinBuiltins.java
@@ -389,9 +389,12 @@ Object repr(VirtualFrame frame, PBuffered self,
                 if (!getContext().reprEnter(self)) {
                     throw raise(RuntimeError, "reentrant call inside %s.__repr__", clazz);
                 } else {
-                    Object name = repr.executeObject(frame, nameobj);
-                    getContext().reprLeave(self);
-                    return PythonUtils.format("<%s name=%s>", clazz, name);
+                    try {
+                        Object name = repr.executeObject(frame, nameobj);
+                        return PythonUtils.format("<%s name=%s>", clazz, name);
+                    } finally {
+                        getContext().reprLeave(self);
+                    }
                 }
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java
@@ -1025,9 +1025,12 @@ Object doit(VirtualFrame frame, PFileIO self,
                 if (!getContext().reprEnter(self)) {
                     throw raise(RuntimeError, "reentrant call inside %p.__repr__", self);
                 } else {
-                    Object name = repr.executeObject(frame, nameobj);
-                    getContext().reprLeave(self);
-                    return PythonUtils.format("<_io.FileIO name=%s mode='%s' closefd=%s>", name, mode, closefd);
+                    try {
+                        Object name = repr.executeObject(frame, nameobj);
+                        return PythonUtils.format("<_io.FileIO name=%s mode='%s' closefd=%s>", name, mode, closefd);
+                    } finally {
+                        getContext().reprLeave(self);
+                    }
                 }
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/TextIOWrapperBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/TextIOWrapperBuiltins.java
@@ -1148,9 +1148,9 @@ Object doit(VirtualFrame frame, PTextIO self,
             if (!getContext().reprEnter(self)) {
                 throw raise(RuntimeError, "reentrant call inside %p.__repr__", self);
             } else {
-                StringBuilder sb = PythonUtils.newStringBuilder();
-                PythonUtils.append(sb, "<_io.TextIOWrapper");
                 try {
+                    StringBuilder sb = PythonUtils.newStringBuilder();
+                    PythonUtils.append(sb, "<_io.TextIOWrapper");
                     Object nameobj = PNone.NO_VALUE;
                     try {
                         nameobj = libSelf.lookupAttributeStrict(self, frame, NAME);
@@ -1167,11 +1167,9 @@ Object doit(VirtualFrame frame, PTextIO self,
                         PythonUtils.append(sb, PythonUtils.format(" mode='%s'", toString.execute(modeobj)));
                     }
                     PythonUtils.append(sb, PythonUtils.format(" encoding='%s'>", self.getEncoding()));
-                    getContext().reprLeave(self);
                     return PythonUtils.sbToString(sb);
-                } catch (PException e) {
+                } finally {
                     getContext().reprLeave(self);
-                    throw e;
                 }
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictReprBuiltin.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictReprBuiltin.java
@@ -235,12 +235,15 @@ public static Object repr(PDict dict,
             if (!ctxt.reprEnter(dict)) {
                 return "{...}";
             }
-            StringBuilder sb = PythonUtils.newStringBuilder("{");
-            HashingStorage dictStorage = dict.getDictStorage();
-            lib.forEach(dictStorage, consumerNode, new ReprState(dict, dictStorage, sb));
-            PythonUtils.append(sb, "}");
-            ctxt.reprLeave(dict);
-            return PythonUtils.sbToString(sb);
+            try {
+                StringBuilder sb = PythonUtils.newStringBuilder("{");
+                HashingStorage dictStorage = dict.getDictStorage();
+                lib.forEach(dictStorage, consumerNode, new ReprState(dict, dictStorage, sb));
+                PythonUtils.append(sb, "}");
+                return PythonUtils.sbToString(sb);
+            } finally {
+                ctxt.reprLeave(dict);
+            }
         }
 
         @Specialization// use same limit as for EachRepr nodes library
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java
@@ -172,31 +172,33 @@ public Object repr(VirtualFrame frame, PList self,
             if (!ctxt.reprEnter(self)) {
                 return "[...]";
             }
-
-            StringBuilder result = PythonUtils.newStringBuilder();
-            PythonUtils.append(result, "[");
-            boolean initial = true;
-            Object value;
-            Object reprString;
-            for (int index = 0; index < length; index++) {
-                value = getItem.execute(frame, storage, index);
-                reprString = repr.executeObject(frame, value);
-                if (reprString instanceof PString) {
-                    reprString = ((PString) reprString).getValue();
-                }
-                if (reprString instanceof String) {
-                    if (initial) {
-                        initial = false;
+            try {
+                StringBuilder result = PythonUtils.newStringBuilder();
+                PythonUtils.append(result, "[");
+                boolean initial = true;
+                Object value;
+                Object reprString;
+                for (int index = 0; index < length; index++) {
+                    value = getItem.execute(frame, storage, index);
+                    reprString = repr.executeObject(frame, value);
+                    if (reprString instanceof PString) {
+                        reprString = ((PString) reprString).getValue();
+                    }
+                    if (reprString instanceof String) {
+                        if (initial) {
+                            initial = false;
+                        } else {
+                            PythonUtils.append(result, ", ");
+                        }
+                        PythonUtils.append(result, (String) reprString);
                     } else {
-                        PythonUtils.append(result, ", ");
+                        raise(PythonErrorType.TypeError, ErrorMessages.RETURNED_NON_STRING, "__repr__", reprString);
                     }
-                    PythonUtils.append(result, (String) reprString);
-                } else {
-                    raise(PythonErrorType.TypeError, ErrorMessages.RETURNED_NON_STRING, "__repr__", reprString);
                 }
+                return PythonUtils.sbToString(PythonUtils.append(result, "]"));
+            } finally {
+                ctxt.reprLeave(self);
             }
-            ctxt.reprLeave(self);
-            return PythonUtils.sbToString(PythonUtils.append(result, "]"));
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/TupleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/TupleBuiltins.java
@@ -211,24 +211,27 @@ public static String repr(VirtualFrame frame, PTuple self,
             if (!ctxt.reprEnter(self)) {
                 return "(...)";
             }
-            StringBuilder buf = PythonUtils.newStringBuilder();
-            PythonUtils.append(buf, "(");
-            for (int i = 0; i < len - 1; i++) {
-                PythonUtils.append(buf, toString(frame, getItemNode.execute(frame, tupleStore, i), reprNode));
-                PythonUtils.append(buf, ", ");
-            }
+            try {
+                StringBuilder buf = PythonUtils.newStringBuilder();
+                PythonUtils.append(buf, "(");
+                for (int i = 0; i < len - 1; i++) {
+                    PythonUtils.append(buf, toString(frame, getItemNode.execute(frame, tupleStore, i), reprNode));
+                    PythonUtils.append(buf, ", ");
+                }
 
-            if (len > 0) {
-                PythonUtils.append(buf, toString(frame, getItemNode.execute(frame, tupleStore, len - 1), reprNode));
-            }
+                if (len > 0) {
+                    PythonUtils.append(buf, toString(frame, getItemNode.execute(frame, tupleStore, len - 1), reprNode));
+                }
 
-            if (len == 1) {
-                PythonUtils.append(buf, ",");
-            }
+                if (len == 1) {
+                    PythonUtils.append(buf, ",");
+                }
 
-            PythonUtils.append(buf, ")");
-            ctxt.reprLeave(self);
-            return PythonUtils.sbToString(buf);
+                PythonUtils.append(buf, ")");
+                return PythonUtils.sbToString(buf);
+            } finally {
+                ctxt.reprLeave(self);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -389,9 +389,12 @@ Object repr(VirtualFrame frame, PBuffered self,`
`389`	`389`	`if (!getContext().reprEnter(self)) {`
`390`	`390`	`throw raise(RuntimeError, "reentrant call inside %s.__repr__", clazz);`
`391`	`391`	`} else {`
`392`		`- Object name = repr.executeObject(frame, nameobj);`
`393`		`- getContext().reprLeave(self);`
`394`		`- return PythonUtils.format("<%s name=%s>", clazz, name);`
	`392`	`+ try {`
	`393`	`+ Object name = repr.executeObject(frame, nameobj);`
	`394`	`+ return PythonUtils.format("<%s name=%s>", clazz, name);`
	`395`	`+ } finally {`
	`396`	`+ getContext().reprLeave(self);`
	`397`	`+ }`
`395`	`398`	`}`
`396`	`399`	`}`
`397`	`400`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1025,9 +1025,12 @@ Object doit(VirtualFrame frame, PFileIO self,`
`1025`	`1025`	`if (!getContext().reprEnter(self)) {`
`1026`	`1026`	`throw raise(RuntimeError, "reentrant call inside %p.__repr__", self);`
`1027`	`1027`	`} else {`
`1028`		`- Object name = repr.executeObject(frame, nameobj);`
`1029`		`- getContext().reprLeave(self);`
`1030`		`- return PythonUtils.format("<_io.FileIO name=%s mode='%s' closefd=%s>", name, mode, closefd);`
	`1028`	`+ try {`
	`1029`	`+ Object name = repr.executeObject(frame, nameobj);`
	`1030`	`+ return PythonUtils.format("<_io.FileIO name=%s mode='%s' closefd=%s>", name, mode, closefd);`
	`1031`	`+ } finally {`
	`1032`	`+ getContext().reprLeave(self);`
	`1033`	`+ }`
`1031`	`1034`	`}`
`1032`	`1035`	`}`
`1033`	`1036`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1148,9 +1148,9 @@ Object doit(VirtualFrame frame, PTextIO self,`
`1148`	`1148`	`if (!getContext().reprEnter(self)) {`
`1149`	`1149`	`throw raise(RuntimeError, "reentrant call inside %p.__repr__", self);`
`1150`	`1150`	`} else {`
`1151`		`- StringBuilder sb = PythonUtils.newStringBuilder();`
`1152`		`- PythonUtils.append(sb, "<_io.TextIOWrapper");`
`1153`	`1151`	`try {`
	`1152`	`+ StringBuilder sb = PythonUtils.newStringBuilder();`
	`1153`	`+ PythonUtils.append(sb, "<_io.TextIOWrapper");`
`1154`	`1154`	`Object nameobj = PNone.NO_VALUE;`
`1155`	`1155`	`try {`
`1156`	`1156`	`nameobj = libSelf.lookupAttributeStrict(self, frame, NAME);`
`@@ -1167,11 +1167,9 @@ Object doit(VirtualFrame frame, PTextIO self,`
`1167`	`1167`	`PythonUtils.append(sb, PythonUtils.format(" mode='%s'", toString.execute(modeobj)));`
`1168`	`1168`	`}`
`1169`	`1169`	`PythonUtils.append(sb, PythonUtils.format(" encoding='%s'>", self.getEncoding()));`
`1170`		`- getContext().reprLeave(self);`
`1171`	`1170`	`return PythonUtils.sbToString(sb);`
`1172`		`- } catch (PException e) {`
	`1171`	`+ } finally {`
`1173`	`1172`	`getContext().reprLeave(self);`
`1174`		`- throw e;`
`1175`	`1173`	`}`
`1176`	`1174`	`}`
`1177`	`1175`	`}`