Index: src/ResolvExpr/ResolveTypeof.cpp =================================================================== --- src/ResolvExpr/ResolveTypeof.cpp (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ src/ResolvExpr/ResolveTypeof.cpp (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -88,10 +88,14 @@ FixArrayDimension(const ResolveContext & context) : context( context ) {} - const ast::ArrayType * previsit (const ast::ArrayType * arrayType) { - if (!arrayType->dimension) return arrayType; - auto mutType = mutate(arrayType); + template< typename PtrType > + const PtrType * previsitImpl( const PtrType * type ) { + // Note: resolving dimension expressions seems to require duplicate logic, + // here and Resolver.cpp: handlePtrType + + if (!type->dimension) return type; + auto mutType = mutate(type); auto globalSizeType = context.global.sizeType; ast::ptr sizetype = globalSizeType ? globalSizeType : new ast::BasicType( ast::BasicKind::LongUnsignedInt ); - mutType->dimension = findSingleExpression(arrayType->dimension, sizetype, context ); + mutType->dimension = findSingleExpression(type->dimension, sizetype, context ); if (InitTweak::isConstExpr(mutType->dimension)) { @@ -102,4 +106,12 @@ } return mutType; + } + + const ast::ArrayType * previsit (const ast::ArrayType * arrayType) { + return previsitImpl( arrayType ); + } + + const ast::PointerType * previsit (const ast::PointerType * pointerType) { + return previsitImpl( pointerType ); } }; Index: src/ResolvExpr/Resolver.cpp =================================================================== --- src/ResolvExpr/Resolver.cpp (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ src/ResolvExpr/Resolver.cpp (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -494,4 +494,71 @@ } +// Returns a version of `ty`, with some detail redacted. +// `ty` is that of a parameter or return of `functionDecl`. +// Redaction: +// - concerns the dimension expression, when `ty` is a pointer or array +// - prevents escape of variables bound by other parameter declarations +// - replaces the whole dimension with `*` if it uses such a variable +// - produces the caller's view of `functionDecl`, where `ty` is from the callee/body's view +// Example 1 +// functionDecl: void f( int n, float a[][5][n + 1] ); +// outcome: f : void (*)( int , float [][5][*] ), redaction on deepest ArrayType +// Example 2 +// functionDecl: void f( int n, float a[n] ); +// outcome: f : void (*)( int , float [*] ), redaction on PointerType +// Example 3 +// in scope: int n; +// functionDecl: void f( float a[][n] ); +// outcome: f : void (*)( float [][n] ), no redaction +static const ast::Type * redactBoundDimExprs( + const ast::Type * ty, + const ast::FunctionDecl * functionDecl +); +struct UsesParams { + const ast::FunctionDecl * functionDecl; + UsesParams( const ast::FunctionDecl * functionDecl ) : functionDecl(functionDecl) {} + bool result = false; + void postvisit( const ast::VariableExpr * e ) { + for ( auto p : functionDecl->params ) { + if ( p.get() == e->var ) result = true; + } + } +}; +struct Redactor { + const ast::FunctionDecl * functionDecl; + Redactor( const ast::FunctionDecl * functionDecl ) : functionDecl(functionDecl) {} + template< typename PtrType > + const PtrType * postvisitImpl( const PtrType * type ) { + if ( type->dimension && ast::Pass::read( type->dimension.get(), functionDecl ) ) { + // PtrType * newtype = ast::shallowCopy( type ); + // newtype->dimension = nullptr; + // type = newtype; + auto mutType = mutate(type); + mutType->dimension = nullptr; + type = mutType; + } + return type; + } + + const ast::ArrayType * postvisit (const ast::ArrayType * arrayType) { + return postvisitImpl( arrayType ); + } + + const ast::PointerType * postvisit (const ast::PointerType * pointerType) { + return postvisitImpl( pointerType ); + } +}; +static const ast::Type * redactBoundDimExprs( + const ast::Type * ty, + const ast::FunctionDecl * functionDecl +) { + if ( ast::Pass::read( ty, functionDecl ) ) { + ast::Type * newty = ast::deepCopy( ty ); + ast::Pass visitor(functionDecl); + ty = newty->accept(visitor); + } + return ty; +} + const ast::FunctionDecl * Resolver::previsit( const ast::FunctionDecl * functionDecl ) { GuardValue( functionReturn ); @@ -534,9 +601,11 @@ param = fixObjectType(param.strict_as(), context); symtab.addId(param); - paramTypes.emplace_back(param->get_type()); + auto exportParamT = redactBoundDimExprs( param->get_type(), mutDecl ); + paramTypes.emplace_back( exportParamT ); } for (auto & ret : mutDecl->returns) { ret = fixObjectType(ret.strict_as(), context); - returnTypes.emplace_back(ret->get_type()); + auto exportRetT = redactBoundDimExprs( ret->get_type(), mutDecl ); + returnTypes.emplace_back( exportRetT ); } // since function type in decl is just a view of param types, need to update that as well @@ -699,4 +768,6 @@ template< typename PtrType > const PtrType * handlePtrType( const PtrType * type, const ResolveContext & context ) { + // Note: resolving dimension expressions seems to require duplicate logic, + // here and ResolveTypeof.cpp:fixArrayType. if ( type->dimension ) { const ast::Type * sizeType = context.global.sizeType.get(); @@ -704,5 +775,5 @@ assertf(dimension->env->empty(), "array dimension expr has nonempty env"); dimension.get_and_mutate()->env = nullptr; - ast::mutate_field( type, &PtrType::dimension, dimension ); + type = ast::mutate_field( type, &PtrType::dimension, dimension ); } return type; Index: src/ResolvExpr/Unify.cpp =================================================================== --- src/ResolvExpr/Unify.cpp (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ src/ResolvExpr/Unify.cpp (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -292,8 +292,14 @@ if ( !array2 ) return; - if ( array->isVarLen != array2->isVarLen ) return; - if ( (array->dimension != nullptr) != (array2->dimension != nullptr) ) return; - - if ( array->dimension ) { + // Permit cases where one side has a dimension or isVarLen, + // while the other side is the opposite. + // Acheves a wildcard-iterpretation semantics, where lack of + // dimension (`float a[]` or `float a[25][*]`) means + // "anything here is fine." + // Sole known case where a verbatim-match semantics is intended + // is typedef redefinition, for which extra checking is added + // in src/Validate/ReplaceTypedef.cpp. + + if ( array->dimension && array2->dimension ) { assert( array2->dimension ); // type unification calls expression unification (mutual recursion) Index: src/Validate/ReplaceTypedef.cpp =================================================================== --- src/Validate/ReplaceTypedef.cpp (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ src/Validate/ReplaceTypedef.cpp (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -120,5 +120,4 @@ } } - struct VarLenChecker : public ast::WithShortCircuiting { bool result = false; @@ -126,5 +125,27 @@ void previsit( ast::ArrayType const * at ) { result |= at->isVarLen; } }; - +static bool hasVarLen( const ast::Type * t ) { + return ast::Pass::read( t ); +} +struct ArrayTypeExtractor { + std::vector result; + void postvisit( const ast::ArrayType * at ) { + result.push_back( at ); + } +}; +static bool dimensionPresenceMismatched( const ast::Type * t0, const ast::Type * t1) { + std::vector at0s = std::move( + ast::Pass::read( t0 ) ); + std::vector at1s = std::move( + ast::Pass::read( t1 ) ); + assert( at0s.size() == at1s.size() ); + for (size_t i = 0; i < at0s.size(); i++) { + const ast::ArrayType * at0 = at0s[i]; + const ast::ArrayType * at1 = at1s[i]; + assert( ResolvExpr::typesCompatible( at0, at1 ) ); + if ( (at0->dimension != nullptr) != (at1->dimension != nullptr) ) return true; + } + return false; +} ast::Decl const * ReplaceTypedefCore::postvisit( ast::TypedefDecl const * decl ) { @@ -133,4 +154,5 @@ ast::Type const * t0 = decl->base; ast::Type const * t1 = typedefNames[ decl->name ].first->base; + // [hasVarLen] // Cannot redefine VLA typedefs. Note: this is slightly incorrect, // because our notion of VLAs at this point in the translator is @@ -139,7 +161,17 @@ // constant/enumerator. The effort required to fix this corner case // likely outweighs the utility of allowing it. + // [dimensionPresenceMismatched] + // Core typesCompatible logic interprets absent dimensions as wildcards, + // i.e. float[][*] matches float[][42]. + // For detecting incompatible typedefs, we have to interpret them verbatim, + // i.e. float[] is different than float[42]. + // But typesCompatible does assure that the pair of types is structurally + // consistent, outside of the dimension expressions. This assurance guards + // the dimension-presence traversal. So this traversal logic can (and does) + // assume that ArrayTypes will be encountered in analogous places. if ( !ResolvExpr::typesCompatible( t0, t1 ) - || ast::Pass::read( t0 ) - || ast::Pass::read( t1 ) ) { + || hasVarLen( t0 ) + || hasVarLen( t1 ) + || dimensionPresenceMismatched( t0, t1 ) ) { SemanticError( decl->location, "Cannot redefine typedef %s", decl->name.c_str() ); } Index: tests/.expect/array-ERR1.txt =================================================================== --- tests/.expect/array-ERR1.txt (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/.expect/array-ERR1.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -1,3 +1,3 @@ -array.cfa:119:25: warning: Preprocessor started +array.cfa:125:25: warning: Preprocessor started array.cfa:40:22: error: '[*]' not allowed in other than function prototype scope array.cfa:46:24: error: '[*]' not allowed in other than function prototype scope @@ -5,2 +5,4 @@ array.cfa:52:16: error: array size missing in '_X2a1A0i_2' array.cfa:53:26: error: '[*]' not allowed in other than function prototype scope +array.cfa: At top level: +array.cfa:64:1: error: '[*]' not allowed in other than function prototype scope Index: tests/.expect/array-ERR2.txt =================================================================== --- tests/.expect/array-ERR2.txt (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/.expect/array-ERR2.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -1,2 +1,2 @@ -array.cfa:119:25: warning: Preprocessor started -array.cfa:109:32: error: syntax error, unexpected STATIC before token "static" +array.cfa:125:25: warning: Preprocessor started +array.cfa:117:32: error: syntax error, unexpected STATIC before token "static" Index: tests/.expect/array-ERR3.txt =================================================================== --- tests/.expect/array-ERR3.txt (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/.expect/array-ERR3.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -1,2 +1,2 @@ -array.cfa:119:25: warning: Preprocessor started -array.cfa:110:32: error: syntax error, unexpected ']' before token "]" +array.cfa:125:25: warning: Preprocessor started +array.cfa:118:32: error: syntax error, unexpected ']' before token "]" Index: tests/.expect/array.txt =================================================================== --- tests/.expect/array.txt (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/.expect/array.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -1,1 +1,1 @@ -array.cfa:119:25: warning: Preprocessor started +array.cfa:125:25: warning: Preprocessor started Index: tests/.expect/functions.arm64.txt =================================================================== --- tests/.expect/functions.arm64.txt (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/.expect/functions.arm64.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -310,6 +310,6 @@ __attribute__ ((unused)) const struct _conc__tuple2_3 _X10_retval_f5KT2PiKi_1; } -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(void), signed int *(*__anonymous_object43)(void), signed int **(*__anonymous_object44)(void), signed int *const *(*__anonymous_object45)(void), signed int *const *const (*__anonymous_object46)(void), signed int *__anonymous_object47, signed int __anonymous_object48[10], signed int **__anonymous_object49, signed int *__anonymous_object50[10], signed int ***__anonymous_object51, signed int **__anonymous_object52[10], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[10], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[10]); -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(void), __attribute__ ((unused)) signed int *(*__anonymous_object58)(void), __attribute__ ((unused)) signed int **(*__anonymous_object59)(void), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(void), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(void), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[10], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[10], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[10], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[10], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[10]){ +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(void), signed int *(*__anonymous_object43)(void), signed int **(*__anonymous_object44)(void), signed int *const *(*__anonymous_object45)(void), signed int *const *const (*__anonymous_object46)(void), signed int *__anonymous_object47, signed int __anonymous_object48[((unsigned long int )10)], signed int **__anonymous_object49, signed int *__anonymous_object50[((unsigned long int )10)], signed int ***__anonymous_object51, signed int **__anonymous_object52[((unsigned long int )10)], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[((unsigned long int )10)], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[((unsigned long int )10)]); +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(void), __attribute__ ((unused)) signed int *(*__anonymous_object58)(void), __attribute__ ((unused)) signed int **(*__anonymous_object59)(void), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(void), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(void), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[((unsigned long int )10)], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[((unsigned long int )10)], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[((unsigned long int )10)], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[((unsigned long int )10)], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[((unsigned long int )10)]){ __attribute__ ((unused)) signed int _X9_retval_fi_1; } Index: tests/.expect/functions.x64.txt =================================================================== --- tests/.expect/functions.x64.txt (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/.expect/functions.x64.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -310,6 +310,6 @@ __attribute__ ((unused)) const struct _conc__tuple2_3 _X10_retval_f5KT2PiKi_1; } -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(void), signed int *(*__anonymous_object43)(void), signed int **(*__anonymous_object44)(void), signed int *const *(*__anonymous_object45)(void), signed int *const *const (*__anonymous_object46)(void), signed int *__anonymous_object47, signed int __anonymous_object48[10], signed int **__anonymous_object49, signed int *__anonymous_object50[10], signed int ***__anonymous_object51, signed int **__anonymous_object52[10], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[10], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[10]); -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(void), __attribute__ ((unused)) signed int *(*__anonymous_object58)(void), __attribute__ ((unused)) signed int **(*__anonymous_object59)(void), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(void), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(void), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[10], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[10], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[10], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[10], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[10]){ +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(void), signed int *(*__anonymous_object43)(void), signed int **(*__anonymous_object44)(void), signed int *const *(*__anonymous_object45)(void), signed int *const *const (*__anonymous_object46)(void), signed int *__anonymous_object47, signed int __anonymous_object48[((unsigned long int )10)], signed int **__anonymous_object49, signed int *__anonymous_object50[((unsigned long int )10)], signed int ***__anonymous_object51, signed int **__anonymous_object52[((unsigned long int )10)], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[((unsigned long int )10)], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[((unsigned long int )10)]); +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(void), __attribute__ ((unused)) signed int *(*__anonymous_object58)(void), __attribute__ ((unused)) signed int **(*__anonymous_object59)(void), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(void), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(void), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[((unsigned long int )10)], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[((unsigned long int )10)], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[((unsigned long int )10)], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[((unsigned long int )10)], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[((unsigned long int )10)]){ __attribute__ ((unused)) signed int _X9_retval_fi_1; } Index: tests/.expect/functions.x86.txt =================================================================== --- tests/.expect/functions.x86.txt (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/.expect/functions.x86.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -310,6 +310,6 @@ __attribute__ ((unused)) const struct _conc__tuple2_3 _X10_retval_f5KT2PiKi_1; } -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(void), signed int *(*__anonymous_object43)(void), signed int **(*__anonymous_object44)(void), signed int *const *(*__anonymous_object45)(void), signed int *const *const (*__anonymous_object46)(void), signed int *__anonymous_object47, signed int __anonymous_object48[10], signed int **__anonymous_object49, signed int *__anonymous_object50[10], signed int ***__anonymous_object51, signed int **__anonymous_object52[10], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[10], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[10]); -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(void), __attribute__ ((unused)) signed int *(*__anonymous_object58)(void), __attribute__ ((unused)) signed int **(*__anonymous_object59)(void), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(void), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(void), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[10], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[10], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[10], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[10], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[10]){ +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(void), signed int *(*__anonymous_object43)(void), signed int **(*__anonymous_object44)(void), signed int *const *(*__anonymous_object45)(void), signed int *const *const (*__anonymous_object46)(void), signed int *__anonymous_object47, signed int __anonymous_object48[((unsigned long int )10)], signed int **__anonymous_object49, signed int *__anonymous_object50[((unsigned long int )10)], signed int ***__anonymous_object51, signed int **__anonymous_object52[((unsigned long int )10)], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[((unsigned long int )10)], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[((unsigned long int )10)]); +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(void), __attribute__ ((unused)) signed int *(*__anonymous_object58)(void), __attribute__ ((unused)) signed int **(*__anonymous_object59)(void), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(void), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(void), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[((unsigned long int )10)], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[((unsigned long int )10)], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[((unsigned long int )10)], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[((unsigned long int )10)], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[((unsigned long int )10)]){ __attribute__ ((unused)) signed int _X9_retval_fi_1; } Index: tests/.expect/tuplearray.txt =================================================================== --- tests/.expect/tuplearray.txt (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/.expect/tuplearray.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -9,2 +9,12 @@ 1, 2 1, 2 +2, 4 +2, 4 +2, 4 +2, 4 +2, 4 +2, 4 +2, 4 +2, 4 +2, 4 +2, 4 Index: tests/.expect/typedefRedef-ERR1.txt =================================================================== --- tests/.expect/typedefRedef-ERR1.txt (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/.expect/typedefRedef-ERR1.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -1,4 +1,6 @@ -typedefRedef.cfa:75:25: warning: Compiled +typedefRedef.cfa:87:25: warning: Compiled typedefRedef.cfa:4:1 error: Cannot redefine typedef Foo typedefRedef.cfa:31:1 error: Cannot redefine typedef ARR -typedefRedef.cfa:65:1 error: Cannot redefine typedef ARR +typedefRedef.cfa:37:1 error: Cannot redefine typedef ARRSa +typedefRedef.cfa:43:1 error: Cannot redefine typedef ARRSb +typedefRedef.cfa:77:1 error: Cannot redefine typedef ARR Index: tests/.expect/typedefRedef.txt =================================================================== --- tests/.expect/typedefRedef.txt (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/.expect/typedefRedef.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -1,1 +1,1 @@ -typedefRedef.cfa:75:25: warning: Compiled +typedefRedef.cfa:87:25: warning: Compiled Index: tests/array-collections/.expect/c-dependent.txt =================================================================== --- tests/array-collections/.expect/c-dependent.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) +++ tests/array-collections/.expect/c-dependent.txt (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -0,0 +1,5 @@ +bound_ptr_allow 999: 1.1 1.2 1.3 +bound_ar_allow 41: +1.1 1.2 1.3 +2.1 2.2 2.3 +3.1 3.2 3.3 Index: tests/array-collections/c-dependent.cfa =================================================================== --- tests/array-collections/c-dependent.cfa (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) +++ tests/array-collections/c-dependent.cfa (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -0,0 +1,36 @@ +void iota1( int n, float * a, float base ) { + for (i; n) { + a[i] = base + 0.1f * (float)(i + 1); + } +} + +void f__bound_ptr_allow( int n, float a[n] ) { + printf( "bound_ptr_allow %d: %.1f %.1f %.1f\n", n, a[0], a[1], a[2] ); +} +void bound_ptr_allow() { + float a[42]; + iota1( 42, a, 1.0 ); + f__bound_ptr_allow( 999, a ); +} + +void f__bound_ar_allow( int n, float a[][n + 1] ) { + printf( "bound_ar_allow %d:\n", n ); + printf( "%.1f %.1f %.1f\n", a[0][0], a[0][1], a[0][2] ); + printf( "%.1f %.1f %.1f\n", a[1][0], a[1][1], a[1][2] ); + printf( "%.1f %.1f %.1f\n", a[2][0], a[2][1], a[2][2] ); +} +void bound_ar_allow() { + float a[3][42]; + iota1( 42, a[0], 1.0 ); + iota1( 42, a[1], 2.0 ); + iota1( 42, a[2], 3.0 ); + f__bound_ar_allow( 41, a ); +} + + +int main() { + bound_ptr_allow(); + bound_ar_allow(); + + return 0; +} Index: tests/array.cfa =================================================================== --- tests/array.cfa (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/array.cfa (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -57,4 +57,12 @@ } + int fred2(int n, + int a1[], +E1( int a2[*], ) + int a4[3], + int T[3], + int a5[n] + ) {} + int mary( int T[3], // same as: int *T int p1[const 3], // same as: int const *p1 @@ -110,8 +118,6 @@ E3( int fm4( int r, int c, int m[][] ); ) // m's immediate element type is incomplete int fm5x( int, int, int[*][*] ); // same as fm1 decl - #ifndef __cforall - int fm5y( int r, int c, int m[r][c] ) {} // BUG 276: CFA chokes but should accept - // C: same as fm1 defn - #endif + int fm5y( int r, int c, int m[r][c] ) {} // same as fm1 defn + Index: tests/tuplearray.cfa =================================================================== --- tests/tuplearray.cfa (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/tuplearray.cfa (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -20,7 +20,9 @@ [void] bar12( * [3][10] [int,int] f ); -//[void] foo( size_t size, [size] [int,int] f ) { -[void] foo( size_t size, [10] [int,int] f ) { - for ( i; size ) f[i] = [1, 2]; +[void] foo1( [10] [int,int] f ) { + for ( i; 10 ) f[i] = [1, 2]; +} +[void] foo2( size_t size, [size] [int,int] f ) { + for ( i; size ) f[i] = [2, 4]; } @@ -29,5 +31,8 @@ // [int,int] arr[10]; // unimplemented - foo( 10, arr ); + foo1( arr ); + for ( i; 10 ) sout | arr[i]; + + foo2( 10, arr ); for ( i; 10 ) sout | arr[i]; } Index: tests/typedefRedef.cfa =================================================================== --- tests/typedefRedef.cfa (revision f5e37a4c897469da283b15ac1ff5c92b0e2aa1d1) +++ tests/typedefRedef.cfa (revision 81e768d1c7e5b625cf5e14ca13ea80c649602ad5) @@ -30,4 +30,16 @@ // if a typedef has an array dimension, it can only be redefined to the same dimension typedef int ARR[2]; +#endif + +typedef [ float[], char[], int[] ] ARRSa; +typedef [ float[], char[], int[] ] ARRSa; +#ifdef ERR1 +typedef [ float[], char[2], int[] ] ARRSa; +#endif + +typedef int ARRSb[][1][2][3]; +typedef int ARRSb[][1][2][3]; +#ifdef ERR1 +typedef int ARRSb[][1][2][99]; #endif