Changeset 1048b31 for src/GenPoly/GenPoly.cc

Timestamp:

May 2, 2016, 3:28:16 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

1b7ea43

Parents:

1f6e009 (diff), e945826 (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' into global-init

File:

• src/GenPoly/GenPoly.cc (modified) (3 diffs)

src/GenPoly/GenPoly.cc

@@ -16 +16 @@
 #include "GenPoly.h"
 
-#include "SymTab/Mangler.h"
 #include "SynTree/Expression.h"
 #include "SynTree/Type.h"
@@ -38 +37 @@
         ReferenceToType *isPolyRet( FunctionType *function ) {
                 if ( ! function->get_returnVals().empty() ) {
-                        TyVarMap forallTypes;
+                        TyVarMap forallTypes( (TypeDecl::Kind)-1 );
                         makeTyVarMap( function, forallTypes );
                         return (ReferenceToType*)isPolyType( function->get_returnVals().front()->get_type(), forallTypes );
@@ -218 +217 @@
         }
 
-        std::string sizeofName( Type *ty ) {
-                return std::string( "_sizeof_" ) + SymTab::Mangler::mangleType( ty );
-        }
-
-        std::string alignofName( Type *ty ) {
-                return std::string( "_alignof_" ) + SymTab::Mangler::mangleType( ty );
-        }
-
-        std::string offsetofName( Type* ty ) {
-                return std::string( "_offsetof_" ) + SymTab::Mangler::mangleType( ty );
-        }
-
 } // namespace GenPoly