[GR-31314] Avoid using exception for terminating returns.

PullRequest: graalpython/1837

Author: steve-s

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

@@ -51,3 +51,58 @@ def method(v):
 
     assert method(10) is None
     assert method("value") is None
+
+def test_return_in_finally():
+    def override_explicit():
+        try:
+            return 0
+        finally:
+            return 42
+
+    def override_implicit():
+        try:
+            pass
+        finally:
+            return 'correct'
+
+    assert override_explicit() == 42
+    assert override_implicit() == 'correct'
+
+def test_return_in_try():
+    def basic(arg):
+        try:
+            if arg:
+                raise ValueError()
+            return 1 # can be 'terminating'
+        except ValueError as e:
+            return 2 # can be 'terminating'
+
+    assert basic(True) == 2
+    assert basic(False) == 1
+
+    def with_orelse(arg):
+        try:
+            if arg:
+                return 'try'
+        except:
+            pass
+        else:
+            return 'else'
+
+    assert with_orelse(True) == 'try'
+    assert with_orelse(False) == 'else'
+
+
+def test_return_in_try_finally():
+    def foo(arg):
+        try:
+            if arg:
+                raise ValueError()
+            return 'try'
+        except ValueError as e:
+            return 'except'
+        finally:
+            return 'finally'
+
+    assert foo(True) == 'finally'
+    assert foo(False) == 'finally'

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/annotationType02.tast

@@ -40,4 +40,4 @@ ModuleRootNode Name: <module 'annotationType02'> SourceSection: [0,28]`def fn():
                         IntegerLiteralNode SourceSection: [26,27]`0`
                           Value: 0
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment06.tast

@@ -61,4 +61,4 @@ ModuleRootNode Name: <module 'assignment06'> SourceSection: [0,29]`def fn():↵
                         ReadLocalVariableNodeGen SourceSection: None
                           Frame: [4,<>temp4,Illegal]
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [5,<return_val>,Illegal]
+                    Frame: [5,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment07.tast

@@ -68,4 +68,4 @@ ModuleRootNode Name: <module 'assignment07'> SourceSection: [0,29]`def fn():↵
                           ReadLocalVariableNodeGen SourceSection: None
                             Frame: [5,<>temp5,Illegal]
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [6,<return_val>,Illegal]
+                    Frame: [6,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/augassign13.tast

@@ -44,4 +44,4 @@ ModuleRootNode Name: <module 'augassign13'> SourceSection: [0,17]`def fn (): x +
                             Value: 3
                           ObjectLiteralNode SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/augassign14.tast

@@ -67,4 +67,4 @@ ModuleRootNode Name: <module 'augassign14'> SourceSection: [0,61]`def _method(*a
                           ReadLocalVariableNodeGen SourceSection: None
                             Frame: [5,<>temp5,Illegal]
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [6,<return_val>,Illegal]
+                    Frame: [6,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/asyncFor01.tast

@@ -48,4 +48,4 @@ ModuleRootNode Name: <module 'asyncFor01'> SourceSection: [0,39]`async def f():
                               PythonObjectFactoryNodeGen SourceSection: None
                         BlockNode SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/asyncFor02.tast

@@ -62,4 +62,4 @@ ModuleRootNode Name: <module 'asyncFor02'> SourceSection: [0,42]`async def f():
                               PythonObjectFactoryNodeGen SourceSection: None
                         BlockNode SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [4,<return_val>,Illegal]
+                    Frame: [4,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/asyncWith01.tast

@@ -46,4 +46,4 @@ ModuleRootNode Name: <module 'asyncWith01'> SourceSection: [0,34]`async def f():
                         YesNodeGen SourceSection: None
                         GetClassNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [0,<return_val>,Illegal]
+                    Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/asyncWith02.tast

@@ -63,4 +63,4 @@ ModuleRootNode Name: <module 'asyncWith02'> SourceSection: [0,47]`async def f():
                         YesNodeGen SourceSection: None
                         GetClassNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [2,<return_val>,Illegal]
+                    Frame: [2,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/await01.tast

@@ -41,4 +41,4 @@ ModuleRootNode Name: <module 'await01'> SourceSection: [0,28]`async def f():↵
                             Identifier: smth
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [0,<return_val>,Illegal]
+                    Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/await02.tast

@@ -43,4 +43,4 @@ ModuleRootNode Name: <module 'await02'> SourceSection: [0,34]`async def f():↵
                             Identifier: smth
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/await03.tast

@@ -57,4 +57,4 @@ ModuleRootNode Name: <module 'await03'> SourceSection: [0,39]`async def f():↵
                           ReadLocalVariableNodeGen SourceSection: None
                             Frame: [3,<>temp3,Illegal]
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [4,<return_val>,Illegal]
+                    Frame: [4,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/await04.tast

@@ -41,4 +41,4 @@ ModuleRootNode Name: <module 'await04'> SourceSection: [0,30]`async def f():↵
                             Identifier: smth
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [0,<return_val>,Illegal]
+                    Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/await05.tast

@@ -46,4 +46,4 @@ ModuleRootNode Name: <module 'await05'> SourceSection: [0,35]`async def f():↵
                               Identifier: smth
                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [0,<return_val>,Illegal]
+                    Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/await06.tast

@@ -41,10 +41,7 @@ ModuleRootNode Name: <module 'await06'> SourceSection: [0,38]`async def f():↵
                             Identifier: foo
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                       FrameReturnNode SourceSection: [29,38]`return 42`
-                        WriteLocalVariableNodeGen SourceSection: None
-                          Identifier: <return_val>
-                          Frame: [0,<return_val>,Illegal]
-                          IntegerLiteralNode SourceSection: [36,38]`42`
-                            Value: 42
+                        IntegerLiteralNode SourceSection: [36,38]`42`
+                          Value: 42
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [0,<return_val>,Illegal]
+                    Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/assert02.tast

@@ -54,4 +54,4 @@ ModuleRootNode Name: <module 'assert02'> SourceSection: [0,59]`def avg(marks):
                               Value: 0
                         StringLiteralNode SourceSection: [43,59]`"List is empty."`
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/assert03.tast

@@ -51,4 +51,4 @@ ModuleRootNode Name: <module 'assert03'> SourceSection: [0,47]`def avg():↵
                             Identifier: len
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [0,<return_val>,Illegal]
+                    Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call17.tast

@@ -47,4 +47,4 @@ ModuleRootNode Name: <module 'call17'> SourceSection: [0,22]`def fn(): foo(arg =
                             Identifier: foo
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [0,<return_val>,Illegal]
+                    Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call18.tast

@@ -61,4 +61,4 @@ ModuleRootNode Name: <module 'call18'> SourceSection: [0,35]`def fn(arg = [1,2])
                             Identifier: foo
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call19.tast

@@ -45,4 +45,4 @@ ModuleRootNode Name: <module 'call19'> SourceSection: [0,33]`def fn(): "in".form
                           GetCallAttributeNodeGen SourceSection: None
                             StringLiteralNode SourceSection: [10,14]`"in"`
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [0,<return_val>,Illegal]
+                    Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call20.tast

@@ -52,4 +52,4 @@ ModuleRootNode Name: <module 'call20'> SourceSection: [0,36]`def fn(name): "in".
                           GetCallAttributeNodeGen SourceSection: None
                             StringLiteralNode SourceSection: [14,18]`"in"`
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/for04.tast

@@ -60,4 +60,4 @@ ModuleRootNode Name: <module 'for04'> SourceSection: [0,59]`def fn():↵  for x
                                 Value: 3
                         BlockNode SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/for12.tast

@@ -80,4 +80,4 @@ ModuleRootNode Name: <module 'for12'> SourceSection: [0,52]`def fn():↵  for a,
                               PythonObjectFactoryNodeGen SourceSection: None
                         BlockNode SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [4,<return_val>,Illegal]
+                    Frame: [4,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/for13.tast

@@ -111,4 +111,4 @@ ModuleRootNode Name: <module 'for13'> SourceSection: [0,186]`def format(self):
                               Frame: [0,self,Illegal]
                         BlockNode SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [7,<return_val>,Illegal]
+                    Frame: [7,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/for14.tast

@@ -83,4 +83,4 @@ ModuleRootNode Name: <module 'for14'> SourceSection: [0,165]`def merge(sequences
                               Frame: [0,sequences,Illegal]
                         BlockNode SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [3,<return_val>,Illegal]
+                    Frame: [3,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/for15.tast

@@ -63,10 +63,7 @@ ModuleRootNode Name: <module 'for15'> SourceSection: [0,87]`def formatyear():↵
                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                         BlockNode SourceSection: None
                       FrameReturnNode SourceSection: [78,87]`return 10`
-                        WriteLocalVariableNodeGen SourceSection: None
-                          Identifier: <return_val>
-                          Frame: [4,<return_val>,Illegal]
-                          IntegerLiteralNode SourceSection: [85,87]`10`
-                            Value: 10
+                        IntegerLiteralNode SourceSection: [85,87]`10`
+                          Value: 10
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [4,<return_val>,Illegal]
+                    Frame: [4,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/if04.tast

@@ -52,11 +52,8 @@ ModuleRootNode Name: <module 'if04'> SourceSection: [0,53]`predicate = func if .
                           ReadIndexedArgumentNodeGen SourceSection: None
                             Index: 0
                       FrameReturnNode SourceSection: None
-                        FunctionBodyNode SourceSection: [52,53]`a`
-                          WriteLocalVariableNodeGen SourceSection: None
-                            Identifier: <return_val>
-                            Frame: [1,<return_val>,Illegal]
-                            ReadLocalVariableNodeGen SourceSection: [52,53]`a`
-                              Frame: [0,a,Illegal]
+                        LambdaBodyNode SourceSection: [52,53]`a`
+                          ReadLocalVariableNodeGen SourceSection: [52,53]`a`
+                            Frame: [0,a,Illegal]
                     Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                      Frame: [1,<return_val>,Illegal]
+                      Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/issueGR28345.tast

@@ -52,4 +52,4 @@ ModuleRootNode Name: <module 'issueGR28345'> SourceSection: [0,187]`def test_isi
                               Identifier: self
                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [0,<return_val>,Illegal]
+                    Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/simpleExpression08.tast

@@ -11,9 +11,6 @@ FunctionRootNode SourceSection: [0,8]`"\uD800"`
   InnerRootNode SourceSection: None
     ReturnTargetNode SourceSection: None
       Body: FrameReturnNode SourceSection: None
-        WriteLocalVariableNodeGen SourceSection: None
-          Identifier: <return_val>
-          Frame: [0,<return_val>,Illegal]
-          StringLiteralNode SourceSection: [0,8]`"\uD800"`
+        StringLiteralNode SourceSection: [0,8]`"\uD800"`
       Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-        Frame: [0,<return_val>,Illegal]
+        Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/try03.tast

@@ -49,4 +49,4 @@ ModuleRootNode Name: <module 'try03'> SourceSection: [0,61]`def fn():↵  try:
                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                           BlockNode SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/try10.tast

@@ -85,4 +85,4 @@ ModuleRootNode Name: <module 'try10'> SourceSection: [0,214]`def divide(x, y):
                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                             StringLiteralNode SourceSection: [187,213]`"executing finally c...`
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [3,<return_val>,Illegal]
+                    Frame: [3,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/try11.tast

@@ -55,4 +55,4 @@ ModuleRootNode Name: <module 'try11'> SourceSection: [0,79]`def fn():↵    try:
                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                           BlockNode SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/with03.tast

@@ -52,4 +52,4 @@ ModuleRootNode Name: <module 'with03'> SourceSection: [0,35]`def fn():↵  with
                         YesNodeGen SourceSection: None
                         GetClassNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/with04.tast

@@ -67,4 +67,4 @@ ModuleRootNode Name: <module 'with04'> SourceSection: [0,45]`def fn():↵  with
                         YesNodeGen SourceSection: None
                         GetClassNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [2,<return_val>,Illegal]
+                    Frame: [2,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/with05.tast

@@ -50,4 +50,4 @@ ModuleRootNode Name: <module 'with05'> SourceSection: [0,36]`def fn():↵  with
                         YesNodeGen SourceSection: None
                         GetClassNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [0,<return_val>,Illegal]
+                    Frame: [0,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/with06.tast

@@ -67,4 +67,4 @@ ModuleRootNode Name: <module 'with06'> SourceSection: [0,56]`def fn():↵  with
                         YesNodeGen SourceSection: None
                         GetClassNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [2,<return_val>,Illegal]
+                    Frame: [2,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/classDef05.tast

@@ -88,4 +88,4 @@ ModuleRootNode Name: <module 'classDef05'> SourceSection: [0,63]`def fn():↵  c
                               Identifier: modname
                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                    Frame: [1,<return_val>,Illegal]
+                    Frame: [1,<return_val>,Object]

graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/classDef07.tast

@@ -110,7 +110,7 @@ ModuleRootNode Name: <module 'classDef07'> SourceSection: [0,106]`class OrderedD
                                               Identifier: dict
                                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                   Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
-                                    Frame: [1,<return_val>,Illegal]
+                                    Frame: [1,<return_val>,Object]
                     Return Expresssion: ObjectLiteralNode SourceSection: None
             StringLiteralNode SourceSection: None
             ReadNameNodeGen SourceSection: [18,22]`dict`