diff --git a/test/Linker/only-needed-named-metadata.ll b/test/Linker/only-needed-named-metadata.ll index d14b525fa02..90e24ceaf98 100644 --- a/test/Linker/only-needed-named-metadata.ll +++ b/test/Linker/only-needed-named-metadata.ll @@ -23,11 +23,6 @@ ; ONLYNEEDED-NOT:@analias ; ONLYNEEDED-NOT:@globalfunc2() -; Test -only-needed link with the modules preserved instead of freeing to -; catch any cross-module references to metadata, which the bitcode writer -; will assert on. -; RUN: llvm-link -preserve-modules -o %t3.bc -only-needed %S/Inputs/only-needed-named-metadata.ll %S/only-needed-named-metadata.ll - @X = global i32 5 @U = global i32 6 @U_linkonce = linkonce_odr hidden global i32 6 diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index a32383028ae..f179ff20b6f 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -89,10 +89,6 @@ static cl::opt SuppressWarnings("suppress-warnings", cl::desc("Suppress all linking warnings"), cl::init(false)); -static cl::opt - PreserveModules("preserve-modules", - cl::desc("Preserve linked modules for testing")); - static cl::opt PreserveBitcodeUseListOrder( "preserve-bc-uselistorder", cl::desc("Preserve use-list order when writing LLVM bitcode."), @@ -284,15 +280,6 @@ static bool linkFiles(const char *argv0, LLVMContext &Context, Linker &L, return false; // All linker flags apply to linking of subsequent files. ApplicableFlags = Flags; - - // If requested for testing, preserve modules by releasing them from - // the unique_ptr before the are freed. This can help catch any - // cross-module references from e.g. unneeded metadata references - // that aren't properly set to null but instead mapped to the source - // module version. The bitcode writer will assert if it finds any such - // cross-module references. - if (PreserveModules) - M.release(); } return true;