Changeset a935892 for src/GenPoly

Timestamp:

Jun 3, 2019, 10:54:01 AM (6 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:

0e315a5, dafe9e1

Parents:

043a5b6 (diff), 8d70648 (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

Location:

src/GenPoly

Files:

• GenPoly.cc (modified) (2 diffs)
• GenPoly.h (modified) (2 diffs)

src/GenPoly/GenPoly.cc

@@ -24 +24 @@
 #include <vector>                       // for vector
 
+#include "AST/Type.hpp"
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ResolvExpr/typeops.h"         // for flatten
@@ -262 +263 @@
                 } else {
                         return dynamic_cast< FunctionType* >( ty ); // pointer if FunctionType, NULL otherwise
+                }
+        }
+
+        const ast::FunctionType * getFunctionType( const ast::Type * ty ) {
+                if ( auto pty = dynamic_cast< const ast::PointerType * >( ty ) ) {
+                        return pty->base.as< ast::FunctionType >();
+                } else {
+                        return dynamic_cast< const ast::FunctionType * >( ty );
                 }
         }

src/GenPoly/GenPoly.h

@@ -20 +20 @@
 
 #include "ErasableScopedMap.h"    // for ErasableScopedMap
+#include "AST/Fwd.hpp"
 #include "SymTab/Mangler.h"       // for Mangler
 #include "SynTree/Declaration.h"  // for TypeDecl::Data, AggregateDecl, Type...
@@ -72 +73 @@
         /// Returns a pointer to the base FunctionType if ty is the type of a function (or pointer to one), NULL otherwise
         FunctionType *getFunctionType( Type *ty );
+        const ast::FunctionType * getFunctionType( const ast::Type * ty );
 
         /// If expr (after dereferencing N >= 0 pointers) is a variable expression, returns the variable expression, NULL otherwise;