Re: [Lldb-commits] [PATCH] D17860: Fix "ninja check-lldb" crash in IRExecutionUnit.cpp

[Ted Woodward via lldb-commits]

ted updated this revision to Diff 50074.
ted added a comment.

Updated to use early-out as requested


http://reviews.llvm.org/D17860

Files:
  source/Expression/IRExecutionUnit.cpp

Index: source/Expression/IRExecutionUnit.cpp
===================================================================
--- source/Expression/IRExecutionUnit.cpp
+++ source/Expression/IRExecutionUnit.cpp
@@ -796,8 +796,8 @@
 
                 sc_list.GetContextAtIndex(si, candidate_sc);
 
-                const bool is_external = (candidate_sc.function) ||
-                                         (candidate_sc.symbol && 
candidate_sc.symbol->IsExternal());
+                if (!candidate_sc.symbol)
+                    continue;
 
                 load_address = 
candidate_sc.symbol->ResolveCallableAddress(*target);
 
@@ -811,7 +811,7 @@
 
                 if (load_address != LLDB_INVALID_ADDRESS)
                 {
-                    if (is_external)
+                    if (candidate_sc.function || 
candidate_sc.symbol->IsExternal())
                     {
                         return true;
                     }



Index: source/Expression/IRExecutionUnit.cpp
===================================================================
--- source/Expression/IRExecutionUnit.cpp
+++ source/Expression/IRExecutionUnit.cpp
@@ -796,8 +796,8 @@
 
                 sc_list.GetContextAtIndex(si, candidate_sc);
 
-                const bool is_external = (candidate_sc.function) ||
-                                         (candidate_sc.symbol && candidate_sc.symbol->IsExternal());
+                if (!candidate_sc.symbol)
+                    continue;
 
                 load_address = candidate_sc.symbol->ResolveCallableAddress(*target);
 
@@ -811,7 +811,7 @@
 
                 if (load_address != LLDB_INVALID_ADDRESS)
                 {
-                    if (is_external)
+                    if (candidate_sc.function || candidate_sc.symbol->IsExternal())
                     {
                         return true;
                     }

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits