Merging r142132: (c7248e8f) · Commits · llvm-doe / llvm-project

llvm/include/llvm/Support/SourceMgr.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,9 @@ public:
		DiagContext = Ctx;
		}

		DiagHandlerTy getDiagHandler() const { return DiagHandler; }
		void *getDiagContext() const { return DiagContext; }

		const SrcBuffer &getBufferInfo(unsigned i) const {
		assert(i < Buffers.size() && "Invalid Buffer ID!");
		return Buffers[i];

llvm/lib/MC/MCParser/AsmParser.cpp

+37 −26

Original line number	Diff line number	Diff line
		@@ -87,6 +87,8 @@ private:
		MCStreamer &Out;
		const MCAsmInfo &MAI;
		SourceMgr &SrcMgr;
		SourceMgr::DiagHandlerTy SavedDiagHandler;
		void *SavedDiagContext;
		MCAsmParserExtension *GenericParser;
		MCAsmParserExtension *PlatformParser;

		@@ -142,8 +144,10 @@ public:
		virtual MCContext &getContext() { return Ctx; }
		virtual MCStreamer &getStreamer() { return Out; }

		virtual bool Warning(SMLoc L, const Twine &Msg);
		virtual bool Error(SMLoc L, const Twine &Msg);
		virtual bool Warning(SMLoc L, const Twine &Msg,
		ArrayRef<SMRange> Ranges = ArrayRef<SMRange>());
		virtual bool Error(SMLoc L, const Twine &Msg,
		ArrayRef<SMRange> Ranges = ArrayRef<SMRange>());

		const AsmToken &Lex();

		@@ -169,9 +173,9 @@ private:
		void HandleMacroExit();

		void PrintMacroInstantiations();
		void PrintMessage(SMLoc Loc, const Twine &Msg, const char *Type,
		bool ShowLine = true) const {
		SrcMgr.PrintMessage(Loc, Msg, Type, ShowLine);
		void PrintMessage(SMLoc Loc, SourceMgr::DiagKind Kind, const Twine &Msg,
		ArrayRef<SMRange> Ranges = ArrayRef<SMRange>()) const {
		SrcMgr.PrintMessage(Loc, Kind, Msg, Ranges);
		}
		static void DiagHandler(const SMDiagnostic &Diag, void *Context);

		@@ -351,6 +355,10 @@ AsmParser::AsmParser(SourceMgr &_SM, MCContext &_Ctx,
		: Lexer(_MAI), Ctx(_Ctx), Out(_Out), MAI(_MAI), SrcMgr(_SM),
		GenericParser(new GenericAsmParser), PlatformParser(0),
		CurBuffer(0), MacrosEnabled(true), CppHashLineNumber(0) {
		// Save the old handler.
		SavedDiagHandler = SrcMgr.getDiagHandler();
		SavedDiagContext = SrcMgr.getDiagContext();
		// Set our own handler which calls the saved handler.
		SrcMgr.setDiagHandler(DiagHandler, this);
		Lexer.setBuffer(SrcMgr.getMemoryBuffer(CurBuffer));

		@@ -389,21 +397,21 @@ void AsmParser::PrintMacroInstantiations() {
		// Print the active macro instantiation stack.
		for (std::vector<MacroInstantiation*>::const_reverse_iterator
		it = ActiveMacros.rbegin(), ie = ActiveMacros.rend(); it != ie; ++it)
		PrintMessage((*it)->InstantiationLoc, "while in macro instantiation",
		"note");
		PrintMessage((*it)->InstantiationLoc, SourceMgr::DK_Note,
		"while in macro instantiation");
		}

		bool AsmParser::Warning(SMLoc L, const Twine &Msg) {
		bool AsmParser::Warning(SMLoc L, const Twine &Msg, ArrayRef<SMRange> Ranges) {
		if (FatalAssemblerWarnings)
		return Error(L, Msg);
		PrintMessage(L, Msg, "warning");
		return Error(L, Msg, Ranges);
		PrintMessage(L, SourceMgr::DK_Warning, Msg, Ranges);
		PrintMacroInstantiations();
		return false;
		}

		bool AsmParser::Error(SMLoc L, const Twine &Msg) {
		bool AsmParser::Error(SMLoc L, const Twine &Msg, ArrayRef<SMRange> Ranges) {
		HadError = true;
		PrintMessage(L, Msg, "error");
		PrintMessage(L, SourceMgr::DK_Error, Msg, Ranges);
		PrintMacroInstantiations();
		return true;
		}
		@@ -495,8 +503,9 @@ bool AsmParser::Run(bool NoInitialTextSection, bool NoFinalize) {
		// FIXME: We would really like to refer back to where the symbol was
		// first referenced for a source location. We need to add something
		// to track that. Currently, we just point to the end of the file.
		PrintMessage(getLexer().getLoc(), "assembler local symbol '" +
		Sym->getName() + "' not defined", "error", false);
		PrintMessage(getLexer().getLoc(), SourceMgr::DK_Error,
		"assembler local symbol '" + Sym->getName() +
		"' not defined");
		}
		}

		@@ -1199,7 +1208,7 @@ bool AsmParser::ParseStatement() {
		}
		OS << "]";

		PrintMessage(IDLoc, OS.str(), "note");
		PrintMessage(IDLoc, SourceMgr::DK_Note, OS.str());
		}

		// If parsing succeeded, match the instruction.
		@@ -1273,7 +1282,7 @@ void AsmParser::DiagHandler(const SMDiagnostic &Diag, void *Context) {
		// Like SourceMgr::PrintMessage() we need to print the include stack if any
		// before printing the message.
		int DiagCurBuffer = DiagSrcMgr.FindBufferContainingLoc(DiagLoc);
		if (DiagCurBuffer > 0) {
		if (!Parser->SavedDiagHandler && DiagCurBuffer > 0) {
		SMLoc ParentIncludeLoc = DiagSrcMgr.getParentIncludeLoc(DiagCurBuffer);
		DiagSrcMgr.PrintIncludeStack(ParentIncludeLoc, OS);
		}
		@@ -1284,7 +1293,10 @@ void AsmParser::DiagHandler(const SMDiagnostic &Diag, void *Context) {
		if (!Parser->CppHashLineNumber \|\|
		&DiagSrcMgr != &Parser->SrcMgr \|\|
		DiagBuf != CppHashBuf) {
		Diag.Print(0, OS);
		if (Parser->SavedDiagHandler)
		Parser->SavedDiagHandler(Diag, Parser->SavedDiagContext);
		else
		Diag.print(0, OS);
		return;
		}

		@@ -1299,16 +1311,15 @@ void AsmParser::DiagHandler(const SMDiagnostic &Diag, void *Context) {
		int LineNo = Parser->CppHashLineNumber - 1 +
		(DiagLocLineNo - CppHashLocLineNo);

		SMDiagnostic NewDiag(*Diag.getSourceMgr(),
		Diag.getLoc(),
		Filename,
		LineNo,
		Diag.getColumnNo(),
		Diag.getMessage(),
		Diag.getLineContents(),
		Diag.getShowLine());
		SMDiagnostic NewDiag(*Diag.getSourceMgr(), Diag.getLoc(),
		Filename, LineNo, Diag.getColumnNo(),
		Diag.getKind(), Diag.getMessage(),
		Diag.getLineContents(), Diag.getRanges());

		NewDiag.Print(0, OS);
		if (Parser->SavedDiagHandler)
		Parser->SavedDiagHandler(NewDiag, Parser->SavedDiagContext);
		else
		NewDiag.print(0, OS);
		}

		bool AsmParser::expandMacro(SmallString<256> &Buf, StringRef Body,