Changeset fe8c31e

Timestamp:

Oct 9, 2021, 12:18:47 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

c8371b5

Parents:

05c941a (diff), 68fe946e (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/porting.md (modified) (1 diff)
• CodeTools/DeclStats.cc (modified) (3 diffs)
• Common/DeclStats.cpp (added)
• Common/DeclStats.hpp (added)
• Common/module.mk (modified) (1 diff)
• main.cc (modified) (5 diffs)

src/AST/porting.md

@@ -98 +98 @@
         * `Initializer` => `ast::Init`
     * `Statement` => `ast::Stmt`
+    * `ReferenceToType` => `ast::BaseInstType`
         * any field names should follow a similar renaming
   * because they don't really belong to `Type` (and for consistency with `Linkage::Spec`):

src/CodeTools/DeclStats.cc

@@ -156 +156 @@
                 /// number of counting bins for linkages
                 static const unsigned n_named_specs = 8;
-                /// map from total number of specs to bins
-                static const unsigned ind_for_linkage[16];
+                /// Mapping function from linkage to bin.
+                static unsigned linkage_index( LinkageSpec::Spec spec ) {
+                        switch ( spec ) {
+                        case LinkageSpec::Intrinsic:  return 0;
+                        case LinkageSpec::C:          return 1;
+                        case LinkageSpec::Cforall:    return 2;
+                        case LinkageSpec::AutoGen:    return 3;
+                        case LinkageSpec::Compiler:   return 4;
+                        case LinkageSpec::BuiltinCFA: return 5;
+                        case LinkageSpec::BuiltinC:   return 6;
+                        default:                      return 7;
+                        }
+                }
 
                 Stats for_linkage[n_named_specs];            ///< Stores separate stats per linkage
@@ -366 +377 @@
                         const std::string& mangleName = decl->get_mangleName().empty() ? decl->name : decl->get_mangleName();
                         if ( seen_names.insert( mangleName ).second ) {
-                                Stats& stats = for_linkage[ ind_for_linkage[ decl->linkage ] ];
+                                Stats& stats = for_linkage[ linkage_index( decl->linkage ) ];
 
                                 ++stats.n_decls;
@@ -527 +538 @@
         };
 
-        const unsigned DeclStats::ind_for_linkage[]
-                = { 7, 7, 2, 1,   7, 7, 7, 3,   4, 7, 6, 5,   7, 7, 7, 0 };
-
         void printDeclStats( std::list< Declaration * > &translationUnit ) {
                 PassVisitor<DeclStats> stats;

src/Common/module.mk

@@ -22 +22 @@
       Common/CompilerError.h \
       Common/Debug.h \
+      Common/DeclStats.hpp \
+      Common/DeclStats.cpp \
       Common/ErrorObjects.h \
       Common/Eval.cc \

src/main.cc

@@ -9 +9 @@
 // Author           : Peter Buhr and Rob Schluntz
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Henry Xue
-// Last Modified On : Mon Aug 23 15:42:08 2021
-// Update Count     : 650
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Oct  8 11:22:00 2021
+// Update Count     : 651
 //
 
@@ -43 +43 @@
 #include "Common/CodeLocationTools.hpp"     // for forceFillCodeLocations
 #include "Common/CompilerError.h"           // for CompilerError
+#include "Common/DeclStats.hpp"
 #include "Common/Stats.h"
 #include "Common/PassVisitor.h"
@@ -341 +342 @@
                 } // if
 
-                if ( declstatsp ) {
-                        CodeTools::printDeclStats( translationUnit );
-                        deleteAll( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                if ( bresolvep ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
                 CodeTools::fillLocations( translationUnit );
-
-                if ( resolvprotop ) {
-                        CodeTools::dumpAsResolvProto( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
 
                 if( useNewAST ) {
@@ -366 +351 @@
                         auto transUnit = convert( move( translationUnit ) );
 
+                        forceFillCodeLocations( transUnit );
+
                         PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( transUnit ) );
-                        
+
+                        // LibCfa::makeLibCfa
+
+                        if ( declstatsp ) {
+                                printDeclStats( transUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( bresolvep ) {
+                                dump( move( transUnit ) );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( resolvprotop ) {
+                                // TODO: Better error message.
+                                assert(false);
+                                return EXIT_SUCCESS;
+                        } // if
+
                         PASS( "Resolve", ResolvExpr::resolve( transUnit ) );
                         if ( exprp ) {
@@ -380 +385 @@
                 } else {
                         PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );
+
+                        // LibCfa::makeLibCfa
+
+                        if ( declstatsp ) {
+                                CodeTools::printDeclStats( translationUnit );
+                                deleteAll( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( bresolvep ) {
+                                dump( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        CodeTools::fillLocations( translationUnit );
+
+                        if ( resolvprotop ) {
+                                CodeTools::dumpAsResolvProto( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
 
                         PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );