REGRESSION (r223476): WebCore exports symbols with names belonging to other frameworks

https://bugs.webkit.org/show_bug.cgi?id=178424

Reviewed by David Kilzer.

This patch moves the wrapper function sharing the name of the externed function
to the source file and marks it as always inline. Marking it as inline prevents
the framework from exporting it.

* wtf/cocoa/SoftLinking.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223693 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 96b4d6e..a1e875c 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,16 @@
+2017-10-19  Keith Miller  <keith_miller@apple.com>
+
+        REGRESSION (r223476): WebCore exports symbols with names belonging to other frameworks
+        https://bugs.webkit.org/show_bug.cgi?id=178424
+
+        Reviewed by David Kilzer.
+
+        This patch moves the wrapper function sharing the name of the externed function
+        to the source file and marks it as always inline. Marking it as inline prevents
+        the framework from exporting it.
+
+        * wtf/cocoa/SoftLinking.h:
+
 2017-10-18  Keith Miller  <keith_miller@apple.com>
 
         Setup WebCore build to start using unified sources.

diff --git a/Source/WTF/wtf/cocoa/SoftLinking.h b/Source/WTF/wtf/cocoa/SoftLinking.h
index 1a532f1..8ebb3a1 100644 (file)
--- a/Source/WTF/wtf/cocoa/SoftLinking.h
+++ b/Source/WTF/wtf/cocoa/SoftLinking.h
@@ -476,6 +476,10 @@
     { \
         return softLink##framework##functionName parameterNames; \
     } \
+    } \
+    ALWAYS_INLINE resultType functionName parameterDeclarations \
+    {\
+        return functionNamespace::softLink##framework##functionName parameterNames; \
     }
 
 #define SOFT_LINK_FUNCTION_FOR_SOURCE(functionNamespace, framework, functionName, resultType, parameterDeclarations, parameterNames) \
@@ -494,10 +498,6 @@
         }); \
         return softLink##framework##functionName parameterNames; \
     } \
-    } \
-    resultType functionName parameterDeclarations \
-    {\
-        return functionNamespace::softLink##framework##functionName parameterNames; \
     }
 
 #define SOFT_LINK_FUNCTION_MAY_FAIL_FOR_HEADER(functionNamespace, framework, functionName, resultType, parameterDeclarations, parameterNames) \