Changeset 486341f

Timestamp:

Aug 24, 2016, 1:55:39 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

3906301, 4e2b9710, 60aa49a7, a2a8d2a6

Parents:

0555f4b

Message:

add option to CodeGen? to output unmangled name, add ctorWarnings test

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• CodeGen/CodeGenerator.h (modified) (3 diffs)
• CodeGen/GenType.cc (modified) (8 diffs)
• CodeGen/GenType.h (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (3 diffs)
• tests/.expect/ctorWarnings.txt (added)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/ctorWarnings.c (added)

src/CodeGen/CodeGenerator.cc

@@ -83 +83 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool mangle ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), mangle( mangle ) {}
 
         CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
@@ -95 +95 @@
         }
 
-        string mangleName( DeclarationWithType * decl ) {
+        string CodeGenerator::mangleName( DeclarationWithType * decl ) {
+                if ( ! mangle ) return decl->get_name();
                 if ( decl->get_mangleName() != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors

src/CodeGen/CodeGenerator.h

@@ -30 +30 @@
                 static int tabsize;
 
-                CodeGenerator( std::ostream &os );
+                CodeGenerator( std::ostream &os, bool mangle = true );
                 CodeGenerator( std::ostream &os, std::string, int indent = 0, bool infun = false );
                 CodeGenerator( std::ostream &os, char *, int indent = 0, bool infun = false );
@@ -114 +114 @@
                 std::ostream &output;
                 LabelPrinter printLabels;
+                bool mangle = true;
 
                 void printDesignators( std::list< Expression * > & );
@@ -119 +120 @@
                 void handleAggregate( AggregateDecl *aggDecl );
                 void handleTypedef( NamedTypeDecl *namedType );
+                std::string mangleName( DeclarationWithType * decl );
         }; // CodeGenerator
 

src/CodeGen/GenType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenType.cc -- 
+// GenType.cc --
 //
 // Author           : Richard C. Bilson
@@ -28 +28 @@
         class GenType : public Visitor {
           public:
-                GenType( const std::string &typeString );
+                GenType( const std::string &typeString, bool mangle = true );
                 std::string get_typeString() const { return typeString; }
                 void set_typeString( const std::string &newValue ) { typeString = newValue; }
-  
+
                 virtual void visit( FunctionType *funcType );
                 virtual void visit( VoidType *voidType );
@@ -42 +42 @@
                 virtual void visit( TypeInstType *typeInst );
                 virtual void visit( VarArgsType *varArgsType );
-  
+
           private:
                 void handleQualifiers( Type *type );
                 void genArray( const Type::Qualifiers &qualifiers, Type *base, Expression *dimension, bool isVarLen, bool isStatic );
-  
+
                 std::string typeString;
+                bool mangle = true;
         };
 
-        std::string genType( Type *type, const std::string &baseString ) {
-                GenType gt( baseString );
+        std::string genType( Type *type, const std::string &baseString, bool mangle ) {
+                GenType gt( baseString, mangle );
                 type->accept( gt );
                 return gt.get_typeString();
         }
 
-        GenType::GenType( const std::string &typeString ) : typeString( typeString ) {}
+        GenType::GenType( const std::string &typeString, bool mangle ) : typeString( typeString ), mangle( mangle ) {}
 
         void GenType::visit( VoidType *voidType ) {
@@ -100 +101 @@
                 } // if
                 if ( dimension != 0 ) {
-                        CodeGenerator cg( os );
+                        CodeGenerator cg( os, mangle );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
@@ -109 +110 @@
 
                 typeString = os.str();
-  
+
                 base->accept( *this );
         }
@@ -142 +143 @@
                         } // if
                 } // if
-  
+
                 /************* parameters ***************/
 
@@ -154 +155 @@
                         } // if
                 } else {
-                        CodeGenerator cg( os );
+                        CodeGenerator cg( os, mangle );
                         os << "(" ;
 
@@ -164 +165 @@
                         os << ")";
                 } // if
-  
+
                 typeString = os.str();
 

src/CodeGen/GenType.h

@@ -21 +21 @@
 
 namespace CodeGen {
-        std::string genType( Type *type, const std::string &baseString );
+        std::string genType( Type *type, const std::string &baseString, bool mangle = true );
 } // namespace CodeGen
 

src/InitTweak/FixInit.cc

@@ -735 +735 @@
                         for ( DeclarationWithType * member : unhandled ) {
                                 // emit a warning for each unhandled member
-                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name() ), ", member ", member->get_name(), " may not have been ", isConstructor( funcDecl->get_name() ) ? "constructed" : "destructed" );
+                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", member->get_name(), " may not have been ", isConstructor( funcDecl->get_name() ) ? "constructed" : "destructed" );
                         }
 
@@ -789 +789 @@
                 void WarnStructMembers::visit( MemberExpr * memberExpr ) {
                         if ( ! checkWarnings( function ) ) return;
-                        if ( ! isConstructor( function->get_name() ) );
+                        if ( ! isConstructor( function->get_name() ) ) return;
 
                         if ( ApplicationExpr * deref = dynamic_cast< ApplicationExpr * >( memberExpr->get_aggregate() ) ) {
@@ -797 +797 @@
                                                         if ( unhandled.count( memberExpr->get_member() ) ) {
                                                                 // emit a warning because a member was used before it was constructed
-                                                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name() ), ", member ", memberExpr->get_member()->get_name(), " used before being constructed" );
+                                                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", memberExpr->get_member()->get_name(), " used before being constructed" );
                                                         }
                                                 }

src/tests/Makefile.am

@@ -62 +62 @@
         ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
+ctorWarnings: ctorWarnings.c
+        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o /dev/null 2> ${@}
+

src/tests/Makefile.in

@@ -670 +670 @@
         ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
+ctorWarnings: ctorWarnings.c
+        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o /dev/null 2> ${@}
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.