Changeset c3a2007 for src/SymTab/Validate.cc

Timestamp:

Oct 28, 2019, 4:28:37 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8364209

Parents:

c921712 (diff), 9bdb8b7 (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

File:

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

src/SymTab/Validate.cc

@@ -81 +81 @@
 #include "SynTree/Label.h"             // for operator==, Label
 #include "SynTree/Mutator.h"           // for Mutator
-#include "SynTree/TopLvalue.h"         // for assertTopLvalue, clearInnerLvalue
 #include "SynTree/Type.h"              // for Type, TypeInstType, EnumInstType
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
@@ -309 +308 @@
                 PassVisitor<FixQualifiedTypes> fixQual;
 
-                assertTopLvalue( translationUnit );
                 {
                         Stats::Heap::newPass("validate-A");
@@ -318 +316 @@
                         acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes_old because it is an indexer and needs correct types for mangling
                 }
-                assertTopLvalue( translationUnit );
                 {
                         Stats::Heap::newPass("validate-B");
                         Stats::Time::BlockGuard guard("validate-B");
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Link Reference To Types", [&]() {
                                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
                         });
-                        clearInnerLvalue( translationUnit );
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Fix Qualified Types", [&]() {
                                 mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes_old, because aggregate members are accessed
                         });
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Hoist Structs", [&]() {
                                 HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
                         });
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Eliminate Typedefs", [&]() {
                                 EliminateTypedef::eliminateTypedef( translationUnit ); //
                         });
                 }
-                assertTopLvalue( translationUnit );
                 {
                         Stats::Heap::newPass("validate-C");
@@ -349 +340 @@
                         InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
                 }
-                assertTopLvalue( translationUnit );
                 {
                         Stats::Heap::newPass("validate-D");
                         Stats::Time::BlockGuard guard("validate-D");
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Apply Concurrent Keywords", [&]() {
                                 Concurrency::applyKeywords( translationUnit );
                         });
-                        clearInnerLvalue( translationUnit );
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Forall Pointer Decay", [&]() {
                                 acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
                         });
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Hoist Control Declarations", [&]() {
                                 ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
                         });
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Generate Autogen routines", [&]() {
                                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay_old
                         });
-                        clearInnerLvalue( translationUnit );
-                }
-                assertTopLvalue( translationUnit );
+                }
                 {
                         Stats::Heap::newPass("validate-E");
                         Stats::Time::BlockGuard guard("validate-E");
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Implement Mutex Func", [&]() {
                                 Concurrency::implementMutexFuncs( translationUnit );
                         });
-                        clearInnerLvalue( translationUnit );
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Implement Thread Start", [&]() {
                                 Concurrency::implementThreadStarter( translationUnit );
                         });
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Compound Literal", [&]() {
                                 mutateAll( translationUnit, compoundliteral );
                         });
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Resolve With Expressions", [&]() {
                                 ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
                         });
-                        clearInnerLvalue( translationUnit );
-                }
-                assertTopLvalue( translationUnit );
+                }
                 {
                         Stats::Heap::newPass("validate-F");
                         Stats::Time::BlockGuard guard("validate-F");
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Fix Object Type", [&]() {
                                 FixObjectType::fix( translationUnit );
                         });
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Array Length", [&]() {
                                 ArrayLength::computeLength( translationUnit );
                         });
-                        clearInnerLvalue( translationUnit );
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Find Special Declarations", [&]() {
                                 Validate::findSpecialDecls( translationUnit );
                         });
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Fix Label Address", [&]() {
                                 mutateAll( translationUnit, labelAddrFixer );
                         });
-                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Handle Attributes", [&]() {
                                 Validate::handleAttributes( translationUnit );
                         });
                 }
-                assertTopLvalue( translationUnit );
         }
 
@@ -1334 +1303 @@
         void FixObjectType::previsit( ObjectDecl * objDecl ) {
                 Type * new_type = ResolvExpr::resolveTypeof( objDecl->get_type(), indexer );
-                new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
                 objDecl->set_type( new_type );
         }
@@ -1340 +1308 @@
         void FixObjectType::previsit( FunctionDecl * funcDecl ) {
                 Type * new_type = ResolvExpr::resolveTypeof( funcDecl->type, indexer );
-                new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
                 funcDecl->set_type( new_type );
         }
@@ -1347 +1314 @@
                 if ( typeDecl->get_base() ) {
                         Type * new_type = ResolvExpr::resolveTypeof( typeDecl->get_base(), indexer );
-                        new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
                         typeDecl->set_base( new_type );
                 } // if