Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -8,7 +8,6 @@ runtime_lib=$(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs)
else
static_libs= \
$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la \
$(top_builddir)/mono/io-layer/libwapi.la \
$(top_builddir)/mono/utils/libmonoutils.la \
$(GLIB_LIBS) $(LIBICONV) \
$(LIBGC_STATIC_LIBS)

View File

@@ -104,7 +104,6 @@ monograph_SOURCES = monograph.c
monograph_OBJECTS = monograph.$(OBJEXT)
am__DEPENDENCIES_1 =
@DISABLE_EXECUTABLES_FALSE@am__DEPENDENCIES_2 = $(top_builddir)/mono/metadata/libmonoruntimesgen-static.la \
@DISABLE_EXECUTABLES_FALSE@ $(top_builddir)/mono/io-layer/libwapi.la \
@DISABLE_EXECUTABLES_FALSE@ $(top_builddir)/mono/utils/libmonoutils.la \
@DISABLE_EXECUTABLES_FALSE@ $(am__DEPENDENCIES_1) \
@DISABLE_EXECUTABLES_FALSE@ $(am__DEPENDENCIES_1) \
@@ -209,6 +208,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
CMAKE = @CMAKE@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSC = @CSC@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -241,7 +241,6 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -273,6 +272,7 @@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
MSGFMT = @MSGFMT@
@@ -396,7 +396,6 @@ top_srcdir = @top_srcdir@
@DISABLE_EXECUTABLES_TRUE@runtime_lib = $(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs)
@DISABLE_EXECUTABLES_FALSE@static_libs = \
@DISABLE_EXECUTABLES_FALSE@ $(top_builddir)/mono/metadata/libmonoruntimesgen-static.la \
@DISABLE_EXECUTABLES_FALSE@ $(top_builddir)/mono/io-layer/libwapi.la \
@DISABLE_EXECUTABLES_FALSE@ $(top_builddir)/mono/utils/libmonoutils.la \
@DISABLE_EXECUTABLES_FALSE@ $(GLIB_LIBS) $(LIBICONV) \
@DISABLE_EXECUTABLES_FALSE@ $(LIBGC_STATIC_LIBS)

View File

@@ -260,9 +260,9 @@ method_stats (MonoMethod *method) {
if (i == MONO_CEE_CASTCLASS || i == MONO_CEE_ISINST) {
guint32 token = read32 (ip + 1);
MonoClass *k = mono_class_get (method->klass->image, token);
if (k && k->flags & TYPE_ATTRIBUTE_SEALED)
if (k && mono_class_get_flags (k) & TYPE_ATTRIBUTE_SEALED)
cast_sealed++;
if (k && k->flags & TYPE_ATTRIBUTE_INTERFACE)
if (k && mono_class_get_flags (k) & TYPE_ATTRIBUTE_INTERFACE)
cast_iface++;
total_cast++;
}
@@ -364,7 +364,7 @@ method_stats (MonoMethod *method) {
MonoMethod *cm = mono_get_method (method->klass->image, read32 (ip + 1), NULL);
if (cm && !(cm->flags & METHOD_ATTRIBUTE_VIRTUAL))
nonvirt_callvirt++;
if (cm && (cm->klass->flags & TYPE_ATTRIBUTE_INTERFACE))
if (cm && (mono_class_get_flags (cm->klass) & TYPE_ATTRIBUTE_INTERFACE))
iface_callvirt++;
total_callvirt++;
}
@@ -430,7 +430,7 @@ type_stats (MonoClass *klass) {
MonoClass *parent;
int depth = 1;
if (klass->flags & TYPE_ATTRIBUTE_INTERFACE) {
if (mono_class_get_flags (klass) & TYPE_ATTRIBUTE_INTERFACE) {
num_ifaces++;
return;
}