diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-05-15 17:55:51 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-05-15 17:55:51 +0000 |
| commit | bfcc823a5c53dabab8cfc842bfea70e2b69cdee0 (patch) | |
| tree | b3daea2b733e9d363aca8ea272dacf787d9af732 /lib/CodeGen/CodeGenFunction.h | |
| parent | 72bf425fab902f5fd6114b630b8dc3dc0e1de1a8 (diff) | |
When initializing thread-safe statics, put the call to
__cxa_guard_abort along the exceptional edge into (in effect) a nested
"try" that rethrows after aborting. Fixes PR7144 and the remaining
Boost.ProgramOptions failures.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@103880 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenFunction.h')
| -rw-r--r-- | lib/CodeGen/CodeGenFunction.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h index 151c13c808..9761fa0b50 100644 --- a/lib/CodeGen/CodeGenFunction.h +++ b/lib/CodeGen/CodeGenFunction.h @@ -1258,7 +1258,8 @@ public: bool IsInitializer = false); void EmitCXXThrowExpr(const CXXThrowExpr *E); - + void EmitRethrow(); + //===--------------------------------------------------------------------===// // Internal Helpers //===--------------------------------------------------------------------===// |