1 files changed, 5 insertions, 1 deletions
diff --git a/lldb/source/Expression/IRInterpreter.cpp b/lldb/source/Expression/IRInterpreter.cpp
index 5986ebb4a00..fa883527209 100644
--- a/lldb/source/Expression/IRInterpreter.cpp
+++ b/lldb/source/Expression/IRInterpreter.cpp
@@ -151,7 +151,11 @@ public:
         
         if (constant)
         {
-            if (const ConstantInt *constant_int = dyn_cast<ConstantInt>(constant))
+            if (isa<ConstantPointerNull>(constant))
+            {
+                return AssignToMatchType(scalar, 0, value->getType());
+            }
+            else if (const ConstantInt *constant_int = dyn_cast<ConstantInt>(constant))
             {                
                 return AssignToMatchType(scalar, constant_int->getLimitedValue(), value->getType());
             }