Changeset 7030dab for src/SymTab

Timestamp:

Apr 6, 2020, 4:46:28 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (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 new-ast

Location:

src/SymTab

Files:

• Autogen.h (modified) (2 diffs)
• Demangle.cc (modified) (5 diffs)
• Indexer.cc (modified) (2 diffs)
• Mangler.cc (modified) (6 diffs)
• ManglerCommon.cc (modified) (2 diffs)
• Validate.cc (modified) (7 diffs)

src/SymTab/Autogen.h

@@ -10 +10 @@
 // Created On       : Sun May 17 21:53:34 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:50:25 2017
-// Update Count     : 15
+// Last Modified On : Fri Dec 13 16:38:06 2019
+// Update Count     : 16
 //
 
@@ -35 +35 @@
 #include "SynTree/Expression.h"   // for NameExpr, ConstantExpr, UntypedExpr...
 #include "SynTree/Type.h"         // for Type, ArrayType, Type::Qualifiers
+#include "SynTree/Statement.h"    // for CompoundStmt, DeclStmt, ExprStmt
 
 class CompoundStmt;

src/SymTab/Demangle.cc

@@ -10 +10 @@
 // Created On       : Thu Jul 19 12:52:41 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 30 13:46:33 2019
-// Update Count     : 3
+// Last Modified On : Tue Feb 11 15:09:18 2020
+// Update Count     : 10
 //
 
@@ -19 +19 @@
 #include "CodeGen/GenType.h"
 #include "Common/PassVisitor.h"
+#include "Common/utility.h"                                                             // isPrefix
 #include "Mangler.h"
 #include "SynTree/Type.h"
@@ -366 +367 @@
                                 // type variable types
                                 for (size_t k = 0; k < TypeDecl::NUMBER_OF_KINDS; ++k) {
-                                        static const std::string typeVariableNames[] = { "DT", "FT", "TT", };
+                                        static const std::string typeVariableNames[] = { "DT", "OT", "FT", "TT", };
                                         static_assert(
                                                 sizeof(typeVariableNames)/sizeof(typeVariableNames[0]) == TypeDecl::NUMBER_OF_KINDS,
@@ -416 +417 @@
 
                         bool StringView::isPrefix(const std::string & pref) {
-                                if ( pref.size() > str.size()-idx ) return false;
-                                auto its = std::mismatch( pref.begin(), pref.end(), std::next(str.begin(), idx) );
-                                if (its.first == pref.end()) {
+                                // if ( pref.size() > str.size()-idx ) return false;
+                                // auto its = std::mismatch( pref.begin(), pref.end(), std::next(str.begin(), idx) );
+                                // if (its.first == pref.end()) {
+                                //      idx += pref.size();
+                                //      return true;
+                                // }
+
+                                // This update is untested because there are no tests for this code.
+                                if ( ::isPrefix( str, pref, idx ) ) {
                                         idx += pref.size();
                                         return true;
@@ -429 +436 @@
                                 PRINT( std::cerr << "====== " << str.size() << " " << str << std::endl; )
                                 if (str.size() < 2+Encoding::manglePrefix.size()) return false; // +2 for at least _1 suffix
-                                if (! isPrefix(Encoding::manglePrefix) || ! isdigit(str.back())) return false;
+                                if ( ! isPrefix(Encoding::manglePrefix) || ! isdigit(str.back() ) ) return false;
 
                                 // get name

src/SymTab/Indexer.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Fri Mar  8 13:55:00 2019
-// Update Count     : 21
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec 13 23:43:19 2019
+// Update Count     : 22
 //
 
@@ -31 +31 @@
 #include "InitTweak/InitTweak.h"   // for isConstructor, isCopyFunction, isC...
 #include "Mangler.h"               // for Mangler
-#include "Parser/LinkageSpec.h"    // for isMangled, isOverridable, Spec
 #include "ResolvExpr/typeops.h"    // for typesCompatible
+#include "SynTree/LinkageSpec.h"   // for isMangled, isOverridable, Spec
 #include "SynTree/Constant.h"      // for Constant
 #include "SynTree/Declaration.h"   // for DeclarationWithType, FunctionDecl

src/SymTab/Mangler.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 30 13:46:10 2019
-// Update Count     : 26
+// Last Modified On : Sat Feb 15 13:55:12 2020
+// Update Count     : 33
 //
 #include "Mangler.h"
@@ -26 +26 @@
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/utility.h"              // for toString
-#include "Parser/LinkageSpec.h"          // for Spec, isOverridable, AutoGen, Int...
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
+#include "SynTree/LinkageSpec.h"         // for Spec, isOverridable, AutoGen, Int...
 #include "SynTree/Declaration.h"         // for TypeDecl, DeclarationWithType
 #include "SynTree/Expression.h"          // for TypeExpr, Expression, operator<<
@@ -128 +128 @@
                                 } // if
                                 mangleName << Encoding::manglePrefix;
-                                CodeGen::OperatorInfo opInfo;
-                                if ( operatorLookup( declaration->get_name(), opInfo ) ) {
-                                        mangleName << opInfo.outputName.size() << opInfo.outputName;
+                                const CodeGen::OperatorInfo * opInfo = CodeGen::operatorLookup( declaration->get_name() );
+                                if ( opInfo ) {
+                                        mangleName << opInfo->outputName.size() << opInfo->outputName;
                                 } else {
                                         mangleName << declaration->name.size() << declaration->name;
@@ -471 +471 @@
                         } // if
                         mangleName << Encoding::manglePrefix;
-                        CodeGen::OperatorInfo opInfo;
-                        if ( operatorLookup( decl->name, opInfo ) ) {
-                                mangleName << opInfo.outputName.size() << opInfo.outputName;
+                        const CodeGen::OperatorInfo * opInfo = CodeGen::operatorLookup( decl->name );
+                        if ( opInfo ) {
+                                mangleName << opInfo->outputName.size() << opInfo->outputName;
                         } else {
                                 mangleName << decl->name.size() << decl->name;
@@ -654 +654 @@
                         // aside from the assert false.
                         assertf(false, "Mangler_new should not visit typedecl: %s", toCString(decl));
-                        assertf( decl->kind < ast::TypeVar::Kind::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->kind );
+                        assertf( decl->kind < ast::TypeDecl::Kind::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->kind );
                         mangleName << Encoding::typeVariables[ decl->kind ] << ( decl->name.length() ) << decl->name;
                 }
@@ -674 +674 @@
                                         for ( const ast::TypeDecl * decl : ptype->forall ) {
                                                 switch ( decl->kind ) {
-                                                case ast::TypeVar::Kind::Dtype:
+                                                case ast::TypeDecl::Kind::Dtype:
                                                         dcount++;
                                                         break;
-                                                case ast::TypeVar::Kind::Ftype:
+                                                case ast::TypeDecl::Kind::Ftype:
                                                         fcount++;
                                                         break;
-                                                case ast::TypeVar::Kind::Ttype:
+                                                case ast::TypeDecl::Kind::Ttype:
                                                         vcount++;
                                                         break;

src/SymTab/ManglerCommon.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:44:03 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 14 17:06:37 2019
-// Update Count     : 26
+// Last Modified On : Fri Dec 13 14:54:38 2019
+// Update Count     : 28
 //
 
@@ -104 +104 @@
                         const std::string typeVariables[] = {
                                 "BD", // dtype
+                                "BO", // otype
                                 "BF", // ftype
                                 "BT", // ttype

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  7 6:42:00 2019
-// Update Count     : 360
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec 13 23:43:34 2019
+// Update Count     : 363
 //
 
@@ -69 +69 @@
 #include "InitTweak/GenInit.h"         // for fixReturnStatements
 #include "InitTweak/InitTweak.h"       // for isCtorDtorAssign
-#include "Parser/LinkageSpec.h"        // for C
 #include "ResolvExpr/typeops.h"        // for typesCompatible
 #include "ResolvExpr/Resolver.h"       // for findSingleExpression
 #include "ResolvExpr/ResolveTypeof.h"  // for resolveTypeof
 #include "SymTab/Autogen.h"            // for SizeType
+#include "SynTree/LinkageSpec.h"       // for C
 #include "SynTree/Attribute.h"         // for noAttributes, Attribute
 #include "SynTree/Constant.h"          // for Constant
@@ -311 +311 @@
                         Stats::Heap::newPass("validate-A");
                         Stats::Time::BlockGuard guard("validate-A");
+                        VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
                         acceptAll( translationUnit, hoistDecls );
                         ReplaceTypedef::replaceTypedef( translationUnit );
@@ -336 +337 @@
                         Stats::Time::BlockGuard guard("validate-C");
                         acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes_old
-                        VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
                         ReturnChecker::checkFunctionReturns( translationUnit );
                         InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
@@ -375 +375 @@
                         Stats::Heap::newPass("validate-F");
                         Stats::Time::BlockGuard guard("validate-F");
-                        Stats::Time::TimeBlock("Fix Object Type", [&]() {
-                                FixObjectType::fix( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Array Length", [&]() {
-                                ArrayLength::computeLength( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Find Special Declarations", [&]() {
-                                Validate::findSpecialDecls( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Fix Label Address", [&]() {
-                                mutateAll( translationUnit, labelAddrFixer );
-                        });
-                        Stats::Time::TimeBlock("Handle Attributes", [&]() {
-                                Validate::handleAttributes( translationUnit );
-                        });
+                        Stats::Time::TimeCall("Fix Object Type",
+                                FixObjectType::fix, translationUnit);
+                        Stats::Time::TimeCall("Array Length",
+                                ArrayLength::computeLength, translationUnit);
+                        Stats::Time::TimeCall("Find Special Declarations",
+                                Validate::findSpecialDecls, translationUnit);
+                        Stats::Time::TimeCall("Fix Label Address",
+                                mutateAll<LabelAddressFixer>, translationUnit, labelAddrFixer);
+                        Stats::Time::TimeCall("Handle Attributes",
+                                Validate::handleAttributes, translationUnit);
                 }
         }
@@ -1049 +1044 @@
                 Type * designatorType = tyDecl->base->stripDeclarator();
                 if ( StructInstType * aggDecl = dynamic_cast< StructInstType * >( designatorType ) ) {
-                        declsToAddBefore.push_back( new StructDecl( aggDecl->name, DeclarationNode::Struct, noAttributes, tyDecl->linkage ) );
+                        declsToAddBefore.push_back( new StructDecl( aggDecl->name, AggregateDecl::Struct, noAttributes, tyDecl->linkage ) );
                 } else if ( UnionInstType * aggDecl = dynamic_cast< UnionInstType * >( designatorType ) ) {
                         declsToAddBefore.push_back( new UnionDecl( aggDecl->name, noAttributes, tyDecl->linkage ) );
@@ -1187 +1182 @@
                 if ( CodeGen::isCtorDtorAssign( funcDecl->get_name() ) ) { // TODO: also check /=, etc.
                         if ( params.size() == 0 ) {
-                                SemanticError( funcDecl, "Constructors, destructors, and assignment functions require at least one parameter " );
+                                SemanticError( funcDecl->location, "Constructors, destructors, and assignment functions require at least one parameter." );
                         }
                         ReferenceType * refType = dynamic_cast< ReferenceType * >( params.front()->get_type() );
                         if ( ! refType ) {
-                                SemanticError( funcDecl, "First parameter of a constructor, destructor, or assignment function must be a reference " );
+                                SemanticError( funcDecl->location, "First parameter of a constructor, destructor, or assignment function must be a reference." );
                         }
                         if ( CodeGen::isCtorDtor( funcDecl->get_name() ) && returnVals.size() != 0 ) {
-                                SemanticError( funcDecl, "Constructors and destructors cannot have explicit return values " );
+                                if(!returnVals.front()->get_type()->isVoid()) {
+                                        SemanticError( funcDecl->location, "Constructors and destructors cannot have explicit return values." );
+                                }
                         }
                 }