---

yaml
---
r: 10351
b: refs/heads/snap-stage3
c: c816eea
h: refs/heads/master
i:
  10349: f8afd0e
  10347: 100bc36
  10343: 3fa6bd5
  10335: 92498a5
v: v3

Author: brson

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 469ff08e646d4f56403a8d6dbd97d146bd8eeefb
+refs/heads/snap-stage3: c816eea000f56e250bb251dc1a1d357efd5a0438
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/libstd/dbg.rs

@@ -9,6 +9,7 @@ export debug_tag;
 export debug_fn;
 export ptr_cast;
 export refcount;
+export breakpoint;
 
 #[abi = "cdecl"]
 native mod rustrt {
@@ -18,6 +19,7 @@ native mod rustrt {
     fn debug_tag(td: *sys::type_desc, x: *());
     fn debug_fn(td: *sys::type_desc, x: *());
     fn debug_ptrcast(td: *sys::type_desc, x: *()) -> *();
+    fn rust_dbg_breakpoint();
 }
 
 fn debug_tydesc<T>() {
@@ -51,6 +53,18 @@ fn refcount<T>(a: @T) -> uint unsafe {
     ret *p;
 }
 
+#[doc = "Triggers a debugger breakpoint"]
+fn breakpoint() {
+    rustrt::rust_dbg_breakpoint();
+}
+
+#[test]
+fn test_breakpoint_should_not_abort_process_when_not_under_gdb() {
+    // Triggering a breakpoint involves raising SIGTRAP, which terminates
+    // the process under normal circumstances
+    breakpoint();
+}
+
 // Local Variables:
 // mode: rust;
 // fill-column: 78;

branches/snap-stage3/src/rt/rust_builtin.cpp

@@ -805,6 +805,11 @@ rust_dbg_call(dbg_callback cb, void *data) {
     return cb(data);
 }
 
+extern "C" CDECL void
+rust_dbg_breakpoint() {
+    BREAKPOINT_AWESOME;
+}
+
 extern "C" CDECL rust_sched_id
 rust_osmain_sched_id() {
     rust_task *task = rust_get_current_task();

branches/snap-stage3/src/rt/rust_debug.h

@@ -7,6 +7,19 @@
 #include <string>
 #include <cstdlib>
 
+#ifndef _WIN32
+
+#include <signal.h>
+#define BREAKPOINT_AWESOME                      \
+    do {                                        \
+        signal(SIGTRAP, SIG_IGN);               \
+        raise(SIGTRAP);                         \
+    } while (0)
+
+#else
+#define BREAKPOINT_AWESOME
+#endif
+
 struct rust_task;
 
 namespace debug {

branches/snap-stage3/src/rt/rustrt.def.in

@@ -151,6 +151,7 @@ rust_dbg_lock_unlock
 rust_dbg_lock_wait
 rust_dbg_lock_signal
 rust_dbg_call
+rust_dbg_breakpoint
 rust_osmain_sched_id
 rust_compare_and_swap_ptr
 rust_atomic_increment