Fix for -break-insert main returning multiple bind points (#729)

* Fix for -break-insert main returning multiple bind points This fix is to support -break-insert main returning multiple bind points, which was causing a dictionary error on multiple keys.
microsoft · Jun 12, 2018 · a1141ae · a1141ae
1 parent a097d08
commit a1141ae
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/src/MICore/LaunchCommand.cs b/src/MICore/LaunchCommand.cs
@@ -23,8 +23,9 @@ public class LaunchCommand
         public readonly bool IsMICommand;
         public /*OPTIONAL*/ Action<string> FailureHandler { get; private set; }
         public /*OPTIONAL*/ Func<string, Task> SuccessHandler { get; private set; }
+        public /*Optional*/ Func<Results, Task> SuccessResultsHandler { get; private set; }
 
-        public LaunchCommand(string commandText, string description = null, bool ignoreFailures = false, Action<string> failureHandler = null, Func<string, Task> successHandler = null)
+        public LaunchCommand(string commandText, string description = null, bool ignoreFailures = false, Action<string> failureHandler = null, Func<string, Task> successHandler = null, Func<Results, Task> successResultsHandler = null)
         {
             if (commandText == null)
                 throw new ArgumentNullException("commandText");
@@ -40,6 +41,7 @@ public LaunchCommand(string commandText, string description = null, bool ignoreF
             this.IgnoreFailures = ignoreFailures;
             this.FailureHandler = failureHandler;
             this.SuccessHandler = successHandler;
+            this.SuccessResultsHandler = successResultsHandler;
         }
 
         public static ReadOnlyCollection<LaunchCommand> CreateCollection(List<Json.LaunchOptions.SetupCommand> source)

diff --git a/src/MIDebugEngine/Engine.Impl/DebuggedProcess.cs b/src/MIDebugEngine/Engine.Impl/DebuggedProcess.cs
@@ -50,7 +50,7 @@ internal class DebuggedProcess : MICore.Debugger
         private HashSet<Tuple<string, string>> _fileTimestampWarnings;
         private ProcessSequence _childProcessHandler;
         private bool _deleteEntryPointBreakpoint;
-        private string _entryPointBreakpoint = String.Empty;
+        private string _entryPointBreakpoint = string.Empty;
 
         public DebuggedProcess(bool bLaunched, LaunchOptions launchOptions, ISampleEngineCallback callback, WorkerThread worker, BreakpointManager bpman, AD7Engine engine, HostConfigurationStore configStore, HostWaitLoop waitLoop = null) : base(launchOptions, engine.Logger)
         {
@@ -549,6 +549,11 @@ public async Task Initialize(HostWaitLoop waitLoop, CancellationToken token)
                             {
                                 await command.SuccessHandler(results.ToString());
                             }
+
+                            if (command.SuccessResultsHandler != null)
+                            {
+                                await command.SuccessResultsHandler(results);
+                            }
                         }
                     }
                     else
@@ -752,29 +757,33 @@ private List<LaunchCommand> GetInitializeCommands()
                         commands.Add(new LaunchCommand("-exec-arguments " + _launchOptions.ExeArguments));
                     }
 
-                    Func<string, Task> breakMainSuccessHandler = (string bkptResult) =>
+                    Func<Results, Task> breakMainSuccessResultsHandler = (Results bkptResult) =>
                     {
-                        int index = bkptResult.IndexOf("number=", StringComparison.Ordinal);
-                        if (index > 0)
+                        if (bkptResult.Contains("bkpt"))
                         {
-                            string trimmedInnerText = bkptResult.Substring(index).Trim('\r', '\n', '{', '}');
-                            Dictionary<string, string> dict = trimmedInnerText
-                                .Split(',')
-                                .Select(value => value.Split('='))
-                                .Where(x => x.Length == 2)
-                                .ToDictionary(x => x.First(), x => x.Last());
-
-                            if (dict.Keys.Contains("number"))
+                            ResultValue b = bkptResult.Find("bkpt");
+                            TupleValue bkpt = null;
+                            if (b is TupleValue)
+                            {
+                                bkpt = b as TupleValue;
+                            }
+                            else if (b is ValueListValue) // Used when main breakpoint binds in more than one location
                             {
-                                this._entryPointBreakpoint = dict["number"];
+                                // Grab the first one as this is usually the <MULTIPLE> one that we can unbind them all with.
+                                // This is usually "1" when the children manifest as "1.1", "1.2", etc
+                                bkpt = (b as ValueListValue).Content[0] as TupleValue;
+                            }
+
+                            if (bkpt != null)
+                            {
+                                this._entryPointBreakpoint = bkpt.FindString("number");
                                 this._deleteEntryPointBreakpoint = true;
                             }
                         }
-
                         return Task.FromResult(0);
                     };
 
-                    commands.Add(new LaunchCommand("-break-insert main", ignoreFailures: true, successHandler: breakMainSuccessHandler));
+                    commands.Add(new LaunchCommand("-break-insert main", ignoreFailures: true, successResultsHandler: breakMainSuccessResultsHandler));
 
                     if (null != localLaunchOptions)
                     {