Changeset 278536 in webkit

Timestamp:

Jun 6, 2021 7:47:34 AM (3 years ago)

Author:

ddkilzer@apple.com

Message:

Unexport llvm coverage symbols to fix build
<​https://webkit.org/b/226684>
<rdar://problem/78906691>

Reviewed by Darin Adler.

• Scripts/check-for-weak-vtables-and-externals:
• Revert change from r278444. That fixes errors when this script is run, but the Generate TAPI build phase for some projects still fails due to the new weak external symbols.
• coverage/coverage.xcconfig:

(UNEXPORTED_SYMBOL_LDFLAGS_FOR_COVERAGE): Add.

• Linker flags to unexport llvm symbols added by the compiler for coverage.

(OTHER_LDFLAGS):

• Add $(UNEXPORTED_SYMBOL_LDFLAGS_FOR_COVERAGE) to list of switches to unexport the symbols during linking.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/check-for-weak-vtables-and-externals (modified) (1 diff)
• coverage/coverage.xcconfig (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-06-06  David Kilzer  <ddkilzer@apple.com>
+
+        Unexport llvm coverage symbols to fix build
+        <https://webkit.org/b/226684>
+        <rdar://problem/78906691>
+
+        Reviewed by Darin Adler.
+
+        * Scripts/check-for-weak-vtables-and-externals:
+        - Revert change from r278444.  That fixes errors when
+          this script is run, but the Generate TAPI build phase
+          for some projects still fails due to the new weak
+          external symbols.
+        * coverage/coverage.xcconfig:
+        (UNEXPORTED_SYMBOL_LDFLAGS_FOR_COVERAGE): Add.
+        - Linker flags to unexport llvm symbols added by the
+          compiler for coverage.
+        (OTHER_LDFLAGS):
+        - Add $(UNEXPORTED_SYMBOL_LDFLAGS_FOR_COVERAGE) to list
+          of switches to unexport the symbols during linking.
+
 2021-06-04  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/Scripts/check-for-weak-vtables-and-externals

@@ -69 +69 @@
             next if /\b___asan/;
 
-            # Ignore weak symbols present when compiling with coverage enabled.
-            next if /\b(___llvm_profile_filename|___llvm_profile_raw_version|_lprofDirMode)/ && coverageIsEnabled();
-
             if (/weak external vtable for (.*)$/) {
                 push @weakVTableClasses, $1;

trunk/Tools/coverage/coverage.xcconfig

@@ +1 @@
+# Unexport weak external symbols from llvm coverage.
+UNEXPORTED_SYMBOL_LDFLAGS_FOR_COVERAGE = -Wl,-unexported_symbol -Wl,___llvm_profile_filename -Wl,-unexported_symbol -Wl,___llvm_profile_raw_version -Wl,-unexported_symbol -Wl,_lprofDirMode;
+
 OTHER_CFLAGS = $(inherited) -fprofile-instr-generate -fcoverage-mapping;
-OTHER_LDFLAGS = $(inherited) -fprofile-instr-generate;
+OTHER_LDFLAGS = $(inherited) -fprofile-instr-generate $(UNEXPORTED_SYMBOL_LDFLAGS_FOR_COVERAGE);