---

vhbit · vhbit · commit 9b3c72130b53 · 2014-08-21T11:12:57.000+03:00
yaml --- r: 129466 b: refs/heads/snap-stage3 c: 69fbef1 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 566b470e138e929e8a93d613372db1ba177c494f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 08a34531111ce02e0db9c7deed291f65508593bd
+refs/heads/snap-stage3: 69fbef1d87ffc4807ff75676f30c7ea30bb11a96
 refs/heads/try: 80b45ddbd351f0a4a939c3a3c4e20b4defec4b35
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/librustrt/unwind.rs b/branches/snap-stage3/src/librustrt/unwind.rs
@@ -333,7 +333,10 @@ pub mod eabi {
             uw::_URC_HANDLER_FOUND // catch!
         }
         else { // cleanup phase
-            uw::_URC_INSTALL_CONTEXT
+            unsafe {
+                __gcc_personality_sj0(_version, actions, _exception_class, _ue_header,
+                                      _context)
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,10 @@ pub mod eabi {`
`333`	`333`	`uw::_URC_HANDLER_FOUND // catch!`
`334`	`334`	`}`
`335`	`335`	`else { // cleanup phase`
`336`		`- uw::_URC_INSTALL_CONTEXT`
	`336`	`+ unsafe {`
	`337`	`+ __gcc_personality_sj0(_version, actions, _exception_class, _ue_header,`
	`338`	`+ _context)`
	`339`	`+ }`
`337`	`340`	`}`
`338`	`341`	`}`
`339`	`342`	`}`