From 3d62bbacb1aa918944f0cc966381f44e13582b4a Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Thu, 19 Feb 2015 00:37:21 +0000 Subject: IR: Drop scope from MDTemplateParameter Follow-up to r229740, which removed `DITemplate*::getContext()` after my upgrade script revealed that scopes are always `nullptr` for template parameters. This is the other shoe: drop `scope:` from `MDTemplateParameter` and its two subclasses. (Note: a bitcode upgrade would be pointless, since the hierarchy hasn't been moved into place.) llvm-svn: 229791 --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp') diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index ca4d66a..649057d 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1515,25 +1515,24 @@ std::error_code BitcodeReader::ParseMetadata() { break; } case bitc::METADATA_TEMPLATE_TYPE: { - if (Record.size() != 4) + if (Record.size() != 3) return Error("Invalid record"); - MDValueList.AssignValue( - GET_OR_DISTINCT(MDTemplateTypeParameter, Record[0], - (Context, getMDOrNull(Record[1]), - getMDString(Record[2]), getMDOrNull(Record[3]))), - NextMDValueNo++); + MDValueList.AssignValue(GET_OR_DISTINCT(MDTemplateTypeParameter, + Record[0], + (Context, getMDString(Record[1]), + getMDOrNull(Record[2]))), + NextMDValueNo++); break; } case bitc::METADATA_TEMPLATE_VALUE: { - if (Record.size() != 6) + if (Record.size() != 5) return Error("Invalid record"); MDValueList.AssignValue( GET_OR_DISTINCT(MDTemplateValueParameter, Record[0], - (Context, Record[1], getMDOrNull(Record[2]), - getMDString(Record[3]), getMDOrNull(Record[4]), - getMDOrNull(Record[5]))), + (Context, Record[1], getMDString(Record[2]), + getMDOrNull(Record[3]), getMDOrNull(Record[4]))), NextMDValueNo++); break; } -- cgit v1.1