commit 4d4d63ee18a6ae8550a0f092be425b3ddf63be4f
author Pavel Labath <labath@google.com> Fri Feb 09 11:37:01 2018 +0000
committer Pavel Labath <labath@google.com> Fri Feb 09 11:37:01 2018 +0000
tree 0741169d6ae4cf0884836ec25d112bf7043f3d3b
parent 9ab7f42adcf36ec2e86c2c5abb7b7413195621d2

Fix some warnings in SymbolFilePDB.cpp

llvm-svn: 324730

lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp

diff --git a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
index 52d45c8..f698798 100644
--- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
+++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
@@ -535,10 +535,10 @@
                                     uint32_t resolve_scope,
                                     lldb_private::SymbolContext &sc) {
   uint32_t resolved_flags = 0;
-  if (resolve_scope & eSymbolContextCompUnit |
-      resolve_scope & eSymbolContextVariable |
-      resolve_scope & eSymbolContextFunction |
-      resolve_scope & eSymbolContextBlock |
+  if (resolve_scope & eSymbolContextCompUnit ||
+      resolve_scope & eSymbolContextVariable ||
+      resolve_scope & eSymbolContextFunction ||
+      resolve_scope & eSymbolContextBlock ||
       resolve_scope & eSymbolContextLineEntry) {
     addr_t file_vm_addr = so_addr.GetFileAddress();
     auto symbol_up =
@@ -904,7 +904,6 @@
       if (CPlusPlusLanguage::IsCPPMangledName(name.c_str())) {
         auto demangled_name = pub_sym_up->getUndecoratedName();
         std::vector<uint32_t> ids;
-        auto cstr_name = ConstString(demangled_name);
         auto vm_addr = pub_sym_up->getVirtualAddress();
 
         // PDB public symbol has mangled name for its associated function.
@@ -941,8 +940,8 @@
     return 0;
 
   auto old_size = sc_list.GetSize();
-  if (name_type_mask & eFunctionNameTypeFull |
-      name_type_mask & eFunctionNameTypeBase |
+  if (name_type_mask & eFunctionNameTypeFull ||
+      name_type_mask & eFunctionNameTypeBase ||
       name_type_mask & eFunctionNameTypeMethod) {
     CacheFunctionNames();