Changeset 2e9b59b for src/SymTab/Validate.cc

Timestamp:

Apr 19, 2022, 3:00:04 PM (3 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

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

Children:

5b84a321

Parents:

ba897d21 (diff), bb7c77d (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:

added benchmark and evaluations chapter to thesis

File:

• src/SymTab/Validate.cc (modified) (5 diffs)

src/SymTab/Validate.cc

@@ -395 +395 @@
                                 TranslateDimensionGenericParameters::translateDimensions( translationUnit );
                         });
+                        if (!useNewAST) {
                         Stats::Time::TimeBlock("Resolve Enum Initializers", [&]() {
                                 acceptAll( translationUnit, rei ); // must happen after translateDimensions because rei needs identifier lookup, which needs name mangling
                         });
+                        }
                         Stats::Time::TimeBlock("Check Function Returns", [&]() {
                                 ReturnChecker::checkFunctionReturns( translationUnit );
@@ -405 +407 @@
                         });
                 }
+        }
+
+        static void decayForallPointers( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<TraitExpander_old> te;
+                acceptAll( translationUnit, te );
+                PassVisitor<AssertionFixer_old> af;
+                acceptAll( translationUnit, af );
+                PassVisitor<CheckOperatorTypes_old> cot;
+                acceptAll( translationUnit, cot );
+                PassVisitor<FixUniqueIds_old> fui;
+                acceptAll( translationUnit, fui );
         }
 
@@ -474 +487 @@
         }
 
-        void decayForallPointers( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<TraitExpander_old> te;
-                acceptAll( translationUnit, te );
-                PassVisitor<AssertionFixer_old> af;
-                acceptAll( translationUnit, af );
-                PassVisitor<CheckOperatorTypes_old> cot;
-                acceptAll( translationUnit, cot );
-                PassVisitor<FixUniqueIds_old> fui;
-                acceptAll( translationUnit, fui );
-        }
-
-        void decayForallPointersA( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<TraitExpander_old> te;
-                acceptAll( translationUnit, te );
-        }
-        void decayForallPointersB( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<AssertionFixer_old> af;
-                acceptAll( translationUnit, af );
-        }
-        void decayForallPointersC( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<CheckOperatorTypes_old> cot;
-                acceptAll( translationUnit, cot );
-        }
-        void decayForallPointersD( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<FixUniqueIds_old> fui;
-                acceptAll( translationUnit, fui );
-        }
-
         void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
                 validate_A( translationUnit );
@@ -989 +974 @@
                                         // need to resolve enumerator initializers early so that other passes that determine if an expression is constexpr have the appropriate information.
                                         SingleInit * init = strict_dynamic_cast<SingleInit *>( field->init );
-                                        ResolvExpr::findSingleExpression( init->value, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), indexer );
+                                        if ( !enumDecl->base || dynamic_cast<BasicType *>(enumDecl->base))
+                                                ResolvExpr::findSingleExpression( init->value, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), indexer );
+                                        else {
+                                                if (dynamic_cast<PointerType *>(enumDecl->base)) {
+                                                        auto typePtr = dynamic_cast<PointerType *>(enumDecl->base);
+                                                        ResolvExpr::findSingleExpression( init->value,
+                                                         new PointerType( Type::Qualifiers(), typePtr->base ), indexer );
+                                                } else {
+                                                        ResolvExpr::findSingleExpression( init->value, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), indexer );
+                                                }
+                                        }
+                                        
                                 }
                         }
+
                 } // if
         }
@@ -1255 +1252 @@
                         declsToAddBefore.push_back( new UnionDecl( aggDecl->name, noAttributes, tyDecl->linkage ) );
                 } else if ( EnumInstType * enumDecl = dynamic_cast< EnumInstType * >( designatorType ) ) {
-                        declsToAddBefore.push_back( new EnumDecl( enumDecl->name, noAttributes, tyDecl->linkage ) );
+                        // declsToAddBefore.push_back( new EnumDecl( enumDecl->name, noAttributes, tyDecl->linkage, enumDecl->baseEnum->base ) );
+                        if (enumDecl->baseEnum) {
+                                declsToAddBefore.push_back( new EnumDecl( enumDecl->name, noAttributes, tyDecl->linkage, enumDecl->baseEnum->base ) );
+                        } else {
+                                declsToAddBefore.push_back( new EnumDecl( enumDecl->name, noAttributes, tyDecl->linkage ) );
+                        }
                 } // if
                 return tyDecl->clone();