---

eddyb · eddyb · commit 670c5a0e86c3 · 2016-03-17T21:51:51.000+02:00
yaml --- r: 273253 b: refs/heads/beta c: 7454b5c h: refs/heads/master i: 273251: d8229b6
diff --git a/[refs] b/[refs]
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 77f34841489767804ffe3d0f20d5469ecc5cf417
+refs/heads/beta: 7454b5c61de7e4eb6ac0079d38d9a42d9f0d8539
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
diff --git a/branches/beta/src/librustc_trans/trans/abi.rs b/branches/beta/src/librustc_trans/trans/abi.rs
@@ -432,5 +432,9 @@ impl FnType {
                 i += 1;
             }
         }
+
+        if self.cconv != llvm::CCallConv {
+            llvm::SetInstructionCallConv(callsite, self.cconv);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -432,5 +432,9 @@ impl FnType {`
`432`	`432`	`i += 1;`
`433`	`433`	`}`
`434`	`434`	`}`
	`435`	`+`
	`436`	`+ if self.cconv != llvm::CCallConv {`
	`437`	`+ llvm::SetInstructionCallConv(callsite, self.cconv);`
	`438`	`+ }`
`435`	`439`	`}`
`436`	`440`	`}`