Changes in / [0a73148:6b8b767]

Location:

src

Files:

• Common/SemanticError.h (modified) (2 diffs)
• Parser/DeclarationNode.cc (modified) (1 diff)
• Parser/TypedefTable.cc (modified) (1 diff)
• Parser/parser.yy (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• ResolvExpr/CommonType.cc (modified) (2 diffs)
• SymTab/FixFunction.cc (modified) (2 diffs)
• libcfa/bits/defs.h (modified) (1 diff)
• libcfa/concurrency/invoke.h (modified) (2 diffs)
• libcfa/concurrency/monitor (modified) (1 diff)
• libcfa/containers/result (modified) (1 diff)
• libcfa/interpose.c (modified) (2 diffs)

src/Common/SemanticError.h

@@ -56 +56 @@
         {"reference-conversion"   , "rvalue to reference conversion of rvalue: %s" , Severity::Warn},
         {"qualifiers-zero_t-one_t", "questionable use of type qualifier %s with %s", Severity::Warn},
-        {"aggregate-forward-decl" , "forward declaration of nested aggregate: %s"  , Severity::Warn},
 };
 
@@ -63 +62 @@
         RvalueToReferenceConversion,
         BadQualifiersZeroOne,
-        AggrForwardDecl,
         NUMBER_OF_WARNINGS, //This MUST be the last warning
 };

src/Parser/DeclarationNode.cc

@@ -1003 +1003 @@
                                 // };
                                 if ( ! (extracted && decl->name == "" && ! anon) ) {
-                                        if (decl->name == "") {
-                                                if ( DeclarationWithType * dwt = dynamic_cast<DeclarationWithType *>( decl ) ) {
-                                                        if ( ReferenceToType * aggr = dynamic_cast<ReferenceToType *>( dwt->get_type() ) ) {
-                                                                if ( aggr->name.find("anonymous") == std::string::npos ) {
-                                                                        bool isInline = false;
-                                                                        if (cur->type->kind == TypeData::Aggregate || cur->type->kind == TypeData::AggregateInst) {
-                                                                                if (cur->type->kind == TypeData::Aggregate) {
-                                                                                        isInline = cur->type->aggregate.inLine;
-                                                                                } else {
-                                                                                        isInline = cur->type->aggInst.inLine;
-                                                                                        if ( TypeData * aggr = cur->type->aggInst.aggregate ) {
-                                                                                                if ( aggr->kind == TypeData::Aggregate ) {
-                                                                                                        isInline = isInline || aggr->aggregate.inLine;
-                                                                                                }
-                                                                                        }
-                                                                                }
-                                                                        }
-                                                                        if (! isInline) {
-                                                                                // temporary: warn about anonymous member declarations of named types, since this conflicts with the syntax for the forward declaration of an anonymous type
-                                                                                SemanticWarning( cur->location, Warning::AggrForwardDecl, aggr->name.c_str() );
-                                                                        }
-                                                                }
-                                                        }
-                                                }
-                                        }
                                         decl->location = cur->location;
                                         * out++ = decl;

src/Parser/TypedefTable.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypedefTable.cc --
+// TypedefTable.cc -- 
 //
 // Author           : Peter A. Buhr
 // Created On       : Sat May 16 15:20:13 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 13 18:35:54 2018
-// Update Count     : 257
+// Last Modified On : Thu Jul 12 16:16:24 2018
+// Update Count     : 256
 //
 

src/Parser/parser.yy

@@ -2307 +2307 @@
                 { $$ = new ExpressionNode( new TypeExpr( maybeMoveBuildType( $1 ) ) ); }
         | assignment_expression
-                { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $1->build()) ); $$ = nullptr; }
         | type_list ',' type
                 { $$ = (ExpressionNode *)( $1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) ) ); }
         | type_list ',' assignment_expression
-                { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $3->build()) ); $$ = nullptr; }
-                // { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
+                { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
         ;
 

src/ResolvExpr/AlternativeFinder.cc

@@ -482 +482 @@
         template< typename ForwardIterator, typename OutputIterator >
         void inferRecursive( ForwardIterator begin, ForwardIterator end, const Alternative &newAlt, OpenVarSet &openVars, const SymTab::Indexer &decls, const AssertionSet &newNeed, int level, const SymTab::Indexer &indexer, OutputIterator out ) {
-                if ( newAlt.cost == Cost::infinity ) return; // don't proceed down this dead end
                 if ( begin == end ) {
                         if ( newNeed.empty() ) {
@@ -1186 +1185 @@
                                 std::cerr << "bindings are:" << std::endl;
                                 withFunc.env.print( std::cerr, 8 );
-                                std::cerr << "cost is: " << withFunc.cost << std::endl;
                                 std::cerr << "cost of conversion is:" << cvtCost << std::endl;
                         )

src/ResolvExpr/CommonType.cc

@@ -267 +267 @@
                                                 result = otherPointer->clone();
                                         } // if
-                                        strict_dynamic_cast<PointerType*>(result)->base->get_qualifiers() = tq1 | tq2;
+                                        result->get_qualifiers() = tq1 | tq2;
                                 } else {
                                         /// std::cerr << "place for ptr-to-type" << std::endl;
@@ -304 +304 @@
                                                 result = otherRef->clone();
                                         } // if
-                                        strict_dynamic_cast<ReferenceType*>(result)->base->get_qualifiers() = tq1 | tq2;
+                                        result->get_qualifiers() = tq1 | tq2;
                                 } else {
                                         /// std::cerr << "place for ptr-to-type" << std::endl;

src/SymTab/FixFunction.cc

@@ -30 +30 @@
                 // can't delete function type because it may contain assertions, so transfer ownership to new object
                 ObjectDecl *pointer = new ObjectDecl( functionDecl->name, functionDecl->get_storageClasses(), functionDecl->linkage, nullptr, new PointerType( Type::Qualifiers(), functionDecl->type ), nullptr, functionDecl->attributes );
-                pointer->location = functionDecl->location;
                 functionDecl->attributes.clear();
                 functionDecl->type = nullptr;
@@ -44 +43 @@
                 // need to recursively mutate the base type in order for multi-dimensional arrays to work.
                 PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base, arrayType->dimension, arrayType->isVarLen, arrayType->isStatic );
-                pointerType->location = arrayType->location;
                 arrayType->base = nullptr;
                 arrayType->dimension = nullptr;

src/libcfa/bits/defs.h

@@ -28 +28 @@
 
 #ifdef __cforall
-#define __cfa_anonymous_object(x) inline struct x
+#define __cfa_anonymous_object
 #else
-#define __cfa_anonymous_object(x) x __cfa_anonymous_object
+#define __cfa_anonymous_object __cfa_anonymous_object
 #endif
 

src/libcfa/concurrency/invoke.h

@@ -93 +93 @@
 
                 // list of acceptable functions, null if any
-                __cfa_anonymous_object( __small_array_t(struct __acceptable_t) );
+                __small_array_t(struct __acceptable_t) __cfa_anonymous_object;
         };
 
@@ -121 +121 @@
         struct __monitor_group_t {
                 // currently held monitors
-                __cfa_anonymous_object( __small_array_t(monitor_desc*) );
+                __small_array_t(monitor_desc*) __cfa_anonymous_object;
 
                 // last function that acquired monitors

src/libcfa/concurrency/monitor

@@ -138 +138 @@
 
 struct __acceptable_t {
-        inline struct __monitor_group_t;
+        __monitor_group_t;
         bool is_dtor;
 };

src/libcfa/containers/result

@@ -28 +28 @@
 struct result {
         bool has_value;
-        inline union inner_result(T, E);
+        inner_result(T, E);
 };
 

src/libcfa/interpose.c

@@ -33 +33 @@
 // Interposing helpers
 //=============================================================================================
-
-void preload_libgcc(void) {
-        dlopen( "libgcc_s.so.1", RTLD_NOW );
-        if ( const char * error = dlerror() ) abort( "interpose_symbol : internal error pre-loading libgcc, %s\n", error );
-}
 
 typedef void (* generic_fptr_t)(void);
@@ -97 +92 @@
                 const char *version = NULL;
 
-                preload_libgcc();
-
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"