Fixes for P4-14 Tofino compilation.

Signed-off-by: fruffy <[email protected]>

Author: fruffy

frontends/p4-14/fromv1.0/programStructure.cpp

@@ -2077,8 +2077,9 @@ const IR::Declaration_Instance *ProgramStructure::convert(const IR::Register *re
         args->push_back(
             new IR::Argument(new IR::Constant(v1model.registers.size_type, reg->instance_count)));
     }
-    return new IR::Declaration_Instance(
-        newName, addGlobalNameAnnotation(reg->name, reg->annotations), spectype, args, nullptr);
+    return new IR::Declaration_Instance(reg->srcInfo, newName,
+                                        addGlobalNameAnnotation(reg->name, reg->annotations),
+                                        spectype, args, nullptr);
 }
 
 const IR::Declaration_Instance *ProgramStructure::convert(const IR::CounterOrMeter *cm,
@@ -2103,7 +2104,8 @@ const IR::Declaration_Instance *ProgramStructure::convert(const IR::CounterOrMet
         if (c->min_width >= 0) annos.emplace_back("min_width"_cs, new IR::Constant(c->min_width));
         if (c->max_width >= 0) annos.emplace_back("max_width"_cs, new IR::Constant(c->max_width));
     }
-    return new IR::Declaration_Instance(newName, std::move(annos), type, args, nullptr);
+    return new IR::Declaration_Instance(cm->srcInfo, newName, std::move(annos), type, args,
+                                        nullptr);
 }
 
 const IR::Declaration_Instance *ProgramStructure::convertDirectMeter(const IR::Meter *m,
@@ -2131,7 +2133,8 @@ const IR::Declaration_Instance *ProgramStructure::convertDirectMeter(const IR::M
         auto meterPreColor = ExpressionConverter(this).convert(m->pre_color);
         if (meterPreColor != nullptr) annos.emplace_back("pre_color"_cs, meterPreColor);
     }
-    return new IR::Declaration_Instance(newName, std::move(annos), specType, args, nullptr);
+    return new IR::Declaration_Instance(m->srcInfo, newName, std::move(annos), specType, args,
+                                        nullptr);
 }
 
 const IR::Declaration_Instance *ProgramStructure::convertDirectCounter(const IR::Counter *c,
@@ -2147,7 +2150,7 @@ const IR::Declaration_Instance *ProgramStructure::convertDirectCounter(const IR:
     auto annos = addGlobalNameAnnotation(c->name, c->annotations);
     if (c->min_width >= 0) annos.emplace_back("min_width"_cs, new IR::Constant(c->min_width));
     if (c->max_width >= 0) annos.emplace_back("max_width"_cs, new IR::Constant(c->max_width));
-    return new IR::Declaration_Instance(newName, std::move(annos), type, args, nullptr);
+    return new IR::Declaration_Instance(c->srcInfo, newName, std::move(annos), type, args, nullptr);
 }
 
 IR::Vector<IR::Argument> *ProgramStructure::createApplyArguments(cstring /* name unused */) {

frontends/parsers/parserDriver.cpp

@@ -69,7 +69,7 @@ struct AutoStdioInputStream {
 
 namespace P4 {
 
-AbstractParserDriver::AbstractParserDriver() : sources(new Util::InputSources) {}
+AbstractParserDriver::AbstractParserDriver() : sources(new Util::InputSources()) {}
 
 AbstractParserDriver::~AbstractParserDriver() {}
 

lib/source_file.cpp

@@ -51,12 +51,24 @@ cstring SourcePosition::toString() const {
 SourceInfo::SourceInfo(const InputSources *sources, SourcePosition start, SourcePosition end)
     : sources(sources), start(start), end(end) {
     BUG_CHECK(sources != nullptr, "Invalid InputSources in SourceInfo");
-    if (!start.isValid() || !end.isValid())
-        BUG("Invalid source position in SourceInfo %1%-%2%", start.toString(), end.toString());
+    if (!start.isValid() || !end.isValid()) {
+        BUG("Invalid source position in SourceInfo %1%-%2% for %3%", start.toString(),
+            end.toString(), sources->toDebugString());
+    }
     if (start > end)
         BUG("SourceInfo position start %1% after end %2%", start.toString(), end.toString());
 }
 
+SourceInfo::SourceInfo(const InputSources *sources, SourcePosition point)
+    : SourceInfo(sources, point, point) {}
+
+SourceInfo::SourceInfo(cstring filename, int line, int column, cstring srcBrief) {
+    this->filename = filename;
+    this->line = line;
+    this->column = column;
+    this->srcBrief = srcBrief;
+}
+
 cstring SourceInfo::toString() const {
     return absl::StrFormat("(%v)-(%v)", start.toString(), end.toString());
 }

lib/source_file.h

@@ -135,18 +135,12 @@ class SourceInfo final {
     int line = -1;
     int column = -1;
     cstring srcBrief = ""_cs;
-    SourceInfo(cstring filename, int line, int column, cstring srcBrief) {
-        this->filename = filename;
-        this->line = line;
-        this->column = column;
-        this->srcBrief = srcBrief;
-    }
+    SourceInfo(cstring filename, int line, int column, cstring srcBrief);
     /// Creates an "invalid" SourceInfo
     SourceInfo() = default;
 
     /// Creates a SourceInfo for a 'point' in the source, or invalid
-    SourceInfo(const InputSources *sources, SourcePosition point)
-        : sources(sources), start(point), end(point) {}
+    SourceInfo(const InputSources *sources, SourcePosition point);
 
     SourceInfo(const InputSources *sources, SourcePosition start, SourcePosition end);
 

tools/ir-generator/ir-generator.ypp

@@ -41,7 +41,9 @@ namespace P4 {
 #define YYLTYPE Util::SourceInfo
 #define YYLLOC_DEFAULT(Cur, Rhs, N)                                     \
     ((Cur) = (N) ? YYRHSLOC(Rhs, 1) + YYRHSLOC(Rhs, N)                  \
-                 : Util::SourceInfo(sources, YYRHSLOC(Rhs, 0).getEnd()))
+                 : (YYRHSLOC(Rhs, 0).isValid()                           \
+                    ? Util::SourceInfo(sources, YYRHSLOC(Rhs, 0).getEnd()) \
+                    : Util::SourceInfo()))
 
 template<typename... Args>
 void yyerror(const char *fmt, Args&&... args);