From 783e0e4b235661bfec46959c4c7528746adbcb37 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Wed, 4 Feb 2015 22:59:18 +0000 Subject: [PATCH] AsmParser: Split out LineField, NFC Split out `LineField`, which restricts the legal line numbers. This will make it easier to be consistent between different node parsers. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@228226 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AsmParser/LLParser.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 9e02e9edb6a..d652f59acb1 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -2945,6 +2945,12 @@ struct MDUnsignedField : public MDFieldImpl { MDUnsignedField(uint64_t Default = 0, uint64_t Max = UINT64_MAX) : ImplTy(Default), Max(Max) {} }; +struct LineField : public MDUnsignedField { + LineField() : MDUnsignedField(0, UINT32_MAX >> 8) {} +}; +struct ColumnField : public MDUnsignedField { + ColumnField() : MDUnsignedField(0, UINT16_MAX) {} +}; struct DwarfTagField : public MDUnsignedField { DwarfTagField() : MDUnsignedField(0, ~0u >> 16) {} }; @@ -2978,6 +2984,15 @@ bool LLParser::ParseMDField(LocTy Loc, StringRef Name, return false; } +template <> +bool LLParser::ParseMDField(LocTy Loc, StringRef Name, LineField &Result) { + return ParseMDField(Loc, Name, static_cast(Result)); +} +template <> +bool LLParser::ParseMDField(LocTy Loc, StringRef Name, ColumnField &Result) { + return ParseMDField(Loc, Name, static_cast(Result)); +} + template <> bool LLParser::ParseMDField(LocTy Loc, StringRef Name, DwarfTagField &Result) { if (Lex.getKind() == lltok::APSInt) @@ -3105,8 +3120,8 @@ bool LLParser::ParseSpecializedMDNode(MDNode *&N, bool IsDistinct) { /// ::= !MDLocation(line: 43, column: 8, scope: !5, inlinedAt: !6) bool LLParser::ParseMDLocation(MDNode *&Result, bool IsDistinct) { #define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \ - OPTIONAL(line, MDUnsignedField, (0, ~0u >> 8)); \ - OPTIONAL(column, MDUnsignedField, (0, ~0u >> 16)); \ + OPTIONAL(line, LineField, ); \ + OPTIONAL(column, ColumnField, ); \ REQUIRED(scope, MDField, ); \ OPTIONAL(inlinedAt, MDField, ); PARSE_MD_FIELDS(); -- 2.34.1