Fixed the logic in IRForTarget that recognizes

externally-defined variables to match up with
the code in ClangASTSource that produces them.

llvm-svn: 119750

1 files changed, 4 insertions, 4 deletions

diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp
index c3379a12b3b..6dd72e7e95b 100644
--- a/lldb/source/Expression/IRForTarget.cpp
+++ b/lldb/source/Expression/IRForTarget.cpp
@@ -362,9 +362,7 @@ IRForTarget::rewriteObjCConstString(llvm::Module &M,
                                              CFSCWB_arguments.end(),
                                              "CFStringCreateWithBytes",
                                              FirstEntryInstruction);
-    
-    Constant *initializer = NSStr->getInitializer();
-        
+            
     if (!UnfoldConstant(NSStr, CFSCWB_call, FirstEntryInstruction))
     {
         if (log)
@@ -1089,11 +1087,13 @@ bool
 IRForTarget::resolveExternals(Module &M,
                               Function &F)
 {
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+    
     for (Module::global_iterator global = M.global_begin(), end = M.global_end();
          global != end;
          ++global)
     {
-        if ((*global).hasExternalLinkage() &&
+        if (DeclForGlobalValue(M, global) &&
             !MaybeHandleVariable (M, global))
             return false;
     }