No-change maintenance

Signed-off-by: Vivien Oddou <[email protected]>

src/AzslcMain.cpp

@@ -269,12 +269,12 @@ namespace AZ::ShaderCompiler::Main
             visitOptions);
     }
 
-    void ParseWarningLevel(const unordered_map<Warn::EnumType, bool>& args, DiagnosticStream& warningConfig)
+    void ParseWarningLevel(const std::array<bool, Warn::EndEnumeratorSentinel_>& args, DiagnosticStream& warningConfig)
     {
         for (auto level : Warn::Enumerate{})
         {
-            auto lookup = args.find(level);
-            if (lookup != args.end() && lookup->second)
+            bool active = args[level];
+            if (active)
             {
                 if (level >= Warn::Wx)
                 {
@@ -423,7 +423,7 @@ int main(int argc, const char* argv[])
     int maxSpaces = std::numeric_limits<int>::max();
     auto maxSpacesOpt = cli.add_option("--max-spaces", maxSpaces, "Will choose register spaces that do not extend past this limit.");
 
-    std::unordered_map<Warn::EnumType, bool> warningOpts;
+    std::array<bool, Warn::EndEnumeratorSentinel_> warningOpts;
     for (const auto e : Warn::Enumerate{})
     {
         warningOpts[e] = false;

src/AzslcReflection.cpp

@@ -1069,7 +1069,7 @@ namespace AZ::ShaderCompiler
     }
 
     template< typename CtxT >
-    bool SetNextNodeIfPartOfTypeCtxTCondViaNParents(
+    bool SetNextNodeIfChildOfCtxTCondViaNParents(
         ParserRuleContext*& node,
         int maxDepth)
     {
@@ -1097,10 +1097,10 @@ namespace AZ::ShaderCompiler
         // go up the tree to meet one of them using arbitrary max depths of {5,6,7},
         // just enough to search up things like `for (a, b<(ref+1), c)` idExpr->IdentifierExpression->OtherExpression->BinaryExpr->ParenthesisExpr->BinaryExpr->Condition->For
         int complexityFactor = 1;
-        bool isNonLoop = SetNextNodeIfPartOfTypeCtxTCondViaNParents<AstIf>(node, 6);
-        if (!isNonLoop && (SetNextNodeIfPartOfTypeCtxTCondViaNParents<AstFor>(node, 7)
-                           || SetNextNodeIfPartOfTypeCtxTCondViaNParents<AstWhile>(node, 6)
-                           || SetNextNodeIfPartOfTypeCtxTCondViaNParents<AstDo>(node, 6)))
+        bool isNonLoop = SetNextNodeIfChildOfCtxTCondViaNParents<AstIf>(node, 6);
+        if (!isNonLoop && (SetNextNodeIfChildOfCtxTCondViaNParents<AstFor>(node, 7)
+                           || SetNextNodeIfChildOfCtxTCondViaNParents<AstWhile>(node, 6)
+                           || SetNextNodeIfChildOfCtxTCondViaNParents<AstDo>(node, 6)))
         {
             complexityFactor = 2; // arbitrarily augment loop scores by virtue of assuming they repeat O(N=2)
         }
@@ -1192,14 +1192,14 @@ namespace AZ::ShaderCompiler
                 {
                     if (funcInfo->m_costScore == -1)  // cost not yet discovered for this function
                     {
+                        verboseCout << " " << concrete << " non-memoized. discovering cost\n";
                         funcInfo->m_costScore = 0;
                         using AstFDef = azslParser::HlslFunctionDefinitionContext;
                         AnalyzeImpact(polymorphic_downcast<AstFDef*>(funcInfo->m_defNode->parent)->block(),
                                       funcInfo->m_costScore);  // recurse and cache
-                        verboseCout << " " << concrete << " analyzed at " << funcInfo->m_costScore << "\n";
                     }
                     scoreAccumulator += funcInfo->m_costScore;
-                    verboseCout << " " << concrete << " call score " << funcInfo->m_costScore << " added. now " << scoreAccumulator << "\n";
+                    verboseCout << " " << concrete << " call score " << funcInfo->m_costScore << " added\n";
                 }
             }
             // other cases forfeited for now, but that would at least include things like eg braces (f)()

src/AzslcSemanticOrchestrator.cpp

@@ -1123,7 +1123,7 @@ namespace AZ::ShaderCompiler
             {
                 auto outputStream = lhsKindInfo.GetKind() == Kind::Type ? verboseCout : warningCout;
                 // registered predefined types can have members, but we don't know them -> not important. But anything else is very likely an ill-formed source.
-                PrintWarning(outputStream, Warn::W1, line, none, " warning: ill-formed semantics: access of member ",
+                PrintWarning(outputStream, Warn::W1, line, none, "ill-formed semantics: access of member ",
                              " on an unsupported kind ", Kind::ToStr(lhsKindInfo.GetKind()),
                              " (of believed type ", lhsSymbol->first.GetName(),
                              (lhsExpressionText ? " from expression " + *lhsExpressionText : ""), ")");

src/DiagnosticStream.h

@@ -162,6 +162,6 @@ namespace AZ
     private:
         Warn m_warningAsErrorLevel = Warn::EndEnumeratorSentinel_;  //!< no warning is an error by default
         Warn m_warningLevel = Warn::W1;                             //!< current activated level setting. default warning is W1
-        stack<Warn> m_activeManipulator{ {Warn::W1} };          //!< store manipulators. start with an initial value corresponding to the default filter.
+        stack<Warn> m_activeManipulator{ {Warn::W1} };              //!< store manipulators. start with an initial value corresponding to the default filter.
     };
 }