Bug 446518 - Function breakpoints should be planted after function prologue

2 files changed, 10 insertions, 2 deletions

diff --git a/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java b/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java
index 6b682bb7c..9f4bb0918 100644
--- a/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java
+++ b/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java
@@ -67,7 +67,8 @@ public interface IBreakpoints extends IService {
         PROP_EVENT_TYPE = "EventType",            // String
         PROP_EVENT_ARGS = "EventArgs",            // String or Object
         PROP_CLIENT_DATA = "ClientData",          // Object
-        PROP_ACTION = "Action";                   // String - expression or script
+        PROP_ACTION = "Action",                   // String - expression or script
+        PROP_SKIP_PROLOGUE = "SkipPrologue";      // Boolean
 
     /**
      * @deprecated
@@ -151,7 +152,8 @@ public interface IBreakpoints extends IService {
         CAPABILITY_TEMPORARY = "Temporary",             // Boolean
         CAPABILITY_IGNORE_COUNT = "IgnoreCount",        // Boolean
         CAPABILITY_ACCESS_MODE = "AccessMode",          // Number
-        CAPABILITY_CLIENT_DATA = "ClientData";          // Boolean
+        CAPABILITY_CLIENT_DATA = "ClientData",          // Boolean
+        CAPABILITY_SKIP_PROLOGUE = "SkipPrologue";      // Boolean
 
     /**
      * @deprecated
diff --git a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java
index ab6cd2dfb..82bd75942 100644
--- a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java
+++ b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java
@@ -725,6 +725,12 @@ public class TCFBreakpointsModel {
         else if (p.get(ATTR_FUNCTION) != null) {
             String expr = (String)p.get(ATTR_FUNCTION);
             if (expr != null && expr.length() != 0) m.put(IBreakpoints.PROP_LOCATION, expr);
+            if (capabilities != null) {
+                Object obj = capabilities.get(IBreakpoints.CAPABILITY_SKIP_PROLOGUE);
+                if (obj instanceof Boolean && ((Boolean)obj).booleanValue()) {
+                    m.put(IBreakpoints.PROP_SKIP_PROLOGUE, Boolean.TRUE);
+                }
+            }
         }
         else if (file == null) {
             String address = (String)p.get(ATTR_ADDRESS);