Changeset 2554f24 for src

Timestamp:

Dec 11, 2023, 1:05:50 PM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

dab9fb93

Parents:

81da3da4

Message:

Try terminate now does not call the catch function, now they have the same caller. This involved updating some platform dependent code which should be correct in all cases.

File:

• src/ControlStruct/ExceptTranslate.cpp (modified) (1 diff)

src/ControlStruct/ExceptTranslate.cpp

@@ -482 +482 @@
                 ast::FunctionDecl * terminate_catch,
                 ast::FunctionDecl * terminate_match ) {
-        // { __cfaehm_try_terminate(`try`, `catch`, `match`); }
-
-        ast::UntypedExpr * caller = new ast::UntypedExpr(loc, new ast::NameExpr(loc,
-                "__cfaehm_try_terminate" ) );
-        caller->args.push_back( new ast::VariableExpr(loc, try_wrapper ) );
-        caller->args.push_back( new ast::VariableExpr(loc, terminate_catch ) );
-        caller->args.push_back( new ast::VariableExpr(loc, terminate_match ) );
-
-        ast::CompoundStmt * callStmt = new ast::CompoundStmt(loc);
-        callStmt->push_back( new ast::ExprStmt( loc, caller ) );
-        return callStmt;
+        // {
+        //     int __handler_index = __cfaehm_try_terminate(`try`, `match`);
+        //     if ( __handler_index ) {
+        //         `catch`( __handler_index, __cfaehm_get_current_exception() );
+        //     }
+        // }
+
+        ast::ObjectDecl * index = new ast::ObjectDecl( loc, "__handler_index",
+                new ast::BasicType( ast::BasicType::SignedInt ),
+                new ast::SingleInit( loc,
+                        new ast::UntypedExpr( loc,
+                                new ast::NameExpr( loc, "__cfaehm_try_terminate" ),
+                                {
+                                        new ast::VariableExpr( loc, try_wrapper ),
+                                        new ast::VariableExpr( loc, terminate_match ),
+                                }
+                        )
+                )
+        );
+
+        return new ast::CompoundStmt( loc, {
+                new ast::DeclStmt( loc, index ),
+                new ast::IfStmt( loc,
+                        new ast::VariableExpr( loc, index ),
+                        new ast::ExprStmt( loc,
+                                new ast::UntypedExpr( loc,
+                                        new ast::VariableExpr( loc, terminate_catch ),
+                                        {
+                                                new ast::VariableExpr( loc, index ),
+                                                new ast::UntypedExpr( loc,
+                                                        new ast::NameExpr( loc, "__cfaehm_get_current_exception" )
+                                                ),
+                                        }
+                                )
+                        )
+                ),
+        } );
 }