diff options
author | Fariborz Jahanian <fjahanian@apple.com> | 2012-03-16 16:52:06 +0000 |
---|---|---|
committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-03-16 16:52:06 +0000 |
commit | 40539467ec19e6bc53d47ba650f42aa3f414a53f (patch) | |
tree | c222a8cafac8dcc2479910d2ce010ef7ab01f449 | |
parent | 0961a01ebec0e31664bfe464bf4a0ac7b0891a1f (diff) |
modern objective-c translator: writing @throw statement.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152931 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Rewrite/RewriteModernObjC.cpp | 7 | ||||
-rw-r--r-- | test/Rewriter/rewrite-modern-throw.m | 62 |
2 files changed, 66 insertions, 3 deletions
diff --git a/lib/Rewrite/RewriteModernObjC.cpp b/lib/Rewrite/RewriteModernObjC.cpp index 1081b9df90..855031eb66 100644 --- a/lib/Rewrite/RewriteModernObjC.cpp +++ b/lib/Rewrite/RewriteModernObjC.cpp @@ -1939,8 +1939,8 @@ Stmt *RewriteModernObjC::RewriteObjCThrowStmt(ObjCAtThrowStmt *S) { /* void objc_exception_throw(id) __attribute__((noreturn)); */ if (S->getThrowExpr()) buf = "objc_exception_throw("; - else // add an implicit argument - buf = "objc_exception_throw(_caught"; + else + buf = "throw"; // handle "@ throw" correctly. const char *wBuf = strchr(startBuf, 'w'); @@ -1950,7 +1950,8 @@ Stmt *RewriteModernObjC::RewriteObjCThrowStmt(ObjCAtThrowStmt *S) { const char *semiBuf = strchr(startBuf, ';'); assert((*semiBuf == ';') && "@throw: can't find ';'"); SourceLocation semiLoc = startLoc.getLocWithOffset(semiBuf-startBuf); - ReplaceText(semiLoc, 1, ");"); + if (S->getThrowExpr()) + ReplaceText(semiLoc, 1, ");"); return 0; } diff --git a/test/Rewriter/rewrite-modern-throw.m b/test/Rewriter/rewrite-modern-throw.m new file mode 100644 index 0000000000..96d0e1c9ec --- /dev/null +++ b/test/Rewriter/rewrite-modern-throw.m @@ -0,0 +1,62 @@ +// RUN: %clang_cc1 -x objective-c -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp +// RUN: %clang_cc1 -fsyntax-only -fcxx-exceptions -fexceptions -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp + +void *sel_registerName(const char *); + +@interface Foo @end +void TRY(); +void SPLATCH(); +void MYTRY(); +void MYCATCH(); + +void foo() { + @try { TRY(); } + @catch (...) { SPLATCH(); @throw; } +} + +int main() +{ + + @try { + MYTRY(); + } + + @catch (Foo* localException) { + MYCATCH(); + @throw localException; + } + + // no catch clause + @try { } + @finally { } +} + + +@interface INST +{ + INST* throw_val; +} + +- (id) ThrowThis; + +- (void) MainMeth; + +@end + + +@implementation INST +- (id) ThrowThis { return 0; } + +- (void) MainMeth { + @try { + MYTRY(); + } + @catch (Foo* localException) { + MYCATCH(); + @throw [self ThrowThis]; + } + @catch (...) { + @throw [throw_val ThrowThis]; + } +} +@end |