[libc][hdrgen] Fix hdrgen when using macros as guards in stdlib.yaml.

[bassiounix]

No description provided.

[bassiounix]

• [libc][hdrgen] Fix hdrgen when using macros as guards in stdlib.yaml. #152732 👈 (View in Graphite)
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[llvmbot]

@llvm/pr-subscribers-libc

Author: Muhammad Bassiouni (bassiounix)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/152732.diff

1 Files Affected:

• (modified) libc/utils/hdrgen/hdrgen/header.py (+3-2)

diff --git a/libc/utils/hdrgen/hdrgen/header.py b/libc/utils/hdrgen/hdrgen/header.py
index b054ed4e03bd0..2118db6e5fb75 100644
--- a/libc/utils/hdrgen/hdrgen/header.py
+++ b/libc/utils/hdrgen/hdrgen/header.py
@@ -204,7 +204,7 @@ def relpath(file):
 
         current_guard = None
         for function in self.functions:
-            if function.guard == None:
+            if function.guard == None and current_guard == None:
                 content.append(str(function) + " __NOEXCEPT;")
                 content.append("")
             else:
@@ -221,7 +221,8 @@ def relpath(file):
                     content.append(f"#endif // {current_guard}")
                     content.append("")
                     current_guard = function.guard
-                    content.append(f"#ifdef {current_guard}")
+                    if current_guard is not None:
+                        content.append(f"#ifdef {current_guard}")
                     content.append(str(function) + " __NOEXCEPT;")
                     content.append("")
         if current_guard != None:

[bassiounix]

Merge activity

• Aug 8, 3:37 PM UTC: A user started a stack merge that includes this pull request via Graphite.
• Aug 8, 3:39 PM UTC: @bassiounix merged this pull request with Graphite.

[lntue]

LGTM