replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AsmWriter/Bitcode: MDLexicalBlockFile 

llvm-svn: 229017
This commit is contained in:
Duncan P. N. Exon Smith 2015-02-13 01:30:42 +00:00
parent a96d409997
commit 06a0702e40
8 changed files with 75 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/include/llvm/Bitcode/LLVMBitCodes.h
View File

@ -157,7 +157,8 @@ namespace bitc {
METADATA_SUBROUTINE_TYPE=19, // [distinct, flags, types]
METADATA_COMPILE_UNIT = 20, // [distinct, ...]
METADATA_SUBPROGRAM = 21, // [distinct, ...]
METADATA_LEXICAL_BLOCK = 22 // [distinct, scope, file, line, column]
METADATA_LEXICAL_BLOCK = 22, // [distinct, scope, file, line, column]
METADATA_LEXICAL_BLOCK_FILE=23// [distinct, scope, file, discriminator]
};
// The constants block (CONSTANTS_BLOCK_ID) describes emission for each

14
llvm/lib/AsmParser/LLParser.cpp
View File

@ -3482,9 +3482,21 @@ bool LLParser::ParseMDLexicalBlock(MDNode *&Result, bool IsDistinct) {
return false;
}
/// ParseMDLexicalBlockFile:
/// ::= !MDLexicalBlockFile(scope: !0, file: !2, discriminator: 9)
bool LLParser::ParseMDLexicalBlockFile(MDNode *&Result, bool IsDistinct) {
return TokError("unimplemented parser");
#define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \
REQUIRED(scope, MDField, ); \
OPTIONAL(file, MDField, ); \
REQUIRED(discriminator, MDUnsignedField, (0, UINT32_MAX));
PARSE_MD_FIELDS();
#undef VISIT_MD_FIELDS
Result = GET_OR_DISTINCT(MDLexicalBlockFile,
(Context, scope.Val, file.Val, discriminator.Val));
return false;
}
bool LLParser::ParseMDNamespace(MDNode *&Result, bool IsDistinct) {
return TokError("unimplemented parser");
}

11
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -1479,6 +1479,17 @@ std::error_code BitcodeReader::ParseMetadata() {
NextMDValueNo++);
break;
}
case bitc::METADATA_LEXICAL_BLOCK_FILE: {
if (Record.size() != 4)
return Error("Invalid record");
MDValueList.AssignValue(
GET_OR_DISTINCT(MDLexicalBlockFile, Record[0],
(Context, getMDOrNull(Record[1]),
getMDOrNull(Record[2]), Record[3])),
NextMDValueNo++);
break;
}
case bitc::METADATA_STRING: {
std::string String(Record.begin(), Record.end());
llvm::UpgradeMDStringConstant(String);

17
llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
View File

@ -993,11 +993,20 @@ static void WriteMDLexicalBlock(const MDLexicalBlock *N,
Record.clear();
}
static void WriteMDLexicalBlockFile(const MDLexicalBlockFile *,
const ValueEnumerator &, BitstreamWriter &,
SmallVectorImpl<uint64_t> &, unsigned) {
llvm_unreachable("write not implemented");
static void WriteMDLexicalBlockFile(const MDLexicalBlockFile *N,
const ValueEnumerator &VE,
BitstreamWriter &Stream,
SmallVectorImpl<uint64_t> &Record,
unsigned Abbrev) {
Record.push_back(N->isDistinct());
Record.push_back(VE.getMetadataOrNullID(N->getScope()));
Record.push_back(VE.getMetadataOrNullID(N->getFile()));
Record.push_back(N->getDiscriminator());
Stream.EmitRecord(bitc::METADATA_LEXICAL_BLOCK_FILE, Record, Abbrev);
Record.clear();
}
static void WriteMDNamespace(const MDNamespace *, const ValueEnumerator &,
BitstreamWriter &, SmallVectorImpl<uint64_t> &,
unsigned) {

21
llvm/lib/IR/AsmWriter.cpp
View File

@ -1642,11 +1642,24 @@ static void writeMDLexicalBlock(raw_ostream &Out, const MDLexicalBlock *N,
Out << ")";
}
static void writeMDLexicalBlockFile(raw_ostream &, const MDLexicalBlockFile *,
TypePrinting *, SlotTracker *,
const Module *) {
llvm_unreachable("write not implemented");
static void writeMDLexicalBlockFile(raw_ostream &Out,
const MDLexicalBlockFile *N,
TypePrinting *TypePrinter,
SlotTracker *Machine,
const Module *Context) {
Out << "!MDLexicalBlockFile(";
FieldSeparator FS;
Out << FS << "scope: ";
writeMetadataAsOperand(Out, N->getScope(), TypePrinter, Machine, Context);
if (N->getFile()) {
Out << FS << "file: ";
writeMetadataAsOperand(Out, N->getFile(), TypePrinter, Machine,
Context);
}
Out << FS << "discriminator: " << N->getDiscriminator();
Out << ")";
}
static void writeMDNamespace(raw_ostream &, const MDNamespace *, TypePrinting *,
SlotTracker *, const Module *) {
llvm_unreachable("write not implemented");

4
llvm/test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll Normal file
View File

@ -0,0 +1,4 @@
; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
; CHECK: [[@LINE+1]]:36: error: missing required field 'discriminator'
!0 = !MDLexicalBlockFile(scope: !{})

4
llvm/test/Assembler/invalid-mdlexicalblockfile-missing-parent.ll Normal file
View File

@ -0,0 +1,4 @@
; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
; CHECK: [[@LINE+1]]:42: error: missing required field 'scope'
!0 = !MDLexicalBlockFile(discriminator: 0)

13
llvm/test/Assembler/mdlexicalblock.ll
View File

@ -1,8 +1,8 @@
; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s
; RUN: verify-uselistorder %s
; CHECK: !named = !{!0, !1, !2, !3, !4, !4}
!named = !{!0, !1, !2, !3, !4, !5}
; CHECK: !named = !{!0, !1, !2, !3, !4, !4, !5, !6, !7, !7}
!named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9}
!0 = distinct !{}
!1 = !{!"path/to/file", !"/path/to/dir"}
@ -14,3 +14,12 @@
; CHECK: !4 = !MDLexicalBlock(scope: !0)
!4 = !MDLexicalBlock(scope: !0)
!5 = !MDLexicalBlock(scope: !0, file: null, line: 0, column: 0)
; CHECK: !5 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 0)
; CHECK: !6 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 1)
!6 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 0)
!7 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 1)
; CHECK: !7 = !MDLexicalBlockFile(scope: !3, discriminator: 7)
!8 = !MDLexicalBlockFile(scope: !3, discriminator: 7)
!9 = !MDLexicalBlockFile(scope: !3, file: null, discriminator: 7)