fixed #13926 - the original filename was not stored in the XML [skip ci]

Author: firewave

lib/errorlogger.cpp

@@ -196,16 +196,19 @@ ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
     for (const tinyxml2::XMLElement *e = errmsg->FirstChildElement(); e; e = e->NextSiblingElement()) {
         const char* name = e->Name();
         if (std::strcmp(name,"location")==0) {
+            const char *strorigfile = e->Attribute("origfile");
             const char *strfile = e->Attribute("file");
             const char *strinfo = e->Attribute("info");
             const char *strline = e->Attribute("line");
             const char *strcolumn = e->Attribute("column");
 
+            const char *origfile = strorigfile ? strorigfile : unknown;
             const char *file = strfile ? strfile : unknown;
             const char *info = strinfo ? strinfo : "";
             const int line = strline ? strToInt<int>(strline) : 0;
             const int column = strcolumn ? strToInt<int>(strcolumn) : 0;
             callStack.emplace_front(file, info, line, column);
+            callStack.front().setOrigFile(origfile);
         } else if (std::strcmp(name,"symbol")==0) {
             mSymbolNames += e->GetText();
         }
@@ -508,6 +511,7 @@ std::string ErrorMessage::toXML() const
 
     for (auto it = callStack.crbegin(); it != callStack.crend(); ++it) {
         printer.OpenElement("location", false);
+        printer.PushAttribute("origfile", it->getOrigFile().c_str());
         printer.PushAttribute("file", it->getfile(false).c_str());
         printer.PushAttribute("line", std::max(it->line,0));
         printer.PushAttribute("column", it->column);
@@ -750,6 +754,11 @@ void ErrorMessage::FileLocation::setfile(std::string file)
     mFileName = Path::simplifyPath(std::move(file));
 }
 
+void ErrorMessage::FileLocation::setOrigFile(std::string file)
+{
+    mOrigFileName = Path::simplifyPath(std::move(file));
+}
+
 std::string ErrorMessage::FileLocation::stringify(bool addcolumn) const
 {
     std::string str;

lib/errorlogger.h

@@ -81,6 +81,12 @@ class CPPCHECKLIB ErrorMessage {
          */
         void setfile(std::string file);
 
+        /**
+         * Set the filename.
+         * @param file Filename to set.
+         */
+        void setOrigFile(std::string file);
+
         /**
          * @return the location as a string. Format: [file:line]
          */