---

vhbit · vhbit · commit 46af2f10bef1 · 2014-08-21T11:12:57.000+03:00
yaml --- r: 132962 b: refs/heads/dist-snap c: 69fbef1 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 08a34531111ce02e0db9c7deed291f65508593bd
+refs/heads/dist-snap: 69fbef1d87ffc4807ff75676f30c7ea30bb11a96
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/src/librustrt/unwind.rs b/branches/dist-snap/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`	`}`