diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index c2bec76ef..1c9aa715f 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -59,7 +59,7 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
     createSymbolDatabaseVariableSymbolTable();
     createSymbolDatabaseSetScopePointers();
     createSymbolDatabaseSetVariablePointers();
-    setValueTypeInTokenList();
+    setValueTypeInTokenList(false);
     createSymbolDatabaseSetFunctionPointers(true);
     createSymbolDatabaseSetTypePointers();
     createSymbolDatabaseEnums();
@@ -5395,7 +5395,7 @@ static const Function *getOperatorFunction(const Token * const tok)
     return nullptr;
 }
 
-void SymbolDatabase::setValueTypeInTokenList()
+void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings)
 {
     Token * tokens = const_cast<Tokenizer *>(mTokenizer)->list.front();
 
@@ -5605,7 +5605,7 @@ void SymbolDatabase::setValueTypeInTokenList()
         }
     }
 
-    if (mSettings->debugwarnings) {
+    if (reportDebugWarnings && mSettings->debugwarnings) {
         for (Token *tok = tokens; tok; tok = tok->next()) {
             if (tok->str() == "auto" && !tok->valueType())
                 debugMessage(tok, "auto token with no type.");
diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
index cb72325f7..3a13d92a8 100644
--- a/lib/symboldatabase.h
+++ b/lib/symboldatabase.h
@@ -1238,7 +1238,7 @@ public:
     void validateVariables() const;
 
     /** Set valuetype in provided tokenlist */
-    void setValueTypeInTokenList();
+    void setValueTypeInTokenList(bool reportDebugWarnings);
 
     /**
      * Calculates sizeof value for given type.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 85723fa51..37194aba2 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -2315,9 +2315,9 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
 
     if (mTimerResults) {
         Timer t("Tokenizer::simplifyTokens1::setValueType", mSettings->showtime, mTimerResults);
-        mSymbolDatabase->setValueTypeInTokenList();
+        mSymbolDatabase->setValueTypeInTokenList(true);
     } else {
-        mSymbolDatabase->setValueTypeInTokenList();
+        mSymbolDatabase->setValueTypeInTokenList(true);
     }
 
     if (mTimerResults) {
@@ -4762,7 +4762,7 @@ bool Tokenizer::simplifyTokenList2()
 
     // Create symbol database and then remove const keywords
     createSymbolDatabase();
-    mSymbolDatabase->setValueTypeInTokenList();
+    mSymbolDatabase->setValueTypeInTokenList(true);
 
     ValueFlow::setValues(&list, mSymbolDatabase, mErrorLogger, mSettings);