commit c6a4f5e819217e1e12c458aed8e7b122e23a3a58
author Stephen Hines <srhines@google.com> Mon Jul 21 00:45:20 2014 -0700
committer Stephen Hines <srhines@google.com> Mon Jul 21 00:45:20 2014 -0700
tree 81b7dd2bb4370a392f31d332a566c903b5744764
parent 19c6fbb3e8aaf74093afa08013134b61fa08f245

Update LLVM for rebase to r212749.

Includes a cherry-pick of:
r212948 - fixes a small issue with atomic calls

Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18

unittests/ADT/PointerUnionTest.cpp

diff --git a/unittests/ADT/PointerUnionTest.cpp b/unittests/ADT/PointerUnionTest.cpp
index 3bfb79c..a592784 100644
--- a/unittests/ADT/PointerUnionTest.cpp
+++ b/unittests/ADT/PointerUnionTest.cpp
@@ -66,7 +66,7 @@
 TEST_F(PointerUnionTest, Get) {
   EXPECT_EQ(a.get<float *>(), &f);
   EXPECT_EQ(b.get<int *>(), &i);
-  EXPECT_EQ(n.get<int *>(), (int *)0);
+  EXPECT_EQ(n.get<int *>(), (int *)nullptr);
 }
 
 } // end anonymous namespace