From 7d01ddd6f8fe39897f62f33746c219806a0dda29 Mon Sep 17 00:00:00 2001
From: Sean Callanan <scallanan@apple.com>
Date: Fri, 31 May 2013 17:29:03 +0000
Subject: Fixed value evaluation to handle null constants.

<rdar://problem/14005311>

llvm-svn: 183022
---
 lldb/source/Expression/IRInterpreter.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lldb/source/Expression/IRInterpreter.cpp')

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());
             }
-- 
cgit v1.2.3