Changeset b1e63ac5 for src/Concurrency/Keywords.cc

Timestamp:

Jul 4, 2017, 9:40:16 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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 references

File:

• src/Concurrency/Keywords.cc (modified) (4 diffs)

src/Concurrency/Keywords.cc

@@ -65 +65 @@
                 FunctionDecl * forwardDeclare( StructDecl * );
                 ObjectDecl * addField( StructDecl * );
-                void addRoutines( StructDecl *, ObjectDecl *, FunctionDecl * );
+                void addRoutines( ObjectDecl *, FunctionDecl * );
 
                 virtual bool is_target( StructDecl * decl ) = 0;
@@ -247 +247 @@
         void ConcurrentSueKeyword::visit(StructDecl * decl) {
                 Visitor::visit(decl);
-                if( decl->get_name() == type_name ) {
+                if( decl->get_name() == type_name && decl->has_body() ) {
                         assert( !type_decl );
                         type_decl = decl;
@@ -264 +264 @@
                 FunctionDecl * func = forwardDeclare( decl );
                 ObjectDecl * field = addField( decl );
-                addRoutines( decl, field, func );
+                addRoutines( field, func );
         }
 
@@ -359 +359 @@
         }
 
-        void ConcurrentSueKeyword::addRoutines( StructDecl * decl, ObjectDecl * field, FunctionDecl * func ) {
+        void ConcurrentSueKeyword::addRoutines( ObjectDecl * field, FunctionDecl * func ) {
                 CompoundStmt * statement = new CompoundStmt( noLabels );
                 statement->push_back(