Author: jbevain
Date: 2007-08-27 17:27:59 -0400 (Mon, 27 Aug 2007)
New Revision: 84919
Modified:
trunk/mcs/tools/linker/ChangeLog
trunk/mcs/tools/linker/Mono.Linker.Steps/OutputStep.cs
trunk/mcs/tools/linker/Mono.Linker/Annotations.cs
trunk/mcs/tools/linker/Mono.Linker/Driver.cs
trunk/mcs/tools/linker/Mono.Linker/LinkContext.cs
Log:
2007-08-27 Jb Evain <[EMAIL PROTECTED]>
* Mono.Linker/Driver.cs
Mono.Linker/Annotations.cs
Mono.Linker/LinkContext.cs
Mono.Linker.Steps/OutputStep.cs:
Implement symbols loading/saving.
Modified: trunk/mcs/tools/linker/ChangeLog
===================================================================
--- trunk/mcs/tools/linker/ChangeLog 2007-08-27 21:08:18 UTC (rev 84918)
+++ trunk/mcs/tools/linker/ChangeLog 2007-08-27 21:27:59 UTC (rev 84919)
@@ -1,3 +1,11 @@
+2007-08-27 Jb Evain <[EMAIL PROTECTED]>
+
+ * Mono.Linker/Driver.cs
+ Mono.Linker/Annotations.cs
+ Mono.Linker/LinkContext.cs
+ Mono.Linker.Steps/OutputStep.cs:
+ Implement symbols loading/saving.
+
2007-08-16 Jb Evain <[EMAIL PROTECTED]>
* Mono.Linker/Driver.cs
Modified: trunk/mcs/tools/linker/Mono.Linker/Annotations.cs
===================================================================
--- trunk/mcs/tools/linker/Mono.Linker/Annotations.cs 2007-08-27 21:08:18 UTC
(rev 84918)
+++ trunk/mcs/tools/linker/Mono.Linker/Annotations.cs 2007-08-27 21:27:59 UTC
(rev 84919)
@@ -37,6 +37,7 @@
private static readonly object _processedKey = new object ();
private static readonly object _preservedKey = new object ();
private static readonly object _publicKey = new object ();
+ private static readonly object _symbolsKey = new object ();
public static AssemblyAction GetAction (AssemblyDefinition
assembly)
{
@@ -123,6 +124,16 @@
return (IAnnotationProvider) obj;
}
+ public static bool HasSymbols (AssemblyDefinition assembly)
+ {
+ return AsProvider (assembly).Annotations.Contains
(_symbolsKey);
+ }
+
+ public static void SetHasSymbols (AssemblyDefinition assembly)
+ {
+ AsProvider (assembly).Annotations [_symbolsKey] =
_symbolsKey;
+ }
+
private Annotations ()
{
}
Modified: trunk/mcs/tools/linker/Mono.Linker/Driver.cs
===================================================================
--- trunk/mcs/tools/linker/Mono.Linker/Driver.cs 2007-08-27 21:08:18 UTC
(rev 84918)
+++ trunk/mcs/tools/linker/Mono.Linker/Driver.cs 2007-08-27 21:27:59 UTC
(rev 84919)
@@ -148,6 +148,9 @@
case 'm':
context.SetParameter (GetParam (),
GetParam ());
break;
+ case 'b':
+ context.LinkSymbols = bool.Parse
(GetParam ());
+ break;
default:
Usage ();
break;
Modified: trunk/mcs/tools/linker/Mono.Linker/LinkContext.cs
===================================================================
--- trunk/mcs/tools/linker/Mono.Linker/LinkContext.cs 2007-08-27 21:08:18 UTC
(rev 84918)
+++ trunk/mcs/tools/linker/Mono.Linker/LinkContext.cs 2007-08-27 21:27:59 UTC
(rev 84919)
@@ -39,6 +39,7 @@
Hashtable _actions;
string _outputDirectory;
Hashtable _parameters;
+ bool _linkSymbols;
AssemblyResolver _resolver;
@@ -56,6 +57,11 @@
set { _coreAction = value; }
}
+ public bool LinkSymbols {
+ get { return _linkSymbols; }
+ set { _linkSymbols = value; }
+ }
+
public IDictionary Actions {
get { return _actions; }
}
@@ -95,6 +101,7 @@
if (File.Exists (name)) {
AssemblyDefinition assembly =
AssemblyFactory.GetAssembly (name);
_resolver.CacheAssembly (assembly);
+ SafeLoadSymbols (assembly);
return assembly;
} else {
AssemblyNameReference reference = new
AssemblyNameReference ();
@@ -109,12 +116,29 @@
AssemblyDefinition assembly = _resolver.Resolve
(reference);
- if (!Annotations.HasAction (assembly))
+ if (SeenFirstTime (assembly)) {
SetAction (assembly);
+ SafeLoadSymbols (assembly);
+ }
return assembly;
}
+ static void SafeLoadSymbols (AssemblyDefinition assembly)
+ {
+ try {
+ assembly.MainModule.LoadSymbols ();
+ Annotations.SetHasSymbols (assembly);
+ } catch {
+ return; // resharper loves this
+ }
+ }
+
+ static bool SeenFirstTime (AssemblyDefinition assembly)
+ {
+ return !Annotations.HasAction (assembly);
+ }
+
static AssemblyNameReference GetReference (IMetadataScope scope)
{
AssemblyNameReference reference;
Modified: trunk/mcs/tools/linker/Mono.Linker.Steps/OutputStep.cs
===================================================================
--- trunk/mcs/tools/linker/Mono.Linker.Steps/OutputStep.cs 2007-08-27
21:08:18 UTC (rev 84918)
+++ trunk/mcs/tools/linker/Mono.Linker.Steps/OutputStep.cs 2007-08-27
21:27:59 UTC (rev 84919)
@@ -60,6 +60,7 @@
switch (Annotations.GetAction (assembly)) {
case AssemblyAction.Link:
+ SaveSymbols (assembly);
AssemblyFactory.SaveAssembly (assembly,
GetAssemblyFileName (assembly, directory));
break;
case AssemblyAction.Copy:
@@ -68,6 +69,17 @@
}
}
+ void SaveSymbols (AssemblyDefinition assembly)
+ {
+ if (!Context.LinkSymbols)
+ return;
+
+ if (!Annotations.HasSymbols (assembly))
+ return;
+
+ assembly.MainModule.SaveSymbols();
+ }
+
static void CopyConfigFileIfNeeded (AssemblyDefinition
assembly, string directory)
{
string config = GetConfigFile
(GetOriginalAssemblyFileInfo (assembly).FullName);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches