From b984c494493bd93bd6efd3ff4c468a071bffc1f6 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Fri, 13 Feb 2015 01:10:38 +0000 Subject: [PATCH] AsmWriter/Bitcode: MDSubrange git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229003 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Bitcode/LLVMBitCodes.h | 3 +- lib/AsmParser/LLParser.cpp | 44 +++++++++++++++++++++- lib/Bitcode/Reader/BitcodeReader.cpp | 12 ++++++ lib/Bitcode/Writer/BitcodeWriter.cpp | 20 ++++++++-- lib/IR/AsmWriter.cpp | 12 ++++-- test/Assembler/debug-info.ll | 14 +++++++ test/Assembler/invalid-mdsubrange-count-large.ll | 7 ++++ test/Assembler/invalid-mdsubrange-count-missing.ll | 4 ++ .../Assembler/invalid-mdsubrange-count-negative.ll | 4 ++ .../Assembler/invalid-mdsubrange-lowerBound-max.ll | 4 ++ .../Assembler/invalid-mdsubrange-lowerBound-min.ll | 4 ++ 11 files changed, 119 insertions(+), 9 deletions(-) create mode 100644 test/Assembler/debug-info.ll create mode 100644 test/Assembler/invalid-mdsubrange-count-large.ll create mode 100644 test/Assembler/invalid-mdsubrange-count-missing.ll create mode 100644 test/Assembler/invalid-mdsubrange-count-negative.ll create mode 100644 test/Assembler/invalid-mdsubrange-lowerBound-max.ll create mode 100644 test/Assembler/invalid-mdsubrange-lowerBound-min.ll diff --git a/include/llvm/Bitcode/LLVMBitCodes.h b/include/llvm/Bitcode/LLVMBitCodes.h index e5f7f7ec88f..4ccf8943d6d 100644 --- a/include/llvm/Bitcode/LLVMBitCodes.h +++ b/include/llvm/Bitcode/LLVMBitCodes.h @@ -147,7 +147,8 @@ namespace bitc { METADATA_OLD_FN_NODE = 9, // OLD_FN_NODE: [n x (type num, value num)] METADATA_NAMED_NODE = 10, // NAMED_NODE: [n x mdnodes] METADATA_ATTACHMENT = 11, // [m x [value, [n x [id, mdnode]]] - METADATA_GENERIC_DEBUG = 12 // [distinct, tag, vers, header, n x md num] + METADATA_GENERIC_DEBUG = 12, // [distinct, tag, vers, header, n x md num] + METADATA_SUBRANGE = 13 // [distinct, count, lo] }; // The constants block (CONSTANTS_BLOCK_ID) describes emission for each diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 7af85b5846c..735cf494cb2 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -2930,6 +2930,7 @@ template struct MDFieldImpl { explicit MDFieldImpl(FieldTy Default) : Val(std::move(Default)), Seen(false) {} }; + struct MDUnsignedField : public MDFieldImpl { uint64_t Max; @@ -2945,6 +2946,17 @@ struct ColumnField : public MDUnsignedField { struct DwarfTagField : public MDUnsignedField { DwarfTagField() : MDUnsignedField(0, dwarf::DW_TAG_hi_user) {} }; + +struct MDSignedField : public MDFieldImpl { + int64_t Min; + int64_t Max; + + MDSignedField(int64_t Default = 0) + : ImplTy(Default), Min(INT64_MIN), Max(INT64_MAX) {} + MDSignedField(int64_t Default, int64_t Min, int64_t Max) + : ImplTy(Default), Min(Min), Max(Max) {} +}; + struct MDField : public MDFieldImpl { MDField() : ImplTy(nullptr) {} }; @@ -3003,6 +3015,26 @@ bool LLParser::ParseMDField(LocTy Loc, StringRef Name, DwarfTagField &Result) { } template <> +bool LLParser::ParseMDField(LocTy Loc, StringRef Name, + MDSignedField &Result) { + if (Lex.getKind() != lltok::APSInt) + return TokError("expected signed integer"); + + auto &S = Lex.getAPSIntVal(); + if (S < Result.Min) + return TokError("value for '" + Name + "' too small, limit is " + + Twine(Result.Min)); + if (S > Result.Max) + return TokError("value for '" + Name + "' too large, limit is " + + Twine(Result.Max)); + Result.assign(S.getExtValue()); + assert(Result.Val >= Result.Min && "Expected value in range"); + assert(Result.Val <= Result.Max && "Expected value in range"); + Lex.Lex(); + return false; +} + +template <> bool LLParser::ParseMDField(LocTy Loc, StringRef Name, MDField &Result) { Metadata *MD; if (ParseMetadata(MD, nullptr)) @@ -3136,9 +3168,19 @@ bool LLParser::ParseGenericDebugNode(MDNode *&Result, bool IsDistinct) { return false; } +/// ParseMDSubrange: +/// ::= !MDSubrange(count: 30, lowerBound: 2) bool LLParser::ParseMDSubrange(MDNode *&Result, bool IsDistinct) { - return TokError("unimplemented parser"); +#define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \ + REQUIRED(count, MDUnsignedField, (0, UINT64_MAX >> 1)); \ + OPTIONAL(lowerBound, MDSignedField, ); + PARSE_MD_FIELDS(); +#undef VISIT_MD_FIELDS + + Result = GET_OR_DISTINCT(MDSubrange, (Context, count.Val, lowerBound.Val)); + return false; } + bool LLParser::ParseMDEnumerator(MDNode *&Result, bool IsDistinct) { return TokError("unimplemented parser"); } diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index f64cd55d8f3..f7815810401 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1173,6 +1173,8 @@ std::error_code BitcodeReader::ParseValueSymbolTable() { } } +static int64_t unrotateSign(uint64_t U) { return U & 1 ? ~(U >> 1) : U >> 1; } + std::error_code BitcodeReader::ParseMetadata() { unsigned NextMDValueNo = MDValueList.size(); @@ -1349,6 +1351,16 @@ std::error_code BitcodeReader::ParseMetadata() { NextMDValueNo++); break; } + case bitc::METADATA_SUBRANGE: { + if (Record.size() != 3) + return Error("Invalid record"); + + MDValueList.AssignValue( + GET_OR_DISTINCT(MDSubrange, Record[0], + (Context, Record[1], unrotateSign(Record[2]))), + NextMDValueNo++); + break; + } case bitc::METADATA_STRING: { std::string String(Record.begin(), Record.end()); llvm::UpgradeMDStringConstant(String); diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index 1c2424ce11b..3d1e82d8f8c 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -809,11 +809,23 @@ static void WriteGenericDebugNode(const GenericDebugNode *N, Record.clear(); } -static void WriteMDSubrange(const MDSubrange *, const ValueEnumerator &, - BitstreamWriter &, SmallVectorImpl &, - unsigned) { - llvm_unreachable("write not implemented"); +static uint64_t rotateSign(int64_t I) { + uint64_t U = I; + return I < 0 ? ~(U << 1) : U << 1; +} + +static void WriteMDSubrange(const MDSubrange *N, const ValueEnumerator &, + BitstreamWriter &Stream, + SmallVectorImpl &Record, + unsigned Abbrev) { + Record.push_back(N->isDistinct()); + Record.push_back(N->getCount()); + Record.push_back(rotateSign(N->getLo())); + + Stream.EmitRecord(bitc::METADATA_SUBRANGE, Record, Abbrev); + Record.clear(); } + static void WriteMDEnumerator(const MDEnumerator *, const ValueEnumerator &, BitstreamWriter &, SmallVectorImpl &, unsigned) { diff --git a/lib/IR/AsmWriter.cpp b/lib/IR/AsmWriter.cpp index d1beb166a18..aeed2af7376 100644 --- a/lib/IR/AsmWriter.cpp +++ b/lib/IR/AsmWriter.cpp @@ -1347,10 +1347,16 @@ static void writeMDLocation(raw_ostream &Out, const MDLocation *DL, Out << ")"; } -static void writeMDSubrange(raw_ostream &, const MDSubrange *, TypePrinting *, - SlotTracker *, const Module *) { - llvm_unreachable("write not implemented"); +static void writeMDSubrange(raw_ostream &Out, const MDSubrange *N, + TypePrinting *, SlotTracker *, const Module *) { + Out << "!MDSubrange("; + FieldSeparator FS; + Out << FS << "count: " << N->getCount(); + if (N->getLo()) + Out << FS << "lowerBound: " << N->getLo(); + Out << ")"; } + static void writeMDEnumerator(raw_ostream &, const MDEnumerator *, TypePrinting *, SlotTracker *, const Module *) { llvm_unreachable("write not implemented"); diff --git a/test/Assembler/debug-info.ll b/test/Assembler/debug-info.ll new file mode 100644 index 00000000000..e92606d2d80 --- /dev/null +++ b/test/Assembler/debug-info.ll @@ -0,0 +1,14 @@ +; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s +; RUN: verify-uselistorder %s + +; CHECK: !named = !{!0, !0, !1, !2} +!named = !{!0, !1, !2, !3} + +; CHECK: !0 = !MDSubrange(count: 3) +; CHECK-NEXT: !1 = !MDSubrange(count: 3, lowerBound: 4) +; CHECK-NEXT: !2 = !MDSubrange(count: 3, lowerBound: -5) +!0 = !MDSubrange(count: 3) +!1 = !MDSubrange(count: 3, lowerBound: 0) + +!2 = !MDSubrange(count: 3, lowerBound: 4) +!3 = !MDSubrange(count: 3, lowerBound: -5) diff --git a/test/Assembler/invalid-mdsubrange-count-large.ll b/test/Assembler/invalid-mdsubrange-count-large.ll new file mode 100644 index 00000000000..0d150aa9834 --- /dev/null +++ b/test/Assembler/invalid-mdsubrange-count-large.ll @@ -0,0 +1,7 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK-NOT: error +!0 = !MDSubrange(count: 9223372036854775807) + +; CHECK: :[[@LINE+1]]:25: error: value for 'count' too large, limit is 9223372036854775807 +!1 = !MDSubrange(count: 9223372036854775808) diff --git a/test/Assembler/invalid-mdsubrange-count-missing.ll b/test/Assembler/invalid-mdsubrange-count-missing.ll new file mode 100644 index 00000000000..bf9cb9a5e3d --- /dev/null +++ b/test/Assembler/invalid-mdsubrange-count-missing.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+1]]:32: error: missing required field 'count' +!0 = !MDSubrange(lowerBound: -3) diff --git a/test/Assembler/invalid-mdsubrange-count-negative.ll b/test/Assembler/invalid-mdsubrange-count-negative.ll new file mode 100644 index 00000000000..99cc8876750 --- /dev/null +++ b/test/Assembler/invalid-mdsubrange-count-negative.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+1]]:25: error: expected unsigned integer +!0 = !MDSubrange(count: -3) diff --git a/test/Assembler/invalid-mdsubrange-lowerBound-max.ll b/test/Assembler/invalid-mdsubrange-lowerBound-max.ll new file mode 100644 index 00000000000..1c68e984b17 --- /dev/null +++ b/test/Assembler/invalid-mdsubrange-lowerBound-max.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+1]]:41: error: value for 'lowerBound' too large, limit is 9223372036854775807 +!0 = !MDSubrange(count: 30, lowerBound: 9223372036854775808) diff --git a/test/Assembler/invalid-mdsubrange-lowerBound-min.ll b/test/Assembler/invalid-mdsubrange-lowerBound-min.ll new file mode 100644 index 00000000000..b3b2a03efd8 --- /dev/null +++ b/test/Assembler/invalid-mdsubrange-lowerBound-min.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+1]]:41: error: value for 'lowerBound' too small, limit is -9223372036854775808 +!0 = !MDSubrange(count: 30, lowerBound: -9223372036854775809) -- 2.11.0