Changeset dcbb03b for src/InitTweak

Timestamp:

Mar 1, 2018, 9:29:03 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

1f37ed02

Parents:

b002261 (diff), 446ffa3 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/InitTweak

Files:

• FixGlobalInit.cc (modified) (1 diff)
• FixInit.cc (modified) (6 diffs)
• GenInit.cc (modified) (1 diff)
• InitTweak.cc (modified) (2 diffs)

src/InitTweak/FixGlobalInit.cc

@@ -21 +21 @@
 
 #include "Common/PassVisitor.h"
-#include "Common/SemanticError.h"  // for SemanticError
 #include "Common/UniqueName.h"     // for UniqueName
 #include "InitTweak.h"             // for isIntrinsicSingleArgCallStmt

src/InitTweak/FixInit.cc

@@ -213 +213 @@
                         Expression * postmutate( UntypedExpr * expr );
 
-                        SemanticError errors;
+                        SemanticErrorException errors;
                   private:
                         template< typename... Params >
@@ -276 +276 @@
                         // can't use mutateAll, because need to insert declarations at top-level
                         // can't use DeclMutator, because sometimes need to insert IfStmt, etc.
-                        SemanticError errors;
+                        SemanticErrorException errors;
                         for ( std::list< Declaration * >::iterator i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
                                 try {
                                         maybeMutate( *i, fixer );
                                         translationUnit.splice( i, fixer.pass.staticDtorDecls );
-                                } catch( SemanticError &e ) {
+                                } catch( SemanticErrorException &e ) {
                                         errors.append( e );
                                 } // try
@@ -894 +894 @@
                         )
                         if ( ! diff.empty() ) {
-                                throw SemanticError( stmt, std::string("jump to label '") + stmt->get_target().get_name() + "' crosses initialization of " + (*diff.begin())->get_name() + " " );
+                                SemanticError( stmt, std::string("jump to label '") + stmt->get_target().get_name() + "' crosses initialization of " + (*diff.begin())->get_name() + " " );
                         } // if
                         // S_G-S_L results in set of objects that must be destructed
@@ -945 +945 @@
                         GuardValue( isCtor );
                         GuardValue( structDecl );
-                        errors = SemanticError();  // clear previous errors
+                        errors = SemanticErrorException();  // clear previous errors
 
                         // need to start with fresh sets
@@ -1034 +1034 @@
                                                                 function->get_statements()->push_back( callStmt );
                                                         }
-                                                } catch ( SemanticError & error ) {
+                                                } catch ( SemanticErrorException & error ) {
                                                         emit( funcDecl->location, "in ", CodeGen::genPrettyType( function->get_functionType(), function->get_name() ), ", field ", field->get_name(), " not explicitly ", isCtor ? "constructed" : "destructed",  " and no ", isCtor ? "default constructor" : "destructor", " found" );
                                                 }
@@ -1110 +1110 @@
                 template< typename Visitor, typename... Params >
                 void error( Visitor & v, CodeLocation loc, const Params &... params ) {
-                        SemanticError err( loc, toString( params... ) );
+                        SemanticErrorException err( loc, toString( params... ) );
                         v.errors.append( err );
                 }

src/InitTweak/GenInit.cc

@@ -317 +317 @@
                 if ( tryConstruct( objDecl ) && ( managedTypes.isManaged( objDecl ) || ((! inFunction || objDecl->get_storageClasses().is_static ) && ! isConstExpr( objDecl->get_init() ) ) ) ) {
                         // constructed objects cannot be designated
-                        if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( objDecl, "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n" );
+                        if ( isDesignated( objDecl->get_init() ) ) SemanticError( objDecl, "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n" );
                         // constructed objects should not have initializers nested too deeply
-                        if ( ! checkInitDepth( objDecl ) ) throw SemanticError( objDecl, "Managed object's initializer is too deep " );
+                        if ( ! checkInitDepth( objDecl ) ) SemanticError( objDecl, "Managed object's initializer is too deep " );
 
                         objDecl->set_init( genCtorInit( objDecl ) );

src/InitTweak/InitTweak.cc

@@ -225 +225 @@
                                         // xxx - this shouldn't be an error, but need a way to
                                         // terminate without creating output, so should catch this error
-                                        throw SemanticError( init->location, "unbalanced list initializers" );
+                                        SemanticError( init->location, "unbalanced list initializers" );
                                 }
 
@@ -296 +296 @@
                 ObjectDecl * objDecl = dynamic_cast< ObjectDecl * >( dwt );
                 if ( ! objDecl ) return false;
-                return ! LinkageSpec::isBuiltin( objDecl->get_linkage() ) &&
-                        (objDecl->get_init() == nullptr ||
+                return (objDecl->get_init() == nullptr ||
                                 ( objDecl->get_init() != nullptr && objDecl->get_init()->get_maybeConstructed() ))
                         && ! objDecl->get_storageClasses().is_extern