From a5b1eef846e86010f82cff3d812dfd3fb3b99405 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Fri, 26 Aug 2016 17:58:37 +0000 Subject: [MC] Move .cv_loc management logic out of MCContext MCContext already has many tasks, and separating CodeView out from it is probably a good idea. The .cv_loc tracking was modelled on the DWARF tracking which lived directly in MCContext. Removes the inclusion of MCCodeView.h from MCContext.h, so now there are only 10 build actions while I hack on CodeView support instead of 265. llvm-svn: 279847 --- llvm/lib/MC/MCParser/AsmParser.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'llvm/lib/MC/MCParser/AsmParser.cpp') diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp index 83c845274d8..deacfbbb6d5 100644 --- a/llvm/lib/MC/MCParser/AsmParser.cpp +++ b/llvm/lib/MC/MCParser/AsmParser.cpp @@ -22,6 +22,7 @@ #include "llvm/ADT/StringRef.h" #include "llvm/ADT/Twine.h" #include "llvm/MC/MCAsmInfo.h" +#include "llvm/MC/MCCodeView.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/MCDirectives.h" #include "llvm/MC/MCDwarf.h" @@ -234,6 +235,8 @@ public: MCContext &getContext() override { return Ctx; } MCStreamer &getStreamer() override { return Out; } + CodeViewContext &getCVContext() { return Ctx.getCVContext(); } + unsigned getAssemblerDialect() override { if (AssemblerDialect == ~0U) return MAI.getAssemblerDialect(); @@ -3274,9 +3277,9 @@ bool AsmParser::parseDirectiveCVFile() { parseEscapedString(Filename) || parseToken(AsmToken::EndOfStatement, "unexpected token in '.cv_file' directive")) - return true; + return true; - if (getStreamer().EmitCVFileDirective(FileNumber, Filename) == 0) + if (!getStreamer().EmitCVFileDirective(FileNumber, Filename)) Error(FileNumberLoc, "file number already allocated"); return false; @@ -3300,7 +3303,7 @@ bool AsmParser::parseDirectiveCVLoc() { parseIntToken(FileNumber, "expected integer in '.cv_loc' directive") || check(FileNumber < 1, Loc, "file number less than one in '.cv_loc' directive") || - check(!getContext().isValidCVFileNumber(FileNumber), Loc, + check(!getCVContext().isValidFileNumber(FileNumber), Loc, "unassigned file number in '.cv_loc' directive")) return true; -- cgit v1.2.3