Changeset 8f6dfe7

Timestamp:

Aug 17, 2017, 5:22:30 PM (8 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

274ce8c

Parents:

e9145a3

Message:

Cleaned up the generated exception functions a bit.

File:

• src/ControlStruct/ExceptTranslate.cc (modified) (10 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 15:48:00 2017
-// Update Count     : 8
+// Last Modified On : Thr Aug 17 17:19:00 2017
+// Update Count     : 9
 //
 
@@ -166 +166 @@
                         /*bitfieldWidth*/ NULL,
                         new BasicType( noQualifiers, BasicType::Bool ),
-                        /*init*/ NULL
+                        /*init*/ NULL,
+                        std::list<Attribute *>{ new Attribute( "unused" ) }
                         );
                 ObjectDecl voidptr_obj(
@@ -183 +184 @@
                         );
 
+                ObjectDecl * unused_index_obj = index_obj.clone();
+                unused_index_obj->attributes.push_back( new Attribute( "unused" ) );
+
                 catch_func_t.get_parameters().push_back( index_obj.clone() );
                 catch_func_t.get_parameters().push_back( exception_obj.clone() );
-                match_func_t.get_returnVals().push_back( index_obj.clone() );
+                match_func_t.get_returnVals().push_back( unused_index_obj );
                 match_func_t.get_parameters().push_back( exception_obj.clone() );
                 handle_func_t.get_returnVals().push_back( bool_obj.clone() );
@@ -387 +391 @@
         }
 
-        // TODO: Stoping the function from generating the 'return variable'
-        // entirely would be cleaner. But this does get ride of warnings.
-        CompoundStmt * set_and_ret(DeclarationWithType * var, Expression * val) {
-                CompoundStmt * block = new CompoundStmt( noLabels );
-                block->push_back( new ExprStmt( noLabels,
-                        UntypedExpr::createAssign( new VariableExpr( var ), val )
-                        ) );
-                block->push_back( new ReturnStmt( noLabels,
-                        new VariableExpr( var )
-                        ) );
-                return block;
-        }
-
         FunctionDecl * ExceptionMutatorCore::create_terminate_match(
                         CatchList &handlers ) {
@@ -410 +401 @@
                 FunctionType * func_type = match_func_t.clone();
                 DeclarationWithType * except_obj = func_type->get_parameters().back();
-                DeclarationWithType * index_obj = func_type->get_returnVals().front();
 
                 // Index 1..{number of handlers}
@@ -423 +413 @@
 
                         // Create new body.
-                        handler->set_body( set_and_ret( index_obj,
+                        handler->set_body( new ReturnStmt( noLabels,
                                 new ConstantExpr( Constant::from_int( index ) ) ) );
 
@@ -431 +421 @@
                 }
 
-                body->push_back( set_and_ret( index_obj,
+                body->push_back( new ReturnStmt( noLabels,
                         new ConstantExpr( Constant::from_int( 0 ) ) ) );
 
@@ -465 +455 @@
                 FunctionType * func_type = handle_func_t.clone();
                 DeclarationWithType * except_obj = func_type->get_parameters().back();
-                DeclarationWithType * bool_obj = func_type->get_returnVals().front();
 
                 CatchList::iterator it;
@@ -478 +467 @@
                                 handling_code->push_back( handler->get_body() );
                         }
-                        handling_code->push_back( set_and_ret( bool_obj,
+                        handling_code->push_back( new ReturnStmt( noLabels,
                                 new ConstantExpr( Constant::from_bool( true ) ) ) );
                         handler->set_body( handling_code );
@@ -487 +476 @@
                 }
 
-                body->push_back( set_and_ret( bool_obj,
+                body->push_back( new ReturnStmt( noLabels,
                         new ConstantExpr( Constant::from_bool( false ) ) ) );