Changes in src/SymTab/Validate.cc [5809461:2bf9c37]

File:

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

src/SymTab/Validate.cc

@@ -244 +244 @@
         };
 
-        struct LabelAddressFixer final : public WithGuards {
-                std::set< Label > labels;
-
-                void premutate( FunctionDecl * funcDecl );
-                Expression * postmutate( AddressExpr * addrExpr );
-        };
 
         FunctionDecl * dereferenceOperator = nullptr;
@@ -263 +257 @@
                 PassVisitor<ValidateGenericParameters> genericParams;
                 PassVisitor<FindSpecialDeclarations> finder;
-                PassVisitor<LabelAddressFixer> labelAddrFixer;
 
                 EliminateTypedef::eliminateTypedef( translationUnit );
@@ -281 +274 @@
                 ArrayLength::computeLength( translationUnit );
                 acceptAll( translationUnit, finder );
-                mutateAll( translationUnit, labelAddrFixer );
         }
 
@@ -985 +977 @@
         }
 
-        struct LabelFinder {
-                std::set< Label > & labels;
-                LabelFinder( std::set< Label > & labels ) : labels( labels ) {}
-                void previsit( Statement * stmt ) {
-                        for ( Label & l : stmt->labels ) {
-                                labels.insert( l );
-                        }
-                }
-        };
-
-        void LabelAddressFixer::premutate( FunctionDecl * funcDecl ) {
-                GuardValue( labels );
-                PassVisitor<LabelFinder> finder( labels );
-                funcDecl->accept( finder );
-        }
-
-        Expression * LabelAddressFixer::postmutate( AddressExpr * addrExpr ) {
-                // convert &&label into label address
-                if ( AddressExpr * inner = dynamic_cast< AddressExpr * >( addrExpr->arg ) ) {
-                        if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( inner->arg ) ) {
-                                if ( labels.count( nameExpr->name ) ) {
-                                        Label name = nameExpr->name;
-                                        delete addrExpr;
-                                        return new LabelAddressExpr( name );
-                                }
-                        }
-                }
-                return addrExpr;
-        }
-
         void FindSpecialDeclarations::previsit( FunctionDecl * funcDecl ) {
                 if ( ! dereferenceOperator ) {