Upstream compilation fixes.

fruffy · fruffy · commit 6ea1d89e03b2 · 2024-12-21T11:17:29.000+01:00
diff --git a/targets/tofino/base/table_executor.cpp b/targets/tofino/base/table_executor.cpp
@@ -36,8 +36,8 @@ const TableMatchKey *TofinoBaseTableExecutor::computeTargetMatchType(
     }
     // Action selector entries are not part of the match but we still need to create a key.
     if (matchType == TofinoBaseConstants::MATCH_KIND_SELECTOR) {
-        // cstring keyName = tableName + "_selector_" + fieldName;
-        return new SelectorMatchKey(symbolicTablePrefix(), fieldName, keyExpression);
+        cstring keyName = tableName + "_selector_" + fieldName;
+        return new SelectorMatchKey(symbolicTablePrefix(), keyName, keyExpression);
     }
     if (matchType == TofinoBaseConstants::MATCH_KIND_RANGE) {
         return new RangeTableMatchKey(symbolicTablePrefix(), fieldName, keyExpression);

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ const TableMatchKey *TofinoBaseTableExecutor::computeTargetMatchType(`
`36`	`36`	`}`
`37`	`37`	`// Action selector entries are not part of the match but we still need to create a key.`
`38`	`38`	`if (matchType == TofinoBaseConstants::MATCH_KIND_SELECTOR) {`
`39`		`- // cstring keyName = tableName + "_selector_" + fieldName;`
`40`		`- return new SelectorMatchKey(symbolicTablePrefix(), fieldName, keyExpression);`
	`39`	`+ cstring keyName = tableName + "_selector_" + fieldName;`
	`40`	`+ return new SelectorMatchKey(symbolicTablePrefix(), keyName, keyExpression);`
`41`	`41`	`}`
`42`	`42`	`if (matchType == TofinoBaseConstants::MATCH_KIND_RANGE) {`
`43`	`43`	`return new RangeTableMatchKey(symbolicTablePrefix(), fieldName, keyExpression);`