Coding by inspection has its problems.

llvm-svn: 116672

2 files changed, 6 insertions, 0 deletions

diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp
index acb3ecebd6e..72953ce9249 100644
--- a/clang/lib/CodeGen/CGObjCMac.cpp
+++ b/clang/lib/CodeGen/CGObjCMac.cpp
@@ -6167,6 +6167,8 @@ void CGObjCNonFragileABIMac::EmitThrowStmt(CodeGen::CodeGenFunction &CGF,
                                            const ObjCAtThrowStmt &S) {
   if (const Expr *ThrowExpr = S.getThrowExpr()) {
     llvm::Value *Exception = CGF.EmitScalarExpr(ThrowExpr);
+    Exception = CGF.Builder.CreateBitCast(Exception, ObjCTypes.ObjectPtrTy,
+                                          "tmp");
     llvm::Value *Args[] = { Exception };
     CGF.EmitCallOrInvoke(ObjCTypes.getExceptionThrowFn(),
                          Args, Args+1)
diff --git a/clang/test/CodeGenObjC/exceptions-nonfragile.m b/clang/test/CodeGenObjC/exceptions-nonfragile.m
index 41cda2c0a9c..57ed1d9da9d 100644
--- a/clang/test/CodeGenObjC/exceptions-nonfragile.m
+++ b/clang/test/CodeGenObjC/exceptions-nonfragile.m
@@ -11,3 +11,7 @@ void protos() {
     @throw;
   }
 }
+
+void throwing() {
+  @throw(@"error!");
+}