diff options
| author | monojenkins <jo.shields+jenkins@xamarin.com> | 2020-02-27 04:10:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 04:10:15 +0300 |
| commit | b33fa1d00ed3b3c16c9abf8c623bb089c6ddc669 (patch) | |
| tree | 7804beb58ef1013004f2ba50699e5c9b2e52ce1a | |
| parent | 8a687a40444439c4ffee13c51b61062e6e252a51 (diff) | |
Backport 2020-02 enable embedded ppdb. (#19050)mono-6.10.0.87
Co-authored-by: Thays Grazia <thaystg@gmail.com>
| -rw-r--r-- | mcs/class/Mono.Debugger.Soft/Test/dtest.cs | 1 | ||||
| -rw-r--r-- | mono/metadata/Makefile.am | 2 | ||||
| -rw-r--r-- | mono/metadata/debug-mono-ppdb.c | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs index 05d112e3f88..c385aeecb4b 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs @@ -470,7 +470,6 @@ public class DebuggerTests var pdbFromMemory = assemblyMirror.GetPdbBlob (); if (!File.Exists (pdbPath)) { - Assert.IsFalse (assemblyMirror.HasPdb); Assert.IsTrue (assemblyMirror.HasFetchedPdb); continue; } diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am index e0163c4ec53..dc3d48b03c0 100644 --- a/mono/metadata/Makefile.am +++ b/mono/metadata/Makefile.am @@ -130,13 +130,11 @@ libmonoruntime_config_la_CPPFLAGS = $(AM_CPPFLAGS) -DMONO_BINDIR=\"$(bindir)/\" # # Support is a separate library because it is not valid C++. # -if !ENABLE_NETCORE support_libraries = libmonoruntime-support.la libmonoruntime_support_la_SOURCES = support.c libmonoruntime_support_la_LDFLAGS = $(Z_LIBS) libmonoruntime_support_la_CFLAGS = $(filter-out @CXX_REMOVE_CFLAGS@, @CFLAGS@) @ZLIB_CFLAGS@ -endif # # This library contains the icall tables if the runtime was configured with --disable-icall-tables diff --git a/mono/metadata/debug-mono-ppdb.c b/mono/metadata/debug-mono-ppdb.c index 3a76e353e3f..f89aaf4e380 100644 --- a/mono/metadata/debug-mono-ppdb.c +++ b/mono/metadata/debug-mono-ppdb.c @@ -172,8 +172,7 @@ mono_ppdb_load_file (MonoImage *image, const guint8 *raw_contents, int size) return NULL; } -// Temporarily disabled to unblock Roslyn -#if HOST_WIN32 //|| HAVE_SYS_ZLIB +#if HOST_WIN32 || HAVE_SYS_ZLIB if (ppdb_data) { /* Embedded PPDB data */ /* ppdb_size is the uncompressed size */ @@ -436,7 +435,8 @@ mono_ppdb_lookup_location (MonoDebugMethodInfo *minfo, uint32_t offset) } location = g_new0 (MonoDebugSourceLocation, 1); - location->source_file = docname; + if (docname && docname [0]) + location->source_file = docname; location->row = start_line; location->column = start_col; location->il_offset = iloffset; |