Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[2019-12] [debugger] Enable reading embedded ppdb #19050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lambdageek merged 1 commit into from
Feb 27, 2020
Merged

[2019-12] [debugger] Enable reading embedded ppdb #19050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion mcs/class/Mono.Debugger.Soft/Test/dtest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,6 @@ public void MetadataAndPdbTest () {

var pdbFromMemory = assemblyMirror.GetPdbBlob ();
if (!File.Exists (pdbPath)) {
Assert.IsFalse (assemblyMirror.HasPdb);
Assert.IsTrue (assemblyMirror.HasFetchedPdb);
continue;
}
Expand Down
2 changes: 0 additions & 2 deletions mono/metadata/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions mono/metadata/debug-mono-ppdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down