commit c33374931295fd22627162f6871b6ba4cbf6a178
author Bob Wilson <bob.wilson@apple.com> Tue Jan 31 23:52:54 2012 +0000
committer Bob Wilson <bob.wilson@apple.com> Tue Jan 31 23:52:54 2012 +0000
tree aaa7ca5b92a95482c54d6170c716ce8b3f511a2f
parent 372e2f4bd4c175b62b65815b604460e491455984

Fix an assertion failure in isMacOSXVersionLT for IOS targets.

Check if the triple OS is IOS instead of checking for arm/thumb architectures
and check that before calling isMacOSXVersionLT.

llvm-svn: 149454

clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp

diff --git a/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
index 6c800a2..68c578e 100644
--- a/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
@@ -286,10 +286,9 @@
 }
 
 static bool supportsNilWithFloatRet(const llvm::Triple &triple) {
-  return triple.getVendor() == llvm::Triple::Apple &&
-         (!triple.isMacOSXVersionLT(10,5) ||
-          triple.getArch() == llvm::Triple::arm || 
-          triple.getArch() == llvm::Triple::thumb);
+  return (triple.getVendor() == llvm::Triple::Apple &&
+          (triple.getOS() == llvm::Triple::IOS ||
+           !triple.isMacOSXVersionLT(10,5)));
 }
 
 void CallAndMessageChecker::HandleNilReceiver(CheckerContext &C,