Fixed a problem where we mistook normal result

variables for guard variables because the current
class or method named contained the letters "GV".

llvm-svn: 167327

diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp
index e0342c9..967b2c4 100644 (file)
--- a/lldb/source/Expression/IRForTarget.cpp
+++ b/lldb/source/Expression/IRForTarget.cpp
@@ -548,7 +548,7 @@ IRForTarget::CreateResultVariable (llvm::Function &llvm_function)
         const char *value_name = result_name_str.c_str();
         
         if (strstr(value_name, "$__lldb_expr_result_ptr") &&
-            !strstr(value_name, "GV"))
+            strncmp(value_name, "_ZGV", 4))
         {
             result_name = value_name;
             m_result_is_pointer = true;
@@ -556,7 +556,7 @@ IRForTarget::CreateResultVariable (llvm::Function &llvm_function)
         }
         
         if (strstr(value_name, "$__lldb_expr_result") &&
-            !strstr(value_name, "GV")) 
+            strncmp(value_name, "_ZGV", 4))
         {
             result_name = value_name;
             m_result_is_pointer = false;