From: Mike McLaughlin <mikem@microsoft.com>
Date: Thu, 4 Mar 2021 00:06:19 +0000 (-0800)
Subject: Misc createdump fixes (#49038)
X-Git-Tag: submit/tizen/20210909.063632~2899
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c641d977aef70382cbf967ca648f57cc5ea38c0e;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Misc createdump fixes (#49038)

* Misc createdump fixes

* Fixed issue https://github.com/dotnet/runtime/issues/42589

* Code review feedback
---

diff --git a/src/coreclr/debug/createdump/crashinfounix.cpp b/src/coreclr/debug/createdump/crashinfounix.cpp
index 4c72cc7..d300d34 100644
--- a/src/coreclr/debug/createdump/crashinfounix.cpp
+++ b/src/coreclr/debug/createdump/crashinfounix.cpp
@@ -262,7 +262,7 @@ CrashInfo::GetDSOInfo()
 void
 CrashInfo::VisitModule(uint64_t baseAddress, std::string& moduleName)
 {
-    if (baseAddress == 0 || baseAddress == m_auxvValues[AT_SYSINFO_EHDR] || baseAddress == m_auxvValues[AT_BASE]) {
+    if (baseAddress == 0 || baseAddress == m_auxvValues[AT_SYSINFO_EHDR]) {
         return;
     }
     if (m_coreclrPath.empty())
diff --git a/src/coreclr/debug/createdump/createdumpunix.cpp b/src/coreclr/debug/createdump/createdumpunix.cpp
index 6ddc21a..da74dda 100644
--- a/src/coreclr/debug/createdump/createdumpunix.cpp
+++ b/src/coreclr/debug/createdump/createdumpunix.cpp
@@ -45,6 +45,7 @@ CreateDump(const char* dumpPathTemplate, int pid, const char* dumpType, MINIDUMP
     }
     if (!dumpWriter.WriteDump())
     {
+        fprintf(stderr, "Writing dump FAILED\n");
         goto exit;
     }
     result = true;
diff --git a/src/coreclr/debug/createdump/dumpwriter.cpp b/src/coreclr/debug/createdump/dumpwriter.cpp
index 677a8b0..14c144f 100644
--- a/src/coreclr/debug/createdump/dumpwriter.cpp
+++ b/src/coreclr/debug/createdump/dumpwriter.cpp
@@ -219,8 +219,8 @@ DumpWriter::WriteDump()
 
                 // This can happen if the target process dies before createdump is finished
                 if (read == 0) {
-                    TRACE("ReadProcessMemory(%" PRIA PRIx64 ", %08x) return 0 bytes read\n", address, bytesToRead);
-                    break;
+                    fprintf(stderr, "ReadProcessMemory(%" PRIA PRIx64 ", %08x) returned 0 bytes read\n", address, bytesToRead);
+                    return false;
                 }
 
                 if (!WriteData(m_tempBuffer, read)) {