This is an archive of the discontinued LLVM Phabricator instance.

[Assembler] Restore diagnostics handler after parsing.
AbandonedPublic

Authored by sanwou01 on Feb 1 2017, 11:37 AM.

Reviewers

Summary

The AsmParser's diagnostics handler is no longer valid once the
AsmParser gets destructed. Restore the saved handlers back into the
SourceMgr.

Build Status

Buildable 3505
Build 3505: arc lint + arc unit

Why would you need the diag handler after it's destructed?

Ready to land as part of D29441.

Path

Size

lib/

MC/

MCParser/

4 lines

Show First 20 Lines • Show All 602 Lines • ▼ Show 20 Lines	AsmParser::AsmParser(SourceMgr &SM, MCContext &Ctx, MCStreamer &Out,
initializeDirectiveKindMap();		initializeDirectiveKindMap();

NumOfMacroInstantiations = 0;		NumOfMacroInstantiations = 0;
}		}

AsmParser::~AsmParser() {		AsmParser::~AsmParser() {
assert((HadError \|\| ActiveMacros.empty()) &&		assert((HadError \|\| ActiveMacros.empty()) &&
"Unexpected active macro instantiation!");		"Unexpected active macro instantiation!");

		// Restore the saved diagnostics handler and context for use during
		// finalization.
		SrcMgr.setDiagHandler(SavedDiagHandler, SavedDiagContext);
}		}

void AsmParser::printMacroInstantiations() {		void AsmParser::printMacroInstantiations() {
// Print the active macro instantiation stack.		// Print the active macro instantiation stack.
for (std::vector<MacroInstantiation *>::const_reverse_iterator		for (std::vector<MacroInstantiation *>::const_reverse_iterator
it = ActiveMacros.rbegin(),		it = ActiveMacros.rbegin(),
ie = ActiveMacros.rend();		ie = ActiveMacros.rend();
it != ie; ++it)		it != ie; ++it)
▲ Show 20 Lines • Show All 4,907 Lines • Show Last 20 Lines