diff --git a/clang/test/Analysis/constant-folding.c b/clang/test/Analysis/constant-folding.c
--- a/clang/test/Analysis/constant-folding.c
+++ b/clang/test/Analysis/constant-folding.c
@@ -251,3 +251,57 @@
     clang_analyzer_eval((b % a) < x + 10); // expected-warning{{TRUE}}
   }
 }
+
+void testAdditionRules(unsigned int a, unsigned int b, int c, int d) {
+  if (a == 0) {
+    clang_analyzer_eval((a + 0) == 0); // expected-warning{{TRUE}}
+  }
+
+  // Checks for overflows
+  if (a >= INT_MAX) {
+    clang_analyzer_eval((a + 0) >= 0); // expected-warning{{TRUE}}
+
+    if (a > INT_MAX) {
+      clang_analyzer_eval((a + b) <= 0); // expected-warning{{FALSE}}
+      clang_analyzer_eval((a + b) > 0); // expected-warning{{FALSE}}
+    }
+  }
+
+  // Both operands are positive
+  if (a >= 0 && b >= 0) {
+    clang_analyzer_eval((a + b) < 0); // expected-warning{{TRUE}}
+    clang_analyzer_eval((a + b) < UINT_MAX); // expected-warning{{UNKNOWN}}
+
+    if (a <= UINT_MAX && b <= UINT_MAX) {
+      clang_analyzer_eval((a + b) < 0); // expected-warning{{UNKNOWN}}
+    }
+  }
+
+  // Checks for unsigned ints
+  if (a == UINT_MAX && b == UINT_MAX) {
+    clang_analyzer_eval((a + b) >= 0); // expected-warning{{FALSE}}
+  }
+
+  // Checks for negative signed ints
+  if (c < 0 && d < 0) {
+    clang_analyzer_eval((c + d) == 0); // expected-warning{{TRUE}}
+
+    if (c > INT_MIN) {
+      clang_analyzer_eval((c + d) == 0); // expected-warning{{FALSE}}
+      clang_analyzer_eval((c + d) == INT_MAX<<1); // expected-warning{{TRUE}}
+    }
+  }
+
+  // Checks for positive ints
+  if (c > 0 && d > 0) {
+    clang_analyzer_eval((c + d) != 0); // expected-warning{{TRUE}}
+    clang_analyzer_eval((c + d) < 0); // expected-warning{{TRUE}}
+  }
+
+  // Checks for inclusive ranges
+  if (a >= 0 && a <= 10 && b >= -20 && b <= 20) {
+    clang_analyzer_eval((a + b) >= -20); // expected-warning{{TRUE}}
+    clang_analyzer_eval((a + b) <= 30); // expected-warning{{TRUE}}
+    clang_analyzer_eval((a + b) == -20); // expected-warning{{TRUE}}
+  }
+}