diff options
author | Eric Christopher <echristo@apple.com> | 2010-02-03 00:21:58 +0000 |
---|---|---|
committer | Eric Christopher <echristo@apple.com> | 2010-02-03 00:21:58 +0000 |
commit | 0c6a8f9eda4651e0f54a7edf171525d16b1ff3fa (patch) | |
tree | d4cfc3e7844e961316ae70aa4aa2525e9ddb088f /lib/Transforms/Scalar | |
parent | 90567c35606d65369870d37bf41eb04ef817a90d (diff) | |
download | external_llvm-0c6a8f9eda4651e0f54a7edf171525d16b1ff3fa.zip external_llvm-0c6a8f9eda4651e0f54a7edf171525d16b1ff3fa.tar.gz external_llvm-0c6a8f9eda4651e0f54a7edf171525d16b1ff3fa.tar.bz2 |
Recommit this, looks like it wasn't the cause.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@95165 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Scalar')
-rw-r--r-- | lib/Transforms/Scalar/SimplifyLibCalls.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Transforms/Scalar/SimplifyLibCalls.cpp b/lib/Transforms/Scalar/SimplifyLibCalls.cpp index db6ff29..4216e8f 100644 --- a/lib/Transforms/Scalar/SimplifyLibCalls.cpp +++ b/lib/Transforms/Scalar/SimplifyLibCalls.cpp @@ -1213,8 +1213,13 @@ struct StrCpyChkOpt : public LibCallOptimization { if (!SizeCI) return 0; - // We don't have any length information, just lower to a plain strcpy. - if (SizeCI->isAllOnesValue()) + // If a) we don't have any length information, or b) we know this will + // fit then just lower to a plain strcpy. Otherwise we'll keep our + // strcpy_chk call which may fail at runtime if the size is too long. + // TODO: It might be nice to get a maximum length out of the possible + // string lengths for varying. + if (SizeCI->isAllOnesValue() || + SizeCI->getZExtValue() >= GetStringLength(CI->getOperand(2))) return EmitStrCpy(CI->getOperand(1), CI->getOperand(2), B); return 0; |