diff options
| author | John McCall <rjmccall@apple.com> | 2010-08-11 22:38:33 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-08-11 22:38:33 +0000 |
| commit | b3a29f132794f67108bccc9c7cc3795365e8a965 (patch) | |
| tree | 4ec3011478e15f64e4a7ab4f4eb5d54c2ebf527d /lib/CodeGen/CodeGenFunction.cpp | |
| parent | 2577743c5650c646fb705df01403707e94f2df04 (diff) | |
Revise r110163: don't mark weak functions nounwind, because the optimizer
treats that as a contract to be fulfilled by any replacements.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@110864 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenFunction.cpp')
| -rw-r--r-- | lib/CodeGen/CodeGenFunction.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp index 58d56ef0df..e5cfa624b2 100644 --- a/lib/CodeGen/CodeGenFunction.cpp +++ b/lib/CodeGen/CodeGenFunction.cpp @@ -315,6 +315,10 @@ void CodeGenFunction::EmitFunctionBody(FunctionArgList &Args) { /// non-existence of any throwing calls within it. We believe this is /// lightweight enough to do at -O0. static void TryMarkNoThrow(llvm::Function *F) { + // LLVM treats 'nounwind' on a function as part of the type, so we + // can't do this on functions that can be overwritten. + if (F->mayBeOverridden()) return; + for (llvm::Function::iterator FI = F->begin(), FE = F->end(); FI != FE; ++FI) for (llvm::BasicBlock::iterator BI = FI->begin(), BE = FI->end(); BI != BE; ++BI) |