diff --git a/lldb/source/Expression/ExpressionSourceCode.cpp b/lldb/source/Expression/ExpressionSourceCode.cpp
index 1d1c2f1a6ab1..7004d28fa4c4 100644
--- a/lldb/source/Expression/ExpressionSourceCode.cpp
+++ b/lldb/source/Expression/ExpressionSourceCode.cpp
@@ -37,6 +37,8 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
             wrap_stream.Printf("%s                             \n"
                                "#undef NULL                    \n"
                                "#define NULL 0                 \n"
+                               "#undef nil                     \n"
+                               "#define nil (id)0              \n"
                                "typedef unsigned short unichar;\n"
                                "void                           \n"
                                "%s(void *$__lldb_arg)          \n"
@@ -51,6 +53,8 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
             wrap_stream.Printf("%s                                     \n"
                                "#undef NULL                            \n"
                                "#define NULL 0                         \n"
+                               "#undef nil                             \n"
+                               "#define nil (id)0                      \n"
                                "typedef unsigned short unichar;        \n"
                                "void                                   \n"
                                "$__lldb_class::%s(void *$__lldb_arg) %s\n"
@@ -68,6 +72,8 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
                 wrap_stream.Printf("%s                                                      \n"
                                     "#undef NULL                                            \n"
                                     "#define NULL 0                                         \n"
+                                    "#undef nil                                             \n"
+                                    "#define nil (id)0                                      \n"
                                     "typedef unsigned short unichar;                        \n"
                                     "@interface $__lldb_objc_class ($__lldb_category)       \n"
                                     "+(void)%s:(void *)$__lldb_arg;                         \n"
@@ -88,6 +94,8 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
                 wrap_stream.Printf("%s                                                     \n"
                                    "#undef NULL                                            \n"
                                    "#define NULL 0                                         \n"
+                                   "#undef nil                                             \n"
+                                   "#define nil (id)0                                      \n"
                                    "typedef unsigned short unichar;                        \n"
                                    "@interface $__lldb_objc_class ($__lldb_category)       \n"
                                    "-(void)%s:(void *)$__lldb_arg;                         \n"