[CFG] Allow CallExpr's to be looked up in CFG's

r327343 changed the handling for CallExpr in a CFG, which prevented lookups for
CallExpr while other Stmt kinds still worked.  This change carries over the
necessary bits from Stmt function to CallExpr function.

llvm-svn: 327593

2 files changed, 27 insertions, 0 deletions

diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
index 98bffde8919..0672b3d9256 100644
--- a/clang/lib/Analysis/CFG.cpp
+++ b/clang/lib/Analysis/CFG.cpp
@@ -750,6 +750,9 @@ private:
   }
 
   void appendCall(CFGBlock *B, CallExpr *CE) {
+    if (alwaysAdd(CE) && cachedEntry)
+      cachedEntry->second = B;
+
     if (BuildOpts.AddRichCXXConstructors) {
       if (CFGCXXRecordTypedCall::isCXXRecordTypedCall(CE, *Context)) {
         if (const ConstructionContextLayer *Layer =
diff --git a/clang/test/SemaCXX/constant-conversion.cpp b/clang/test/SemaCXX/constant-conversion.cpp
new file mode 100644
index 00000000000..80deabf79a4
--- /dev/null
+++ b/clang/test/SemaCXX/constant-conversion.cpp
@@ -0,0 +1,24 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64-apple-darwin %s
+
+// This file tests -Wconstant-conversion, a subcategory of -Wconversion
+// which is on by default.
+
+constexpr int nines() { return 99999; }
+
+void too_big_for_char(int param) {
+  char warn1 = false ? 0 : 99999;
+  // expected-warning@-1 {{implicit conversion from 'int' to 'char' changes value from 99999 to -97}}
+  char warn2 = false ? 0 : nines();
+  // expected-warning@-1 {{implicit conversion from 'int' to 'char' changes value from 99999 to -97}}
+
+  char warn3 = param > 0 ? 0 : 99999;
+  // expected-warning@-1 {{implicit conversion from 'int' to 'char' changes value from 99999 to -97}}
+  char warn4 = param > 0 ? 0 : nines();
+  // expected-warning@-1 {{implicit conversion from 'int' to 'char' changes value from 99999 to -97}}
+
+  char ok1 = true ? 0 : 99999;
+  char ok2 = true ? 0 : nines();
+
+  char ok3 = true ? 0 : 99999 + 1;
+  char ok4 = true ? 0 : nines() + 1;
+}