---

yaml
---
r: 235513
b: refs/heads/stable
c: c55d3f1
h: refs/heads/master
i:
  235511: 4248fad
v: v3

Author: richo

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: ea317e8ea40f0d50fc5d1874bed039040f978596
+refs/heads/stable: c55d3f1ba1e78466d2f5703a9e291f4849ddcc94
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/rt/rust_try.ll

@@ -14,7 +14,9 @@
 
 ; See also: libstd/rt/unwind/mod.rs
 
-define i8* @rust_try(void (i8*)* %f, i8* %env) {
+define i8* @rust_try(void (i8*)* %f, i8* %env)
+    personality i8* bitcast (i32 (...)* @rust_eh_personality_catch to i8*)
+{
 
     %1 = invoke i8* @rust_try_inner(void (i8*)* %f, i8* %env)
         to label %normal
@@ -24,13 +26,15 @@ normal:
     ret i8* %1
 
 catch:
-    landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @rust_eh_personality_catch to i8*)
-        catch i8* null
-    ; rust_try_inner's landing pad does not resume unwinds, so execution will never reach here
+    landingpad { i8*, i32 } catch i8* null
+    ; rust_try_inner's landing pad does not resume unwinds, so execution will
+    ; never reach here
     ret i8* null
 }
 
-define internal i8* @rust_try_inner(void (i8*)* %f, i8* %env) {
+define internal i8* @rust_try_inner(void (i8*)* %f, i8* %env)
+    personality i8* bitcast (i32 (...)* @rust_eh_personality to i8*)
+{
 
     invoke void %f(i8* %env)
         to label %normal
@@ -40,8 +44,7 @@ normal:
     ret i8* null
 
 catch:
-    %1 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @rust_eh_personality to i8*)
-        catch i8* null
+    %1 = landingpad { i8*, i32 } catch i8* null
     ; extract and return pointer to the exception object
     %2 = extractvalue { i8*, i32 } %1, 0
     ret i8* %2

branches/stable/src/rt/rust_try_msvc_64.ll

@@ -21,7 +21,9 @@
 ;
 ; See also: src/libstd/rt/unwind/seh.rs
 
-define i8* @rust_try(void (i8*)* %f, i8* %env) {
+define i8* @rust_try(void (i8*)* %f, i8* %env)
+    personality i8* bitcast (i32 (...)* @__C_specific_handler to i8*)
+{
     invoke void %f(i8* %env)
         to label %normal
         unwind label %catch
@@ -58,8 +60,8 @@ normal:
 ; but apparently LLVM chokes on this, so we do the more complicated thing to
 ; placate it.
 catch:
-    %vals = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__C_specific_handler to i8*)
-        catch i8* bitcast (i32 (i8*, i8*)* @__rust_try_filter to i8*)
+    %vals = landingpad { i8*, i32 }
+              catch i8* bitcast (i32 (i8*, i8*)* @__rust_try_filter to i8*)
     %ehptr = extractvalue { i8*, i32 } %vals, 0
     %sel = extractvalue { i8*, i32 } %vals, 1
     %filter_sel = call i32 @llvm.eh.typeid.for(i8* bitcast (i32 (i8*, i8*)* @__rust_try_filter to i8*))