Changeset 6726a3a for src

Timestamp:

Jul 20, 2022, 2:37:57 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

6bf35d1, e6662f5

Parents:

d677355 (diff), 2fd0de0 (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

Files:

• AST/Expr.cpp (modified) (1 diff)
• CodeGen/FixNames.cc (modified) (4 diffs)
• CodeGen/FixNames.h (modified) (2 diffs)
• Concurrency/Keywords.h (modified) (1 diff)
• ControlStruct/ExceptDecl.cc (modified) (1 diff)
• ControlStruct/ExceptDecl.h (modified) (2 diffs)
• ControlStruct/ExceptDeclNew.cpp (added)
• ControlStruct/HoistControlDecls.hpp (modified) (1 diff)
• ControlStruct/MultiLevelExit.cpp (modified) (6 diffs)
• ControlStruct/module.mk (modified) (1 diff)
• InitTweak/GenInit.cc (modified) (1 diff)
• InitTweak/GenInit.h (modified) (2 diffs)
• Tuples/Tuples.cc (modified) (1 diff)
• Tuples/Tuples.h (modified) (1 diff)
• Validate/Autogen.hpp (modified) (1 diff)
• Validate/CompoundLiteral.hpp (modified) (1 diff)
• Validate/EnumAndPointerDecay.cpp (modified) (1 diff)
• Validate/EnumAndPointerDecay.hpp (modified) (2 diffs)
• Validate/FindSpecialDecls.h (modified) (2 diffs)
• Validate/FixQualifiedTypes.cpp (modified) (2 diffs)
• Validate/FixQualifiedTypes.hpp (modified) (2 diffs)
• Validate/FixReturnTypes.cpp (modified) (1 diff)
• Validate/FixReturnTypes.hpp (modified) (2 diffs)
• Validate/ForallPointerDecay.hpp (modified) (1 diff)
• Validate/GenericParameter.cpp (modified) (1 diff)
• Validate/GenericParameter.hpp (modified) (2 diffs)
• Validate/HoistStruct.hpp (modified) (1 diff)
• Validate/HoistTypeDecls.cpp (modified) (1 diff)
• Validate/HoistTypeDecls.hpp (modified) (2 diffs)
• Validate/LabelAddressFixer.cpp (modified) (1 diff)
• Validate/LabelAddressFixer.hpp (modified) (2 diffs)
• Validate/LinkReferenceToTypes.hpp (modified) (1 diff)
• Validate/ReplaceTypedef.cpp (modified) (1 diff)
• Validate/ReplaceTypedef.hpp (modified) (2 diffs)
• Validate/VerifyCtorDtorAssign.cpp (modified) (1 diff)
• Validate/VerifyCtorDtorAssign.hpp (modified) (2 diffs)
• Virtual/Tables.h (modified) (1 diff)
• main.cc (modified) (5 diffs)

src/AST/Expr.cpp

@@ -272 +272 @@
         // Adjust the length of the string for the terminator.
         const Expr * strSize = from_ulong( loc, str.size() + 1 );
-        const Type * strType = new ArrayType( charType, strSize, FixedLen, StaticDim );
+        const Type * strType = new ArrayType( charType, strSize, FixedLen, DynamicDim );
         const std::string strValue = "\"" + str + "\"";
         return new ConstantExpr( loc, strType, strValue, std::nullopt );

src/CodeGen/FixNames.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixNames.cc --
+// FixNames.cc -- Adjustments to typed declarations.
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct 29 15:49:00 2021
-// Update Count     : 23
+// Last Modified On : Wed Jul 20 11:49:00 2022
+// Update Count     : 24
 //
 
@@ -87 +87 @@
 
 /// Does work with the main function and scopeLevels.
-class FixNames_new : public ast::WithGuards {
+class FixNames_new final {
         int scopeLevel = 1;
 
@@ -103 +103 @@
 
         const ast::FunctionDecl *postvisit( const ast::FunctionDecl *functionDecl ) {
-                // This store is used to ensure a maximum of one call to mutate.
-                ast::FunctionDecl * mutDecl = nullptr;
+                if ( FixMain::isMain( functionDecl ) ) {
+                        auto mutDecl = ast::mutate( functionDecl );
 
-                if ( shouldSetScopeLevel( functionDecl ) ) {
-                        mutDecl = ast::mutate( functionDecl );
-                        mutDecl->scopeLevel = scopeLevel;
-                }
-
-                if ( FixMain::isMain( functionDecl ) ) {
-                        if ( !mutDecl ) { mutDecl = ast::mutate( functionDecl ); }
+                        if ( shouldSetScopeLevel( mutDecl ) ) {
+                                mutDecl->scopeLevel = scopeLevel;
+                        }
 
                         int nargs = mutDecl->params.size();
@@ -124 +120 @@
                                 )
                         );
+
+                        return mutDecl;
+                } else if ( shouldSetScopeLevel( functionDecl ) ) {
+                        return ast::mutate_field( functionDecl, &ast::FunctionDecl::scopeLevel, scopeLevel );
+                } else {
+                        return functionDecl;
                 }
-                return mutDecl ? mutDecl : functionDecl;
         }
 
         void previsit( const ast::CompoundStmt * ) {
-                GuardValue( scopeLevel ) += 1;
+                scopeLevel += 1;
+        }
+
+        void postvisit( const ast::CompoundStmt * ) {
+                scopeLevel -= 1;
         }
 };

src/CodeGen/FixNames.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixNames.h --
+// FixNames.h -- Adjustments to typed declarations.
 //
 // Author           : Richard C. Bilson
@@ -26 +26 @@
         /// mangles object and function names
         void fixNames( std::list< Declaration* > & translationUnit );
-        void fixNames( ast::TranslationUnit & translationUnit );
+/// Sets scope levels and fills in main's default return.
+void fixNames( ast::TranslationUnit & translationUnit );
 } // namespace CodeGen
 

src/Concurrency/Keywords.h

@@ -28 +28 @@
         void implementThreadStarter( std::list< Declaration * > & translationUnit );
 
-/// Implement the sue-like keywords and the suspend keyword.
+/// Implement the sue-like keywords and the suspend keyword. Pre-Autogen
 void implementKeywords( ast::TranslationUnit & translationUnit );
-/// Implement the mutex parameters and mutex statement.
+/// Implement the mutex parameters and mutex statement. Post-Autogen
 void implementMutex( ast::TranslationUnit & translationUnit );
-/// Add the thread starter code to constructors.
+/// Add the thread starter code to constructors. Post-Autogen
 void implementThreadStarter( ast::TranslationUnit & translationUnit );
 };

src/ControlStruct/ExceptDecl.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ExceptDecl.cc --
+// ExceptDecl.cc -- Handles declarations of exception types.
 //
 // Author           : Henry Xue

src/ControlStruct/ExceptDecl.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ExceptDecl.h --
+// ExceptDecl.h -- Handles declarations of exception types.
 //
 // Author           : Henry Xue
 // Created On       : Tue Jul 20 04:10:50 2021
-// Last Modified By : Henry Xue
-// Last Modified On : Tue Jul 20 04:10:50 2021
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jul 12 15:49:00 2022
+// Update Count     : 2
 //
 
@@ -20 +20 @@
 class Declaration;
 
+namespace ast {
+        class TranslationUnit;
+}
+
 namespace ControlStruct {
-        void translateExcept( std::list< Declaration *> & translationUnit );
+/// Unfold exception declarations into raw structure declarations.
+/// Also builds vtable declarations and converts vtable types.
+void translateExcept( std::list< Declaration *> & translationUnit );
+void translateExcept( ast::TranslationUnit & translationUnit );
 }

src/ControlStruct/HoistControlDecls.hpp

@@ -21 +21 @@
 
 namespace ControlStruct {
-// Hoist declarations out of control flow statements into compound statement.
+/// Hoist declarations out of control flow statements into compound statement.
+/// Must happen before auto-gen routines are added.
 void hoistControlDecls( ast::TranslationUnit & translationUnit );
 } // namespace ControlStruct

src/ControlStruct/MultiLevelExit.cpp

@@ -149 +149 @@
 };
 
-NullStmt * labelledNullStmt(
-        const CodeLocation & cl, const Label & label ) {
+NullStmt * labelledNullStmt( const CodeLocation & cl, const Label & label ) {
         return new NullStmt( cl, vector<Label>{ label } );
 }
@@ -164 +163 @@
 
 const CompoundStmt * MultiLevelExitCore::previsit(
-        const CompoundStmt * stmt ) {
+                const CompoundStmt * stmt ) {
         visit_children = false;
 
@@ -189 +188 @@
 }
 
-size_t getUnusedIndex(
-        const Stmt * stmt, const Label & originalTarget ) {
+size_t getUnusedIndex( const Stmt * stmt, const Label & originalTarget ) {
         const size_t size = stmt->labels.size();
 
@@ -210 +208 @@
 }
 
-const Stmt * addUnused(
-        const Stmt * stmt, const Label & originalTarget ) {
+const Stmt * addUnused( const Stmt * stmt, const Label & originalTarget ) {
         size_t i = getUnusedIndex( stmt, originalTarget );
         if ( i == stmt->labels.size() ) {
@@ -356 +353 @@
 
 // Mimic what the built-in push_front would do anyways. It is O(n).
-void push_front(
-        vector<ptr<Stmt>> & vec, const Stmt * element ) {
+void push_front( vector<ptr<Stmt>> & vec, const Stmt * element ) {
         vec.emplace_back( nullptr );
         for ( size_t i = vec.size() - 1 ; 0 < i ; --i ) {
@@ -590 +586 @@
 
                 ptr<Stmt> else_stmt = nullptr;
-                Stmt * loop_kid = nullptr;
+                const Stmt * loop_kid = nullptr;
                 // check if loop node and if so add else clause if it exists
-                const WhileDoStmt * whilePtr = dynamic_cast<const WhileDoStmt *>(kid.get());
-                if ( whilePtr && whilePtr->else_) {
+                const WhileDoStmt * whilePtr = kid.as<WhileDoStmt>();
+                if ( whilePtr && whilePtr->else_ ) {
                         else_stmt = whilePtr->else_;
-                        WhileDoStmt * mutate_ptr = mutate(whilePtr);
-                        mutate_ptr->else_ = nullptr;
-                        loop_kid = mutate_ptr;
-                }
-                const ForStmt * forPtr = dynamic_cast<const ForStmt *>(kid.get());
-                if ( forPtr && forPtr->else_) {
+                        loop_kid = mutate_field( whilePtr, &WhileDoStmt::else_, nullptr );
+                }
+                const ForStmt * forPtr = kid.as<ForStmt>();
+                if ( forPtr && forPtr->else_ ) {
                         else_stmt = forPtr->else_;
-                        ForStmt * mutate_ptr = mutate(forPtr);
-                        mutate_ptr->else_ = nullptr;
-                        loop_kid = mutate_ptr;
+                        loop_kid = mutate_field( forPtr, &ForStmt::else_, nullptr );
                 }
 

src/ControlStruct/module.mk

@@ -17 +17 @@
 SRC += \
         ControlStruct/ExceptDecl.cc \
+        ControlStruct/ExceptDeclNew.cpp \
         ControlStruct/ExceptDecl.h \
         ControlStruct/ExceptTranslateNew.cpp \

src/InitTweak/GenInit.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenInit.cc --
+// GenInit.cc -- Generate initializers, and other stuff.
 //
 // Author           : Rob Schluntz

src/InitTweak/GenInit.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenInit.h --
+// GenInit.h -- Generate initializers, and other stuff.
 //
 // Author           : Rodolfo G. Esteves
@@ -29 +29 @@
         void genInit( ast::TranslationUnit & translationUnit );
 
-        /// Converts return statements into copy constructor calls on the hidden return variable
+        /// Converts return statements into copy constructor calls on the hidden return variable.
+        /// This pass must happen before auto-gen.
         void fixReturnStatements( std::list< Declaration * > & translationUnit );
         void fixReturnStatements( ast::TranslationUnit & translationUnit );

src/Tuples/Tuples.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Tuples.h --
+// Tuples.cc -- A collection of tuple operations.
 //
 // Author           : Andrew Beach

src/Tuples/Tuples.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Tuples.h --
+// Tuples.h -- A collection of tuple operations.
 //
 // Author           : Rodolfo G. Esteves

src/Validate/Autogen.hpp

@@ -22 +22 @@
 namespace Validate {
 
+/// Generate routines for all data types in the translation unit.
+/// A lot of passes have to happen either before or after this pass.
 void autogenerateRoutines( ast::TranslationUnit & translationUnit );
 

src/Validate/CompoundLiteral.hpp

@@ -23 +23 @@
 
 /// Use variables to implement compound literals.
+/// Must happen after auto-gen routines are added.
 void handleCompoundLiterals( ast::TranslationUnit & translationUnit );
 

src/Validate/EnumAndPointerDecay.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// EnumAndPointerDecay.cpp --
+// EnumAndPointerDecay.cpp -- Normalizes enumerations and types in functions.
 //
 // Author           : Andrew Beach

src/Validate/EnumAndPointerDecay.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// EnumAndPointerDecay.hpp --
+// EnumAndPointerDecay.hpp -- Normalizes enumerations and types in functions.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
+/// Fix the parameter and return types of functions. Also assigns types to
+/// enumeration values. This must happen before Link Reference to Types,
+/// it needs correct types for mangling, and before auto-gen.
 void decayEnumsAndPointers( ast::TranslationUnit & translationUnit );
 

src/Validate/FindSpecialDecls.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FindSpecialDeclarations.h --
+// FindSpecialDeclarations.h -- Find special declarations used in the compiler.
 //
 // Author           : Rob Schluntz
@@ -43 +43 @@
         void findSpecialDecls( std::list< Declaration * > & translationUnit );
 
-/// find and remember some of the special declarations that are useful for
+/// Find and remember some of the special declarations that are useful for
 /// generating code, so that they do not have to be discovered multiple times.
 void findGlobalDecls( ast::TranslationUnit & translationUnit );

src/Validate/FixQualifiedTypes.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixQualifiedTypes.cpp --
+// FixQualifiedTypes.cpp -- Replace the qualified type with a direct type.
 //
 // Author           : Andrew Beach
@@ -76 +76 @@
                                                         ret->qualifiers = type->qualifiers;
                                                         ast::TypeSubstitution sub( aggr->params, instp->params );
-                                                        // = parent->genericSubstitution();
                                                         auto result = sub.apply(ret);
                                                         return result.node.release();

src/Validate/FixQualifiedTypes.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixQualifiedTypes.hpp --
+// FixQualifiedTypes.hpp -- Replace the qualified type with a direct type.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
+/// Replaces qualified types with an unqualified NamedTypeDecl.
+/// Must happen after Link References To Types,
+/// because aggregate members are accessed.
 void fixQualifiedTypes( ast::TranslationUnit & translationUnit );
 

src/Validate/FixReturnTypes.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixReturnTypes.cpp --
+// FixReturnTypes.cpp -- Unifies the representation of return types.
 //
 // Author           : Andrew Beach

src/Validate/FixReturnTypes.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixReturnTypes.hpp --
+// FixReturnTypes.hpp -- Unifies the representation of return types.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
-// This pass needs to happen early so that other passes can find tuple types
-// in the right places, especially for function return types.
+/// This pass needs to happen early so that other passes can find tuple types
+/// in the right places, especially for function return types.
+/// Must happen before auto-gen.
 void fixReturnTypes( ast::TranslationUnit & translationUnit );
 

src/Validate/ForallPointerDecay.hpp

@@ -29 +29 @@
 /// Also checks that operator names are used properly on functions and
 /// assigns unique IDs. This is a "legacy" pass.
+/// Must be after implement concurrent keywords; because uniqueIds must be
+/// set on declaration before resolution.
+/// Must happen before auto-gen routines are added.
 void decayForallPointers( ast::TranslationUnit & transUnit );
 

src/Validate/GenericParameter.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenericParameter.hpp --
+// GenericParameter.hpp -- Generic parameter related passes.
 //
 // Author           : Andrew Beach

src/Validate/GenericParameter.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenericParameter.hpp --
+// GenericParameter.hpp -- Generic parameter related passes.
 //
 // Author           : Andrew Beach
@@ -23 +23 @@
 
 /// Perform substutions for generic parameters and fill in defaults.
+/// Check as early as possible, but it can't happen before Link References to
+/// Types and observed failing when attempted before eliminate typedef.
 void fillGenericParameters( ast::TranslationUnit & translationUnit );
 

src/Validate/HoistStruct.hpp

@@ -22 +22 @@
 namespace Validate {
 
-/// Flattens nested type declarations.
+/// Flattens nested type declarations. (Run right after Fix Qualified Types.)
 void hoistStruct( ast::TranslationUnit & translationUnit );
 

src/Validate/HoistTypeDecls.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// HoistTypeDecls.cpp --
+// HoistTypeDecls.cpp -- Hoists declarations of implicitly declared types.
 //
 // Author           : Andrew Beach

src/Validate/HoistTypeDecls.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// HoistTypeDecls.hpp --
+// HoistTypeDecls.hpp -- Hoists declarations of implicitly declared types.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
+/// There are some places where a type can be declared but are usually only
+/// referenced (with an *InstType). This inserts the declarations before
+/// they are referenced.
 void hoistTypeDecls( ast::TranslationUnit & translationUnit );
 

src/Validate/LabelAddressFixer.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelAddressFixer.cpp --
+// LabelAddressFixer.cpp -- Create label address expressions.
 //
 // Author           : Andrew Beach

src/Validate/LabelAddressFixer.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelAddressFixer.hpp --
+// LabelAddressFixer.hpp -- Create label address expressions.
 //
 // Author           : Andrew Beach
@@ -20 +20 @@
 namespace Validate {
 
+/// Label addresses are not actually created in the parser, this pass finds
+/// the patterns that represent the label address expression.
 void fixLabelAddresses( ast::TranslationUnit & translationUnit );
 

src/Validate/LinkReferenceToTypes.hpp

@@ -22 +22 @@
 namespace Validate {
 
+/// Fills in the base value of various instance types, and some related
+/// adjustments, such as setting the sized flag.
+/// Because of the sized flag, it must happen before auto-gen.
 void linkReferenceToTypes( ast::TranslationUnit & translationUnit );
 

src/Validate/ReplaceTypedef.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ReplaceTypedef.cpp --
+// ReplaceTypedef.cpp -- Fill in all typedefs with the underlying type.
 //
 // Author           : Andrew Beach

src/Validate/ReplaceTypedef.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ReplaceTypedef.hpp --
+// ReplaceTypedef.hpp -- Fill in all typedefs with the underlying type.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
+/// Uses of typedef are replaced with the type in the typedef.
 void replaceTypedef( ast::TranslationUnit & translationUnit );
 

src/Validate/VerifyCtorDtorAssign.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// VerifyCtorDtorAssign.cpp --
+// VerifyCtorDtorAssign.cpp -- Check the form of operators.
 //
 // Author           : Andrew Beach

src/Validate/VerifyCtorDtorAssign.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// VerifyCtorDtorAssign.hpp --
+// VerifyCtorDtorAssign.hpp -- Check the form of operators.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
+/// Check that constructors, destructors and assignments all have the correct
+/// form. Must happen before auto-gen or anything that examines operators.
 void verifyCtorDtorAssign( ast::TranslationUnit & translationUnit );
 

src/Virtual/Tables.h

@@ -19 +19 @@
 #include "AST/Fwd.hpp"
 class Declaration;
+class Expression;
+class FunctionDecl;
+class Initializer;
+class ObjectDecl;
 class StructDecl;
-class Expression;
+class StructInstType;
+class Type;
 
 namespace Virtual {

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jul 12 12:02:00 2022
-// Update Count     : 675
+// Last Modified On : Mon Jul 18 11:08:00 2022
+// Update Count     : 676
 //
 
@@ -330 +330 @@
                 Stats::Time::StopBlock();
 
-                PASS( "Translate Exception Declarations", ControlStruct::translateExcept( translationUnit ) );
-                if ( exdeclp ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                CodeTools::fillLocations( translationUnit );
-
                 if( useNewAST ) {
-                        CodeTools::fillLocations( translationUnit );
-
                         if (Stats::Counters::enabled) {
                                 ast::pass_visitor_stats.avg = Stats::Counters::build<Stats::Counters::AverageCounter<double>>("Average Depth - New");
@@ -349 +339 @@
                         forceFillCodeLocations( transUnit );
 
-                        // Must happen before auto-gen, or anything that examines ops.
+                        PASS( "Translate Exception Declarations", ControlStruct::translateExcept( transUnit ) );
+                        if ( exdeclp ) {
+                                dump( move( transUnit ) );
+                                return EXIT_SUCCESS;
+                        }
+
                         PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign( transUnit ) );
-
                         PASS( "Hoist Type Decls", Validate::hoistTypeDecls( transUnit ) );
                         // Hoist Type Decls pulls some declarations out of contexts where
@@ -359 +353 @@
 
                         PASS( "Replace Typedefs", Validate::replaceTypedef( transUnit ) );
-
-                        // Must happen before auto-gen.
                         PASS( "Fix Return Types", Validate::fixReturnTypes( transUnit ) );
-
-                        // Must happen before Link Reference to Types, it needs correct
-                        // types for mangling.
                         PASS( "Enum and Pointer Decay", Validate::decayEnumsAndPointers( transUnit ) );
 
-                        // Must happen before auto-gen, because it uses the sized flag.
                         PASS( "Link Reference To Types", Validate::linkReferenceToTypes( transUnit ) );
 
-                        // Must happen after Link References To Types,
-                        // because aggregate members are accessed.
                         PASS( "Fix Qualified Types", Validate::fixQualifiedTypes( transUnit ) );
-
                         PASS( "Hoist Struct", Validate::hoistStruct( transUnit ) );
                         PASS( "Eliminate Typedef", Validate::eliminateTypedef( transUnit ) );
-
-                        // Check as early as possible. Can't happen before
-                        // LinkReferenceToType, observed failing when attempted
-                        // before eliminateTypedef
                         PASS( "Validate Generic Parameters", Validate::fillGenericParameters( transUnit ) );
-
                         PASS( "Translate Dimensions", Validate::translateDimensionParameters( transUnit ) );
                         PASS( "Check Function Returns", Validate::checkReturnStatements( transUnit ) );
-
-                        // Must happen before Autogen.
                         PASS( "Fix Return Statements", InitTweak::fixReturnStatements( transUnit ) );
-
                         PASS( "Implement Concurrent Keywords", Concurrency::implementKeywords( transUnit ) );
-
-                        // Must be after implement concurrent keywords; because uniqueIds
-                        //   must be set on declaration before resolution.
-                        // Must happen before autogen routines are added.
                         PASS( "Forall Pointer Decay", Validate::decayForallPointers( transUnit ) );
-
-                        // Must happen before autogen routines are added.
                         PASS( "Hoist Control Declarations", ControlStruct::hoistControlDecls( transUnit ) );
 
-                        // Must be after enum and pointer decay.
-                        // Must be before compound literals.
                         PASS( "Generate Autogen Routines", Validate::autogenerateRoutines( transUnit ) );
 
@@ -473 +442 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Translate Exception Declarations", ControlStruct::translateExcept( translationUnit ) );
+                        if ( exdeclp ) {
+                                dump( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
                         // add the assignment statement after the initialization of a type parameter
                         PASS( "Validate", SymTab::validate( translationUnit ) );