Merging r259346 (with adjustments for r258867):

[oota-llvm.git] / lib / Support / SearchForAddressOfSpecialSymbol.cpp

diff --git a/lib/Support/SearchForAddressOfSpecialSymbol.cpp b/lib/Support/SearchForAddressOfSpecialSymbol.cpp
index 2d23902bb85cee8ba05f9babbe6662761af5e760..55f3320f640fd678e2c7d97b0cc708f303606d6f 100644 (file)
--- a/lib/Support/SearchForAddressOfSpecialSymbol.cpp
+++ b/lib/Support/SearchForAddressOfSpecialSymbol.cpp
@@ -48,7 +48,7 @@ static void *DoSearch(const char* symbolName) {
 #endif
 
 #undef EXPLICIT_SYMBOL
-  return 0;
+  return nullptr;
 }
 
 namespace llvm {