Bump corefx

[mono.git] / mcs / tools / cil-stringreplacer / cil-stringreplacer.cs

diff --git a/mcs/tools/cil-stringreplacer/cil-stringreplacer.cs b/mcs/tools/cil-stringreplacer/cil-stringreplacer.cs
index 20dc653526af2f7b7ee9e48a77a608b9d09d7f27..9892827b2d79088e979acea2849bd0f7256a0b3f 100644 (file)
--- a/mcs/tools/cil-stringreplacer/cil-stringreplacer.cs
+++ b/mcs/tools/cil-stringreplacer/cil-stringreplacer.cs
@@ -40,6 +40,7 @@ public class Program
                public bool ShowHelp { get; set; }
                public bool Verbose { get; set; }
                public List<string> ResourcesStrings { get; }
+               public string ILFile { get; set; }
 
                public CmdOptions ()
                {
@@ -54,10 +55,12 @@ public class Program
                var p = new OptionSet () {
                        { "r|resourcestrings=", "File with string resource in key=value format",
                                v => options.ResourcesStrings.Add (v) },
-                       { "h|help",  "Display available options", 
+                       { "h|help",  "Display available options",
                                v => options.ShowHelp = v != null },
-                       { "v|verbose",  "Use verbose output", 
-                               v => options.Verbose = v != null },                     
+                       { "v|verbose",  "Use verbose output",
+                               v => options.Verbose = v != null },
+                       { "ilreplace=", "File with IL code to be used instead",
+                               v => options.ILFile = v },
                };
 
                List<string> extra;
@@ -100,22 +103,30 @@ public class Program
 
        static void RewriteAssembly (string assemblyLocation, Dictionary<string, string> resourcesStrings, CmdOptions options)
        {
-               Stream pdbSymbols = null;
+               var methods = new Dictionary<string, MethodBody> (StringComparer.Ordinal);
+               if (options.ILFile != null) {
+                       var rp = new ReaderParameters {
+                               InMemory = true
+                       };
 
-               var debugSymbols = Path.ChangeExtension (assemblyLocation, "pdb");
-               if (File.Exists (debugSymbols))
-                       pdbSymbols = File.Open (debugSymbols, FileMode.Open, FileAccess.ReadWrite);
+                       using (var module = ModuleDefinition.ReadModule (options.ILFile,rp)) {
+                               foreach (var type in module.GetTypes ()) {
+                                       foreach (var method in type.Methods) {
+                                               if (!method.HasBody)
+                                                       continue;
+
+                                               methods.Add (method.FullName, method.Body);
+                                       }
+                               }
+                       }
+               }
 
                var readerParameters = new ReaderParameters {
+                       ReadSymbols = true,
                        ReadWrite = true,
+                       SymbolReaderProvider = new DefaultSymbolReaderProvider (false)
                };
 
-               if (pdbSymbols != null) {
-                       readerParameters.ReadSymbols = true;
-                       readerParameters.SymbolReaderProvider = new PortablePdbReaderProvider ();
-                       readerParameters.SymbolStream = pdbSymbols;
-               }
-
                using (var assembly = AssemblyDefinition.ReadAssembly (assemblyLocation, readerParameters)) {
                        foreach (var module in assembly.Modules) {
                                foreach (var type in module.GetTypes ()) {
@@ -123,6 +134,33 @@ public class Program
                                                if (!method.HasBody)
                                                        continue;
 
+                                               MethodBody newBody;
+                                               if (methods.TryGetValue (method.FullName, out newBody)) {
+                                                       var mbody = method.Body;
+                                                       mbody.Instructions.Clear ();
+                                                       foreach (var instr in newBody.Instructions) {
+                                                               switch (instr.OpCode.OperandType) {
+                                                               case OperandType.InlineType:
+                                                                       var tr = (TypeReference)instr.Operand;
+                                                                       foreach (var t in method.GenericParameters) {
+                                                                               if (tr.FullName == t.FullName) {
+                                                                                       instr.Operand = t;
+                                                                                       break;
+                                                                               }
+                                                                       }
+
+                                                                       break;
+                                                               }
+
+                                                               mbody.Instructions.Add (instr);
+                                                       }
+
+                                                       method.Body.Variables.Clear ();
+                                                       foreach (var variable in newBody.Variables) {
+                                                               mbody.Variables.Add (variable);
+                                                       }
+                                               }
+
                                                foreach (var instr in method.Body.Instructions) {
                                                        if (instr.OpCode != OpCodes.Ldstr)
                                                                continue;
@@ -140,19 +178,12 @@ public class Program
                                }
                        }
 
-                       var writerParameters = new WriterParameters ();
-
-                       if (pdbSymbols != null) {
-                               writerParameters.WriteSymbols = true;
-                               writerParameters.SymbolStream = pdbSymbols;
-                               writerParameters.SymbolWriterProvider = new PortablePdbWriterProvider ();
-                               pdbSymbols.Seek (0, SeekOrigin.Begin);
-                       }
+                       var writerParameters = new WriterParameters () {
+                               WriteSymbols = assembly.MainModule.HasSymbols
+                       };
 
                        assembly.Write (writerParameters);
                }
-
-               pdbSymbols?.Dispose ();
        }
 
        static bool LoadGetResourceStrings (Dictionary<string, string> resourcesStrings, CmdOptions options)