Changeset 5809461 for src/SymTab

Timestamp:

Sep 1, 2017, 6:59:48 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

b0dfbc4

Parents:

bc3127d

Message:

Fix handling of GCC label address and computed goto

Location:

src/SymTab

Files:

• Indexer.cc (modified) (1 diff)
• Validate.cc (modified) (4 diffs)

src/SymTab/Indexer.cc

@@ -398 +398 @@
         void Indexer::visit( LabelAddressExpr *labAddressExpr ) {
                 acceptNewScope( labAddressExpr->get_result(), *this );
-                maybeAccept( labAddressExpr->get_arg(), *this );
         }
 

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;
@@ -257 +263 @@
                 PassVisitor<ValidateGenericParameters> genericParams;
                 PassVisitor<FindSpecialDeclarations> finder;
+                PassVisitor<LabelAddressFixer> labelAddrFixer;
 
                 EliminateTypedef::eliminateTypedef( translationUnit );
@@ -274 +281 @@
                 ArrayLength::computeLength( translationUnit );
                 acceptAll( translationUnit, finder );
+                mutateAll( translationUnit, labelAddrFixer );
         }
 
@@ -977 +985 @@
         }
 
+        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 ) {