fix attributes

metagn · Oct 31, 2024 · 55bd35b · 55bd35b
1 parent 788c65a
commit 55bd35b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/compiler/cbuilderdecls.nim b/compiler/cbuilderdecls.nim
@@ -459,7 +459,7 @@ template addProcParams(builder: var Builder, params: out ProcParamBuilder, body:
   body
   finishProcParamBuilder(builder, params)
 
-proc addProcHeader(builder: var Builder, m: BModule, prc: PSym, name: string, params, rettype: Snippet) =
+proc addProcHeader(builder: var Builder, m: BModule, prc: PSym, name: string, params, rettype: Snippet, addAttributes: bool) =
   # on nifc should build something like (proc name params type pragmas
   # with no body given
   let noreturn = isNoReturn(m, prc)
@@ -474,10 +474,11 @@ proc addProcHeader(builder: var Builder, m: BModule, prc: PSym, name: string, pa
   builder.add(name)
   builder.add(")")
   builder.add(params)
-  if sfPure in prc.flags and hasAttribute in extccomp.CC[m.config.cCompiler].props:
-    builder.add(" __attribute__((naked))")
-  if noreturn and hasAttribute in extccomp.CC[m.config.cCompiler].props:
-    builder.add(" __attribute__((noreturn))")
+  if addAttributes:
+    if sfPure in prc.flags and hasAttribute in extccomp.CC[m.config.cCompiler].props:
+      builder.add(" __attribute__((naked))")
+    if noreturn and hasAttribute in extccomp.CC[m.config.cCompiler].props:
+      builder.add(" __attribute__((noreturn))")
 
 proc finishProcHeaderAsProto(builder: var Builder) =
   builder.add(";\n")

diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim
@@ -1209,7 +1209,7 @@ proc genMemberProcHeader(m: BModule; prc: PSym; result: var Rope; asPtr: bool =
         [rope(CallingConvToStr[prc.typ.callConv]), asPtrStr, rettype, name,
         params, fnConst, override, superCall])
 
-proc genProcHeader(m: BModule; prc: PSym; result: var Rope; visibility: var DeclVisibility, asPtr: bool = false) =
+proc genProcHeader(m: BModule; prc: PSym; result: var Rope; visibility: var DeclVisibility, asPtr: bool, addAttributes: bool) =
   # using static is needed for inline procs
   var check = initIntSet()
   fillBackendName(m, prc)
@@ -1242,7 +1242,7 @@ proc genProcHeader(m: BModule; prc: PSym; result: var Rope; visibility: var Decl
     if asPtr:
       result.addProcVar(m, prc, name, params, rettype, isStatic = isStaticVar)
     else:
-      result.addProcHeader(m, prc, name, params, rettype)
+      result.addProcHeader(m, prc, name, params, rettype, addAttributes)
   else:
     let asPtrStr = if asPtr: (rope("(*") & name & ")") else: name
     result.add runtimeFormat(prc.cgDeclFrmt, [rettype, asPtrStr, params])

diff --git a/compiler/cgen.nim b/compiler/cgen.nim
@@ -1207,7 +1207,7 @@ proc genProcAux*(m: BModule, prc: PSym) =
   if isCppMember:
     genMemberProcHeader(m, prc, header)
   else:
-    genProcHeader(m, prc, header, visibility)
+    genProcHeader(m, prc, header, visibility, asPtr = false, addAttributes = false)
   var returnStmt: Rope = ""
   assert(prc.ast != nil)
 
@@ -1357,7 +1357,7 @@ proc genProcPrototype(m: BModule, sym: PSym) =
     let asPtr = isReloadable(m, sym)
     var header = newRopeAppender()
     var visibility: DeclVisibility = None
-    genProcHeader(m, sym, header, visibility, asPtr)
+    genProcHeader(m, sym, header, visibility, asPtr = asPtr, addAttributes = true)
     if asPtr:
       # genProcHeader would give variable declaration, add it directly
       m.s[cfsProcHeaders].add(header)