Changeset 70a06f6 for src/GenPoly/GenPoly.cc

Timestamp:

Apr 14, 2016, 4:13:10 PM (10 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:

356189a

Parents:

db4ecc5 (diff), 37f0da8 (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Parser/DeclarationNode.cc
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/AddVisit.h
src/SymTab/Validate.cc
src/SynTree/Expression.cc
src/SynTree/Expression.h
src/SynTree/Mutator.cc
src/SynTree/Mutator.h
src/SynTree/SynTree.h
src/SynTree/Visitor.cc
src/SynTree/Visitor.h
src/libcfa/iostream.c

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