Changeset 40e636a for src/SymTab

Timestamp:

Jul 21, 2016, 11:19:24 AM (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, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

b81adcc4

Parents:

5f98ce5

Message:

only generate array dimension constant inside of functions, recursively mutate array types into pointer types in function parameter lists, fix bug where global compound literal object is lost

Location:

src/SymTab

Files:

• FixFunction.cc (modified) (2 diffs)
• Validate.cc (modified) (2 diffs)

src/SymTab/FixFunction.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixFunction.cc -- 
+// FixFunction.cc --
 //
 // Author           : Richard C. Bilson
@@ -44 +44 @@
 
         Type * FixFunction::mutate(ArrayType *arrayType) {
-                PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), maybeClone( arrayType->get_base()->clone() ), maybeClone( arrayType->get_dimension() ), arrayType->get_isVarLen(), arrayType->get_isStatic() );
+                // need to recursively mutate the base type in order for multi-dimensional arrays to work.
+                PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->get_base()->clone()->acceptMutator( *this ), maybeClone( arrayType->get_dimension() ), arrayType->get_isVarLen(), arrayType->get_isStatic() );
                 delete arrayType;
                 return pointerType;

src/SymTab/Validate.cc

@@ -191 +191 @@
                 EliminateTypedef::eliminateTypedef( translationUnit );
                 HoistStruct::hoistStruct( translationUnit );
+                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs Pass1
                 acceptAll( translationUnit, pass1 );
                 acceptAll( translationUnit, pass2 );
                 ReturnChecker::checkFunctionReturns( translationUnit );
-                mutateAll( translationUnit, compoundliteral );
-                autogenerateRoutines( translationUnit );
+                compoundliteral.mutateDeclarationList( translationUnit );
                 acceptAll( translationUnit, pass3 );
                 VerifyCtorDtor::verify( translationUnit );
@@ -494 +494 @@
                         SizeType = eliminator.typedefNames["size_t"].first->get_base()->clone();
                 } else {
-                        assert( false && "missing global typedef for size_t" );
+                        // xxx - missing global typedef for size_t - default to long unsigned int, even though that may be wrong
+                        // eventually should have a warning for this case.
+                        SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
                 }
                 filter( translationUnit, isTypedef, true );