fix Issue 21967 - importC: Error function without 'this' cannot be 'c…

…onst'
dlang · May 26, 2021 · 9cff437 · 9cff437
1 parent c4f4306
commit 9cff437
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/dmd/cparse.d b/src/dmd/cparse.d
@@ -1426,7 +1426,14 @@ final class CParser(AST) : Parser!AST
                 break;          // error recovery
             }
             if (specifier.mod & MOD.xconst)
-                dt = dt.addSTC(STC.const_);
+            {
+                // `const` is always applied to the return type, not the
+                // type function itself.
+                if (auto tf = dt.isTypeFunction())
+                    tf.next = tf.next.addSTC(STC.const_);
+                else
+                    dt = dt.addSTC(STC.const_);
+            }
 
             if (!id)    // no identifier
             {

diff --git a/test/compilable/imports/cstuff1.c b/test/compilable/imports/cstuff1.c
@@ -334,6 +334,10 @@ typedef enum {
 } TypedefEnum;
 TypedefEnum typedef_var2;
 
+/********************************/
+// https://issues.dlang.org/show_bug.cgi?id=21967
+const int const_int_fn(void);
+const int *const_int_fn_ptr(void);
 
 /********************************/