[Lldb-commits] [PATCH] D65165: [Symbol] Fix some botched logic in Variable::GetLanguage

[Alex Langford via Phabricator via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL366950: [Symbol] Fix some botched logic in 
Variable::GetLanguage (authored by xiaobai, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D65165/new/

https://reviews.llvm.org/D65165

Files:
  lldb/trunk/source/Symbol/Variable.cpp


Index: lldb/trunk/source/Symbol/Variable.cpp
===================================================================
--- lldb/trunk/source/Symbol/Variable.cpp
+++ lldb/trunk/source/Symbol/Variable.cpp
@@ -59,12 +59,12 @@
     return lang;
 
   if (auto *func = m_owner_scope->CalculateSymbolContextFunction()) {
-    if ((lang = func->GetLanguage()) && lang != lldb::eLanguageTypeUnknown)
+    if ((lang = func->GetLanguage()) != lldb::eLanguageTypeUnknown)
+      return lang;
+  } else if (auto *comp_unit =
+                 m_owner_scope->CalculateSymbolContextCompileUnit()) {
+    if ((lang = comp_unit->GetLanguage()) != lldb::eLanguageTypeUnknown)
       return lang;
-    else if (auto *comp_unit =
-                 m_owner_scope->CalculateSymbolContextCompileUnit())
-      if ((lang = func->GetLanguage()) && lang != lldb::eLanguageTypeUnknown)
-        return lang;
   }
 
   return lldb::eLanguageTypeUnknown;



Index: lldb/trunk/source/Symbol/Variable.cpp
===================================================================
--- lldb/trunk/source/Symbol/Variable.cpp
+++ lldb/trunk/source/Symbol/Variable.cpp
@@ -59,12 +59,12 @@
     return lang;
 
   if (auto *func = m_owner_scope->CalculateSymbolContextFunction()) {
-    if ((lang = func->GetLanguage()) && lang != lldb::eLanguageTypeUnknown)
+    if ((lang = func->GetLanguage()) != lldb::eLanguageTypeUnknown)
+      return lang;
+  } else if (auto *comp_unit =
+                 m_owner_scope->CalculateSymbolContextCompileUnit()) {
+    if ((lang = comp_unit->GetLanguage()) != lldb::eLanguageTypeUnknown)
       return lang;
-    else if (auto *comp_unit =
-                 m_owner_scope->CalculateSymbolContextCompileUnit())
-      if ((lang = func->GetLanguage()) && lang != lldb::eLanguageTypeUnknown)
-        return lang;
   }
 
   return lldb::eLanguageTypeUnknown;

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