Merge pull request #18188 from acozzette/28-fix

Cherry-pick: Fix compiler error with `StrongReferenceToType()`
protocolbuffers · Sep 9, 2024 · 5b4b3af · 5b4b3af
2 parents 9deedf0 + 8ea3bb1
commit 5b4b3af
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/google/protobuf/port.h b/src/google/protobuf/port.h
@@ -64,7 +64,10 @@ inline PROTOBUF_ALWAYS_INLINE void StrongPointer() {
 template <typename T>
 inline PROTOBUF_ALWAYS_INLINE void StrongReferenceToType() {
   static constexpr auto ptr = T::template GetStrongPointerForType<T>();
-  return StrongPointer<decltype(ptr), ptr>();
+  // This is identical to the implementation of StrongPointer() above, but it
+  // has to be explicitly inlined here or else Clang 19 will raise an error in
+  // some configurations.
+  asm(".reloc ., BFD_RELOC_NONE, %p0" ::"Ws"(ptr));
 }
 #else   // .reloc
 // Portable fallback. It usually generates a single LEA instruction or