avoid warning attributes on mixing inline and noinline in MicroLock

yfeldblum · facebook-github-bot · commit 9c6d511ae990 · 2025-04-05T12:39:32.000-07:00
Summary:
```
In file included from folly/MicroLock.cpp:17:
folly/MicroLock.h:211:45: error: inline declaration of 'void folly::MicroLockCore::store(uint8_t, std::memory_order)' follows declaration with attribute 'noinline' [-Werror=attributes]
  211 |     uint8_t value, std::memory_order order) noexcept {
      |                                             ^~~~~~~~
folly/MicroLock.h:175:33: note: previous declaration of 'void folly::MicroLockCore::store(uint8_t, std::memory_order)' here
  175 |   FOLLY_DISABLE_SANITIZERS void store(
      |                                 ^~~~~
```

Reviewed By: dmm-fb

Differential Revision: D72512858

fbshipit-source-id: 629dc9e9b3b1d6593b0a2453ce66a9ef6f93664a
diff --git a/folly/MicroLock.h b/folly/MicroLock.h
@@ -21,6 +21,7 @@
 #include <cstdint>
 #include <utility>
 
+#include <folly/CPortability.h>
 #include <folly/Optional.h>
 #include <folly/Portability.h>
 #include <folly/detail/Futex.h>
@@ -207,6 +208,8 @@ inline unsigned MicroLockCore::waitBit() const noexcept {
   return 1U << (baseShift() + 1);
 }
 
+FOLLY_PUSH_WARNING
+FOLLY_GCC_DISABLE_WARNING("-Wattributes") // inline + [[gnu::noinline]]
 inline void MicroLockCore::store(
     uint8_t value, std::memory_order order) noexcept {
   detail::Futex<>* wordPtr = word();
@@ -221,6 +224,7 @@ inline void MicroLockCore::store(
     }
   }
 }
+FOLLY_POP_WARNING
 
 template <typename Func>
 void MicroLockCore::unlockAndStoreWithModifier(Func modifier) noexcept {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`#include <cstdint>`
`22`	`22`	`#include <utility>`
`23`	`23`
	`24`	`+#include <folly/CPortability.h>`
`24`	`25`	`#include <folly/Optional.h>`
`25`	`26`	`#include <folly/Portability.h>`
`26`	`27`	`#include <folly/detail/Futex.h>`
`@@ -207,6 +208,8 @@ inline unsigned MicroLockCore::waitBit() const noexcept {`
`207`	`208`	`return 1U << (baseShift() + 1);`
`208`	`209`	`}`
`209`	`210`
	`211`	`+FOLLY_PUSH_WARNING`
	`212`	`+FOLLY_GCC_DISABLE_WARNING("-Wattributes") // inline + [[gnu::noinline]]`
`210`	`213`	`inline void MicroLockCore::store(`
`211`	`214`	`uint8_t value, std::memory_order order) noexcept {`
`212`	`215`	`detail::Futex<>* wordPtr = word();`
`@@ -221,6 +224,7 @@ inline void MicroLockCore::store(`
`221`	`224`	`}`
`222`	`225`	`}`
`223`	`226`	`}`
	`227`	`+FOLLY_POP_WARNING`
`224`	`228`
`225`	`229`	`template <typename Func>`
`226`	`230`	`void MicroLockCore::unlockAndStoreWithModifier(Func modifier) noexcept {`