summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/vm/ceeload.cpp8
-rw-r--r--src/zap/zapimage.cpp4
2 files changed, 10 insertions, 2 deletions
diff --git a/src/vm/ceeload.cpp b/src/vm/ceeload.cpp
index 1541ccf6c6..e389df97e3 100644
--- a/src/vm/ceeload.cpp
+++ b/src/vm/ceeload.cpp
@@ -7179,7 +7179,9 @@ TypeHandle Module::LoadIBCTypeHelper(DataImage *image, CORBBTPROF_BLOB_PARAM_SIG
}
EX_CATCH
{
- image->GetPreloader()->Error(pBlobSigEntry->blob.token, GET_EXCEPTION());
+ if (g_CorCompileVerboseLevel >= CORCOMPILE_VERBOSE)
+ image->GetPreloader()->Error(pBlobSigEntry->blob.token, GET_EXCEPTION());
+
loadedType = TypeHandle();
}
EX_END_CATCH(SwallowAllExceptions)
@@ -7236,7 +7238,9 @@ MethodDesc* Module::LoadIBCMethodHelper(DataImage *image, CORBBTPROF_BLOB_PARAM_
}
EX_CATCH
{
- image->GetPreloader()->Error(pBlobSigEntry->blob.token, GET_EXCEPTION());
+ if (g_CorCompileVerboseLevel >= CORCOMPILE_VERBOSE)
+ image->GetPreloader()->Error(pBlobSigEntry->blob.token, GET_EXCEPTION());
+
enclosingType = TypeHandle();
}
EX_END_CATCH(SwallowAllExceptions)
diff --git a/src/zap/zapimage.cpp b/src/zap/zapimage.cpp
index a70b710fe0..e64c0b67d8 100644
--- a/src/zap/zapimage.cpp
+++ b/src/zap/zapimage.cpp
@@ -3573,6 +3573,10 @@ void ZapImage::Error(mdToken token, HRESULT hr, UINT resID, LPCWSTR message)
if ((resID == IDS_IBC_MISSING_EXTERNAL_TYPE) ||
(resID == IDS_IBC_MISSING_EXTERNAL_METHOD))
{
+ // Suppress printing IBC related warnings except in verbose mode.
+ if (m_zapper->m_pOpt->m_ignoreErrors && !m_zapper->m_pOpt->m_verbose)
+ return;
+
// Supress printing of "The generic type/method specified by the IBC data is not available to this assembly"
level = CORZAP_LOGLEVEL_INFO;
}