This is an archive of the discontinued LLVM Phabricator instance.

ThinLTOBitcodeWriter: Do not include module-level inline asm in the merged module.
ClosedPublic

Authored by pcc on Feb 5 2018, 7:00 PM.

Download Raw Diff

Details

Reviewers

Commits

rG29c6f4833ce0: ThinLTOBitcodeWriter: Do not include module-level inline asm in the merged…
rL324313: ThinLTOBitcodeWriter: Do not include module-level inline asm in the merged…

Summary

If the inline asm provides the definition of a symbol, this can result
in duplicate symbol errors.

Diff Detail

Repository: rL LLVM

Event Timeline

pcc created this revision.Feb 5 2018, 7:00 PM

Harbormaster completed remote builds in B14635: Diff 132929.Feb 5 2018, 7:00 PM

Herald added subscribers: hiraditya, eraman, inglorion, mehdi_amini. · View Herald TranscriptFeb 5 2018, 7:00 PM

LGTM

This revision is now accepted and ready to land.Feb 5 2018, 7:08 PM

Closed by commit rL324313: ThinLTOBitcodeWriter: Do not include module-level inline asm in the merged… (authored by pcc). · Explain WhyFeb 5 2018, 7:31 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

llvm/

trunk/

lib/

Transforms/

IPO/

ThinLTOBitcodeWriter.cpp

1 line

test/

Transforms/

ThinLTOBitcodeWriter/

module-asm.ll

12 lines

Diff 132932

llvm/trunk/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp

Show First 20 Lines • Show All 292 Lines • ▼ Show 20 Lines	std::unique_ptr<Module> MergedM(
return true;		return true;
if (auto *F = dyn_cast<Function>(GV))		if (auto *F = dyn_cast<Function>(GV))
return EligibleVirtualFns.count(F);		return EligibleVirtualFns.count(F);
if (auto *GVar = dyn_cast_or_null<GlobalVariable>(GV->getBaseObject()))		if (auto *GVar = dyn_cast_or_null<GlobalVariable>(GV->getBaseObject()))
return HasTypeMetadata(GVar);		return HasTypeMetadata(GVar);
return false;		return false;
}));		}));
StripDebugInfo(*MergedM);		StripDebugInfo(*MergedM);
		MergedM->setModuleInlineAsm("");

for (Function &F : *MergedM)		for (Function &F : *MergedM)
if (!F.isDeclaration()) {		if (!F.isDeclaration()) {
// Reset the linkage of all functions eligible for virtual constant		// Reset the linkage of all functions eligible for virtual constant
// propagation. The canonical definitions live in the thin LTO module so		// propagation. The canonical definitions live in the thin LTO module so
// that they can be imported.		// that they can be imported.
F.setLinkage(GlobalValue::AvailableExternallyLinkage);		F.setLinkage(GlobalValue::AvailableExternallyLinkage);
F.setComdat(nullptr);		F.setComdat(nullptr);
▲ Show 20 Lines • Show All 212 Lines • Show Last 20 Lines

llvm/trunk/test/Transforms/ThinLTOBitcodeWriter/module-asm.ll

				; RUN: opt -thinlto-bc -o %t %s
				; RUN: llvm-modextract -b -n 0 -o - %t \| llvm-dis \| FileCheck --check-prefix=M0 %s
				; RUN: llvm-modextract -b -n 1 -o - %t \| llvm-dis \| FileCheck --check-prefix=M1 %s

				target triple = "x86_64-unknown-linux-gnu"

				@g = constant i32 0, !type !0
				!0 = !{i32 0, !"typeid"}

				; M0: module asm "ret"
				; M1-NOT: module asm
				module asm "ret"