Changeset 83a071f9 for src/Concurrency/Keywords.cc

Timestamp:

Aug 11, 2017, 10:10:26 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:

fd344aa

Parents:

8499c707

Message:

Fix concurrency library, tests, and keywords for references

File:

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

src/Concurrency/Keywords.cc

@@ -291 +291 @@
                         LinkageSpec::Cforall,
                         nullptr,
-                        new PointerType(
+                        new ReferenceType(
                                 noQualifiers,
                                 new StructInstType(
@@ -447 +447 @@
 
                 //Makes sure it's not a copy
-                PointerType* pty = dynamic_cast< PointerType * >( ty );
                 ReferenceType* rty = dynamic_cast< ReferenceType * >( ty );
-                if( ! pty && ! rty ) throw SemanticError( "Mutex argument must be of pointer/reference type ", arg );
+                if( ! rty ) throw SemanticError( "Mutex argument must be of reference type ", arg );
 
                 //Make sure the we are pointing directly to a type
-                Type* base = pty ? pty->get_base() : rty->get_base();
-                if(  dynamic_cast< PointerType * >( base ) ) throw SemanticError( "Mutex argument have exactly one level of indirection ", arg );
+                Type* base = rty->get_base();
+                if( dynamic_cast< ReferenceType * >( base ) ) throw SemanticError( "Mutex argument have exactly one level of indirection ", arg );
+                if( dynamic_cast< PointerType * >( base ) ) throw SemanticError( "Mutex argument have exactly one level of indirection ", arg );
 
                 //Make sure that typed isn't mutex