Changeset 274ce8c for src/ControlStruct

Timestamp:

Aug 17, 2017, 5:37:26 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

4cc585b, 8bafacc

Parents:

6d49ea3 (diff), 8f6dfe7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/ControlStruct

Files:

• ExceptTranslate.cc (modified) (6 diffs)
• LabelGenerator.cc (modified) (1 diff)

src/ControlStruct/ExceptTranslate.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus Aug  8 16:54:00 2017
-// Update Count     : 7
+// 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() );
@@ -417 +421 @@
                 }
 
-                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
-                        Constant::from_int( 0 ) ) ) );
+                body->push_back( new ReturnStmt( noLabels,
+                        new ConstantExpr( Constant::from_int( 0 ) ) ) );
 
                 return new FunctionDecl("match", Type::StorageClasses(),
@@ -449 +453 @@
                 CompoundStmt * body = new CompoundStmt( noLabels );
 
-                FunctionType * func_type = match_func_t.clone();
+                FunctionType * func_type = handle_func_t.clone();
                 DeclarationWithType * except_obj = func_type->get_parameters().back();
 
@@ -472 +476 @@
                 }
 
-                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
-                        Constant::from_bool( false ) ) ) );
+                body->push_back( new ReturnStmt( noLabels,
+                        new ConstantExpr( Constant::from_bool( false ) ) ) );
 
                 return new FunctionDecl("handle", Type::StorageClasses(),

src/ControlStruct/LabelGenerator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun 23 12:18:34 2015
-// Update Count     : 13
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 14 14:14:00 2015
+// Update Count     : 14
 //
 
-#include <iostream>             // for operator<<, basic_ostream, ostringstream
+#include <iostream>             // for operator<<, basic_ostream
+#include <sstream>              // for ostringstream
 #include <list>                 // for list