---

eddyb · eddyb · commit 4b5d7cc85334 · 2016-03-17T21:51:51.000+02:00
yaml --- r: 282013 b: refs/heads/stable c: 7454b5c h: refs/heads/master i: 282011: bc80490
diff --git a/[refs] b/[refs]
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 3c795e08d6f4a532f12f3f8e1837db5e0647f8b0
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 77f34841489767804ffe3d0f20d5469ecc5cf417
+refs/heads/stable: 7454b5c61de7e4eb6ac0079d38d9a42d9f0d8539
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e
diff --git a/branches/stable/src/librustc_trans/trans/abi.rs b/branches/stable/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`	`}`