Changeset 356189a

Timestamp:

Apr 14, 2016, 5:11:26 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, 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:

b617e4b

Parents:

70a06f6

git-author:

Rob Schluntz <rschlunt@…> (04/14/16 17:10:08)

git-committer:

Rob Schluntz <rschlunt@…> (04/14/16 17:11:26)

Message:

output intrinsic constructor expressions as void expression or C assignment, don't generate field constructor which takes unnamed bitfield as a parameter

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• CodeGen/OperatorTable.cc (modified) (2 diffs)
• SymTab/Autogen.cc (modified) (3 diffs)
• libcfa/fstream.c (modified) (4 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:40:00 2016
+// Last Modified On : Thu Apr 14 17:10:21 2016
 // Update Count     : 255
 //
@@ -238 +238 @@
                                   case OT_POSTFIXASSIGN:
                                   case OT_INFIXASSIGN:
+                                  case OT_CTOR:
                                         {
                                                 assert( arg != applicationExpr->get_args().end() );
                                                 if ( AddressExpr *addrExpr = dynamic_cast< AddressExpr * >( *arg ) ) {
-
+                                                        // remove & from first assignment/ctor argument
                                                         *arg = addrExpr->get_arg();
                                                 } else {
+                                                        // no address-of operator, so must be a pointer - add dereference
                                                         UntypedExpr *newExpr = new UntypedExpr( new NameExpr( "*?" ) );
                                                         newExpr->get_args().push_back( *arg );
@@ -266 +268 @@
 
                                   case OT_CALL:
-                                        // there are no intrinsic definitions of the function call operator or constructors or destructors
+                                        // there are no intrinsic definitions of the function call operator
                                         assert( false );
                                         break;
 
                                   case OT_CTOR:
-                                  // it's just an optimization to disallow this, so for now let it through
-                                  // since it makes autogenerating constructors a lot easier
-                                varExpr->accept( *this );
-                                        output << "(";
-                                        genCommaList( applicationExpr->get_args().begin(), applicationExpr->get_args().end() );
-                                        output << ")";
-
-                                  // intrinsic constructors should never be called directly - they should be transformed back into Initializer nodes
-                                  // assert(false);
-                                  break;
+                                        if ( applicationExpr->get_args().size() == 1 ) {
+                                                // the expression fed into a single parameter constructor may contain
+                                                // side effects - output as a void expression
+                                                output << "((void)(";
+                                                (*arg++)->accept( *this );
+                                                output << ")) /* ?{} */";
+                                        } else if ( applicationExpr->get_args().size() == 2 ) {
+                                                // intrinsic constructors are essentially bitwise assignment
+                                                output << "(";
+                                                (*arg++)->accept( *this );
+                                                output << opInfo.symbol;
+                                                (*arg)->accept( *this );
+                                                output << ") /* ?{} */";
+                                        } else {
+                                                // not constructors with 0 or more than 2 parameters
+                                                assert( false );
+                                        }
+                                        break;
 
                                   case OT_DTOR:

src/CodeGen/OperatorTable.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Oct 06 15:26:34 2015
+// Last Modified On : Thu Apr 14 16:48:27 2016
 // Update Count     : 9
 //
@@ -21 +21 @@
                 const OperatorInfo tableValues[] = {
                         {       "?[?]",         "",             "_operator_index",                              OT_INDEX                        },
-                        {       "?{}",          "",             "_constructor",                                 OT_CTOR                         },
+                        {       "?{}",          "=",            "_constructor",                                 OT_CTOR                         },
                         {       "^?{}",         "",             "_destructor",                                  OT_DTOR                         },
                         {       "?()",          "",             "_operator_call",                               OT_CALL                         },

src/SymTab/Autogen.cc

@@ -10 +10 @@
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 16:00:16 2016
+// Last Modified On : Thu Apr 14 16:58:35 2016
 // Update Count     : 1
 //
@@ -59 +59 @@
         }
 
+        bool isUnnamedBitfield( ObjectDecl * obj ) {
+                return obj != NULL && obj->get_name() == "" && obj->get_bitfieldWidth() != NULL;
+        }
+
         template< typename OutputIterator >
         void makeScalarFunction( Expression *src, ObjectDecl *dstParam, DeclarationWithType *member, std::string fname, OutputIterator out ) {
                 ObjectDecl *obj = dynamic_cast<ObjectDecl *>( member );
                 // unnamed bit fields are not copied as they cannot be accessed
-                if ( obj != NULL && obj->get_name() == "" && obj->get_bitfieldWidth() != NULL ) return;
+                if ( isUnnamedBitfield( obj ) ) return;
 
                 // want to be able to generate assignment, ctor, and dtor generically,
@@ -321 +325 @@
                         DeclarationWithType * member = dynamic_cast<DeclarationWithType *>( *i );
                         assert( member );
+                        if ( isUnnamedBitfield( dynamic_cast< ObjectDecl * > ( member ) ) ) {
+                                // don't make a function whose parameter is an unnamed bitfield
+                                continue;
+                        }
                         memCtorType->get_parameters().push_back( new ObjectDecl( member->get_name(), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, member->get_type()->clone(), 0 ) );
                         FunctionDecl * ctor = new FunctionDecl( "?{}", functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static, LinkageSpec::AutoGen, memCtorType->clone(), new CompoundStmt( noLabels ), true, false );

src/libcfa/fstream.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// fstream.c -- 
+// fstream.c --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  6 17:55:27 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Apr 14 17:04:24 2016
 // Update Count     : 176
 //
@@ -75 +75 @@
         if ( fclose( (FILE *)(os->file) ) == EOF ) {
                 perror( IO_MSG "close output" );
-        } // if 
+        } // if
 } // close
 
@@ -139 +139 @@
         if ( fclose( (FILE *)(is->file) ) == EOF ) {
                 perror( IO_MSG "close input" );
-        } // if 
+        } // if
 } // close
 
@@ -154 +154 @@
         return is;
 } // read
-  
+
 ifstream *ungetc( ifstream * is, char c ) {
         if ( fail( is ) ) {