Merge pull request #5675 from mono/glib-debug-symbols

[mono.git] / mcs / mcs / reflection.cs

diff --git a/mcs/mcs/reflection.cs b/mcs/mcs/reflection.cs
index b233b9439cbfd397d52a28c70953d10d3ab8564e..24f25951d583c3ca258fe6b73196ea20036a8f9d 100644 (file)
--- a/mcs/mcs/reflection.cs
+++ b/mcs/mcs/reflection.cs
@@ -48,6 +48,8 @@ namespace Mono.CSharp
                public ReflectionImporter (ModuleContainer module, BuiltinTypes builtin)
                        : base (module)
                {
+                       IgnoreCompilerGeneratedField = false;
+
                        Initialize (builtin);
                }
 
@@ -418,7 +420,7 @@ namespace Mono.CSharp
 
                        default_references.Add ("System");
                        default_references.Add ("System.Xml");
-#if NET_2_1
+#if MOBILE
                        default_references.Add ("System.Net");
                        default_references.Add ("System.Windows");
                        default_references.Add ("System.Windows.Browser");
@@ -440,9 +442,9 @@ namespace Mono.CSharp
                        return Path.GetDirectoryName (typeof (object).Assembly.Location);
                }
 
-               public override bool HasObjectType (Assembly assembly)
+               public override Assembly HasObjectType (Assembly assembly)
                {
-                       return assembly.GetType (compiler.BuiltinTypes.Object.FullName) != null;
+                       return assembly.GetType (compiler.BuiltinTypes.Object.FullName) == null ? null : assembly;
                }
 
                public override Assembly LoadAssemblyFile (string assembly, bool isImplicitReference)