projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbc862c
)
[mcs] Add better logging for ikvm crashes during HasObject loading
author
Marek Safar
<marek.safar@gmail.com>
Wed, 17 Jun 2015 15:52:51 +0000
(17:52 +0200)
committer
Marek Safar
<marek.safar@gmail.com>
Wed, 17 Jun 2015 15:52:51 +0000
(17:52 +0200)
mcs/mcs/ikvm.cs
patch
|
blob
|
history
diff --git
a/mcs/mcs/ikvm.cs
b/mcs/mcs/ikvm.cs
index da6b0c11ab56b9ab6eda6b3123dff78bbf71082a..42d56ff3334196540490040daf7e8d03c2af4e73 100644
(file)
--- a/
mcs/mcs/ikvm.cs
+++ b/
mcs/mcs/ikvm.cs
@@
-414,7
+414,11
@@
namespace Mono.CSharp
public override bool HasObjectType (Assembly assembly)
{
- return assembly.GetType (compiler.BuiltinTypes.Object.FullName) != null;
+ try {
+ return assembly.GetType (compiler.BuiltinTypes.Object.FullName) != null;
+ } catch (Exception e) {
+ throw new InternalErrorException (e, "Failed to load assembly `{0}'", assembly.FullName);
+ }
}
public override Assembly LoadAssemblyFile (string fileName, bool isImplicitReference)