2 files changed, 12 insertions, 0 deletions
diff --git a/clang/test/CodeGenCXX/__null.cpp b/clang/test/CodeGenCXX/__null.cpp
new file mode 100644
index 00000000000..29416ced023
--- /dev/null
+++ b/clang/test/CodeGenCXX/__null.cpp
@@ -0,0 +1,9 @@
+// RUN: clang %s -emit-llvm -o %t
+
+int* a = __null;
+int b = __null;
+
+void f() {
+  int* c = __null;
+  int d = __null;
+}
diff --git a/clang/test/SemaCXX/__null.cpp b/clang/test/SemaCXX/__null.cpp
index 3d78e2e8db7..798e0aa99d1 100644
--- a/clang/test/SemaCXX/__null.cpp
+++ b/clang/test/SemaCXX/__null.cpp
@@ -8,4 +8,7 @@ void f() {
 
   // Verify statically that __null is the right size
   int a[sizeof(typeof(__null)) == sizeof(void*)? 1 : -1];
+  
+  // Verify that null is evaluated as 0.
+  int b[__null ? -1 : 1];
 }