Changeset fb24492

Timestamp:

May 12, 2016, 1:19:59 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:

03286aa, 7b3f66b

Parents:

ec79847 (diff), 228851d (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/SymTab/Validate.cc

Location:

src

Files:

• GenPoly/Box.cc (modified) (3 diffs)
• SymTab/Autogen.cc (modified) (3 diffs)
• SymTab/Validate.cc (modified) (1 diff)
• SynTree/Constant.cc (modified) (1 diff)
• SynTree/Constant.h (modified) (1 diff)

src/GenPoly/Box.cc

@@ -499 +499 @@
 
                         // place current size in the current offset index
-                        addExpr( layoutDecl->get_statements(), makeOp( "?=?", makeOp( "?[?]", new VariableExpr( offsetParam ), new ConstantExpr( Constant::from( n_members ) ) ),
+                        addExpr( layoutDecl->get_statements(), makeOp( "?=?", makeOp( "?[?]", new VariableExpr( offsetParam ), new ConstantExpr( Constant::from_ulong( n_members ) ) ),
                                                                               derefVar( sizeParam ) ) );
                         ++n_members;
@@ -2069 +2069 @@
                                 if ( n_members == 0 ) {
                                         // all empty structs have the same layout - size 1, align 1
-                                        makeVar( sizeofName( typeName ), layoutType, new SingleInit( new ConstantExpr( Constant::from( (unsigned long)1 ) ) ) );
-                                        makeVar( alignofName( typeName ), layoutType->clone(), new SingleInit( new ConstantExpr( Constant::from( (unsigned long)1 ) ) ) );
+                                        makeVar( sizeofName( typeName ), layoutType, new SingleInit( new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
+                                        makeVar( alignofName( typeName ), layoutType->clone(), new SingleInit( new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
                                         // NOTE zero-length arrays are forbidden in C, so empty structs have no offsetof array
                                 } else {
                                         ObjectDecl *sizeVar = makeVar( sizeofName( typeName ), layoutType );
                                         ObjectDecl *alignVar = makeVar( alignofName( typeName ), layoutType->clone() );
-                                        ObjectDecl *offsetVar = makeVar( offsetofName( typeName ), new ArrayType( Type::Qualifiers(), layoutType->clone(), new ConstantExpr( Constant::from( n_members ) ), false, false ) );
+                                        ObjectDecl *offsetVar = makeVar( offsetofName( typeName ), new ArrayType( Type::Qualifiers(), layoutType->clone(), new ConstantExpr( Constant::from_int( n_members ) ), false, false ) );
 
                                         // generate call to layout function
@@ -2194 +2194 @@
 
                                         // build the offset array and replace the pack with a reference to it
-                                        ObjectDecl *offsetArray = makeVar( offsetName, new ArrayType( Type::Qualifiers(), offsetType, new ConstantExpr( Constant::from( baseMembers.size() ) ), false, false ),
+                                        ObjectDecl *offsetArray = makeVar( offsetName, new ArrayType( Type::Qualifiers(), offsetType, new ConstantExpr( Constant::from_ulong( baseMembers.size() ) ), false, false ),
                                                         new ListInit( inits ) );
                                         ret = new VariableExpr( offsetArray );

src/SymTab/Autogen.cc

@@ -10 +10 @@
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue May 03 16:56:21 2016
+// Last Modified On : Wed May 11 13:22:03 2016
 // Update Count     : 1
 //
@@ -217 +217 @@
                                 if ( type->get_qualifiers().isConst ) {
                                         // don't assign const members
+                                        continue;
+                                }
+
+                                if ( field->get_name() == "" ) {
+                                        // don't assign to anonymous members
+                                        // xxx - this is a temporary fix. Anonymous members tie into
+                                        // our inheritance model. I think the correct way to handle this is to
+                                        // cast the structure to the type of the member and let the resolver
+                                        // figure out whether it's valid and have a pass afterwards that fixes
+                                        // the assignment to use pointer arithmetic with the offset of the
+                                        // member, much like how generic type members are handled.
                                         continue;
                                 }
@@ -317 +328 @@
                         if ( isUnnamedBitfield( dynamic_cast< ObjectDecl * > ( member ) ) ) {
                                 // don't make a function whose parameter is an unnamed bitfield
+                                continue;
+                        } else if ( member->get_name() == "" ) {
+                                // don't assign to anonymous members
+                                // xxx - this is a temporary fix. Anonymous members tie into
+                                // our inheritance model. I think the correct way to handle this is to
+                                // cast the structure to the type of the member and let the resolver
+                                // figure out whether it's valid and have a pass afterwards that fixes
+                                // the assignment to use pointer arithmetic with the offset of the
+                                // member, much like how generic type members are handled.
                                 continue;
                         }

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:37:23 2016
+// Last Modified On : Wed May 11 13:17:52 2016
 // Update Count     : 297
 //

src/SynTree/Constant.cc

@@ -30 +30 @@
 Constant::~Constant() { delete type; }
 
-Constant Constant::from( int i ) {
+Constant Constant::from_int( int i ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), std::to_string( i ) );
 }
 
-Constant Constant::from( unsigned long i ) {
+Constant Constant::from_ulong( unsigned long i ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), std::to_string( i ) );
 }
 
-Constant Constant::from( double d ) {
+Constant Constant::from_double( double d ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::Double ), std::to_string( d ) );
 }

src/SynTree/Constant.h

@@ -33 +33 @@
 
         /// generates an integer constant of the given int
-        static Constant from( int i );
+        static Constant from_int( int i );
         /// generates an integer constant of the given unsigned long int
-        static Constant from( unsigned long i );
+        static Constant from_ulong( unsigned long i );
         /// generates a floating point constant of the given double
-        static Constant from( double d );
+        static Constant from_double( double d );
 
         virtual Constant *clone() const;