Don't export symbols from clang/opt/llc if plugins are disabled.

efriedma-quic · efriedma-quic · commit 896335bfb8ea · 2020-03-23T12:17:09.000-07:00
The only reason we export symbols from these tools is to support plugins; if we don't have plugins, exporting symbols just bloats the executable and makes LTO less effective. See review of D75879 for the discussion that led to this patch. Differential Revision: https://reviews.llvm.org/D76527
diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt
@@ -57,7 +57,7 @@ endif()
 
 # Support plugins.
 if(CLANG_PLUGIN_SUPPORT)
-  export_executable_symbols(clang)
+  export_executable_symbols_for_plugins(clang)
 endif()
 
 add_dependencies(clang clang-resource-headers)
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
@@ -1029,6 +1029,13 @@ function(export_executable_symbols target)
   endif()
 endfunction()
 
+# Export symbols if LLVM plugins are enabled.
+function(export_executable_symbols_for_plugins target)
+  if(LLVM_ENABLE_PLUGINS)
+    export_executable_symbols(${target})
+  endif()
+endfunction()
+
 if(NOT LLVM_TOOLCHAIN_TOOLS)
   set (LLVM_TOOLCHAIN_TOOLS
     llvm-ar
diff --git a/llvm/tools/bugpoint/CMakeLists.txt b/llvm/tools/bugpoint/CMakeLists.txt
@@ -38,4 +38,4 @@ add_llvm_tool(bugpoint
   intrinsics_gen
   SUPPORT_PLUGINS
   )
-export_executable_symbols(bugpoint)
+export_executable_symbols_for_plugins(bugpoint)
diff --git a/llvm/tools/llc/CMakeLists.txt b/llvm/tools/llc/CMakeLists.txt
@@ -27,4 +27,4 @@ add_llvm_tool(llc
   SUPPORT_PLUGINS
   )
 
-export_executable_symbols(llc)
+export_executable_symbols_for_plugins(llc)
diff --git a/llvm/tools/llvm-stress/CMakeLists.txt b/llvm/tools/llvm-stress/CMakeLists.txt
@@ -10,4 +10,3 @@ add_llvm_tool(llvm-stress
   DEPENDS
   intrinsics_gen
   )
-export_executable_symbols(llvm-stress)
diff --git a/llvm/tools/opt/CMakeLists.txt b/llvm/tools/opt/CMakeLists.txt
@@ -39,7 +39,7 @@ add_llvm_tool(opt
   intrinsics_gen
   SUPPORT_PLUGINS
   )
-export_executable_symbols(opt)
+export_executable_symbols_for_plugins(opt)
 
 if(LLVM_BUILD_EXAMPLES)
     target_link_libraries(opt PRIVATE ExampleIRTransforms)
diff --git a/llvm/unittests/Passes/CMakeLists.txt b/llvm/unittests/Passes/CMakeLists.txt
@@ -16,7 +16,7 @@ if (NOT WIN32)
   add_llvm_unittest(PluginsTests
     PluginsTest.cpp
     )
-  export_executable_symbols(PluginsTests)
+  export_executable_symbols_for_plugins(PluginsTests)
   target_link_libraries(PluginsTests PRIVATE LLVMTestingSupport)
 
   set(LLVM_LINK_COMPONENTS)

Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,4 @@ add_llvm_tool(bugpoint`
`38`	`38`	`intrinsics_gen`
`39`	`39`	`SUPPORT_PLUGINS`
`40`	`40`	`)`
`41`		`-export_executable_symbols(bugpoint)`
	`41`	`+export_executable_symbols_for_plugins(bugpoint)`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,4 @@ add_llvm_tool(llc`
`27`	`27`	`SUPPORT_PLUGINS`
`28`	`28`	`)`
`29`	`29`
`30`		`-export_executable_symbols(llc)`
	`30`	`+export_executable_symbols_for_plugins(llc)`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,3 @@ add_llvm_tool(llvm-stress`
`10`	`10`	`DEPENDS`
`11`	`11`	`intrinsics_gen`
`12`	`12`	`)`
`13`		`-export_executable_symbols(llvm-stress)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ add_llvm_tool(opt`
`39`	`39`	`intrinsics_gen`
`40`	`40`	`SUPPORT_PLUGINS`
`41`	`41`	`)`
`42`		`-export_executable_symbols(opt)`
	`42`	`+export_executable_symbols_for_plugins(opt)`
`43`	`43`
`44`	`44`	`if(LLVM_BUILD_EXAMPLES)`
`45`	`45`	`target_link_libraries(opt PRIVATE ExampleIRTransforms)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ if (NOT WIN32)`
`16`	`16`	`add_llvm_unittest(PluginsTests`
`17`	`17`	`PluginsTest.cpp`
`18`	`18`	`)`
`19`		`- export_executable_symbols(PluginsTests)`
	`19`	`+ export_executable_symbols_for_plugins(PluginsTests)`
`20`	`20`	`target_link_libraries(PluginsTests PRIVATE LLVMTestingSupport)`
`21`	`21`
`22`	`22`	`set(LLVM_LINK_COMPONENTS)`