Changeset 8135d4c for src/ControlStruct/ExceptTranslate.cc

Timestamp:

Aug 22, 2017, 7:31:52 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

9aaac6e9

Parents:

fc56cdbf (diff), b3d413b (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' into references

File:

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

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
 //
 
 #include "ExceptTranslate.h"
-#include "Common/PassVisitor.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Type.h"
-#include "SynTree/Attribute.h"
-#include "SynTree/VarExprReplacer.h"
+
+#include <stddef.h>                   // for NULL
+#include <cassert>                    // for assert, assertf
+#include <iterator>                   // for back_inserter, inserter
+#include <string>                     // for string, operator==
+
+#include "Common/PassVisitor.h"       // for PassVisitor, WithGuards
+#include "Common/SemanticError.h"     // for SemanticError
+#include "Common/utility.h"           // for CodeLocation
+#include "Parser/LinkageSpec.h"       // for Cforall
+#include "SynTree/Attribute.h"        // for Attribute
+#include "SynTree/Constant.h"         // for Constant
+#include "SynTree/Declaration.h"      // for ObjectDecl, FunctionDecl, Struc...
+#include "SynTree/Expression.h"       // for UntypedExpr, ConstantExpr, Name...
+#include "SynTree/Initializer.h"      // for SingleInit, ListInit
+#include "SynTree/Label.h"            // for Label, noLabels
+#include "SynTree/Mutator.h"          // for mutateAll
+#include "SynTree/Statement.h"        // for CompoundStmt, CatchStmt, ThrowStmt
+#include "SynTree/Type.h"             // for FunctionType, Type, noQualifiers
+#include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
+#include "SynTree/Visitor.h"          // for acceptAll
 
 namespace ControlStruct {
@@ -152 +166 @@
                         /*bitfieldWidth*/ NULL,
                         new BasicType( noQualifiers, BasicType::Bool ),
-                        /*init*/ NULL
+                        /*init*/ NULL,
+                        std::list<Attribute *>{ new Attribute( "unused" ) }
                         );
                 ObjectDecl voidptr_obj(
@@ -169 +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() );
@@ -403 +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(),
@@ -435 +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();
 
@@ -458 +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(),