Changeset 1dcd52a3

Timestamp:

Feb 9, 2018, 11:59:35 AM (6 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:

7a052e34

Parents:

538334a

git-author:

Rob Schluntz <rschlunt@…> (02/09/18 11:44:40)

git-committer:

Rob Schluntz <rschlunt@…> (02/09/18 11:59:35)

Message:

Disregard outermost const, volatile, _Atomic qualifiers on parameters when unifying function types [fixes #48]

Location:

src

Files:

• ResolvExpr/Unify.cc (modified) (1 diff)
• tests/tuple/tupleVariadic.c (modified) (2 diffs)

src/ResolvExpr/Unify.cc

@@ -563 +563 @@
                         flatten( dcl->get_type(), back_inserter( types ) );
                         for ( Type * t : types ) {
+                                // outermost const, volatile, _Atomic qualifiers in parameters should not play a role in the unification of function types, since they do not determine whether a function is callable.
+                                // Note: MUST consider at least mutex qualifier, since functions can be overloaded on outermost mutex and a mutex function has different requirements than a non-mutex function.
+                                t->get_qualifiers() -= Type::Qualifiers(Type::Const | Type::Volatile | Type::Atomic);
+
                                 dst.push_back( new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::C, nullptr, t, nullptr ) );
                         }

src/tests/tuple/tupleVariadic.c

@@ -95 +95 @@
 }
 
+forall(ttype T | { void foo(T); }) void bar(T x) {}
+void foo(int) {}
+
 int main() {
         array * x0 = new();
@@ -117 +120 @@
         func(3, 2.0, 111, 4.145);
         printf("finished func\n");
+
+        {
+                // T = [const int] -- this ensures that void(*)(int) satisfies void(*)(const int)
+                const int x;
+                bar(x);
+        }
 }