Brought LLVM/Clang up to top of tree. The only

change (besides logging) is that now string
literals in the IR are ConstantDataArrays instead
of ConstantArrays.

llvm-svn: 150142

1 files changed, 4 insertions, 4 deletions

diff --git a/lldb/source/Expression/IRDynamicChecks.cpp b/lldb/source/Expression/IRDynamicChecks.cpp
index 0cf812fbc13..9bf1d8b309d 100644
--- a/lldb/source/Expression/IRDynamicChecks.cpp
+++ b/lldb/source/Expression/IRDynamicChecks.cpp
@@ -512,7 +512,7 @@ private:
                 return false;
             }
             
-            ConstantArray *real_name = dyn_cast<ConstantArray>(metadata->getOperand(0));
+            ConstantDataArray *real_name = dyn_cast<ConstantDataArray>(metadata->getOperand(0));
             
             if (!real_name)
             {
@@ -528,12 +528,12 @@ private:
                 return false;
             }
             
-            if (log)
-                log->Printf("Found call to %s: %s\n", real_name->getAsString().c_str(), PrintValue(call_inst).c_str());
-            
             std::string name_str = real_name->getAsString();
             const char* name_cstr = name_str.c_str();
             
+            if (log)
+                log->Printf("Found call to %s: %s\n", name_cstr, PrintValue(call_inst).c_str());
+            
             if (name_str.find("objc_msgSend") == std::string::npos)
                 return true;