[Lldb-commits] [lldb] r344250 - [lldb] rename MinOS::minor to MinOS::minor_version etc. NFC

2018-10-11 Thread Eric Liu via lldb-commits 
Author: ioeric
Date: Thu Oct 11 07:44:12 2018
New Revision: 344250

URL: http://llvm.org/viewvc/llvm-project?rev=344250&view=rev
Log:
[lldb] rename MinOS::minor to MinOS::minor_version etc. NFC

The constructor initializer minor(...)/major(...) can be confused with system
macros `#define minor(...)` on some platforms.

Modified:
lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp

Modified: lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp?rev=344250&r1=344249&r2=344250&view=diff
==
--- lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Thu Oct 11 
07:44:12 2018
@@ -4944,11 +4944,11 @@ namespace {
   };
 
   struct MinOS {
-uint32_t major, minor, patch;
+uint32_t major_version, minor_version, patch_version;
 MinOS(uint32_t version)
-: major(version >> 16),
-  minor((version >> 8) & 0xffu),
-  patch(version & 0xffu) {}
+: major_version(version >> 16),
+  minor_version((version >> 8) & 0xffu),
+  patch_version(version & 0xffu) {}
   };
 } // namespace
 
@@ -5006,8 +5006,8 @@ bool ObjectFileMachO::GetArchitecture(co
 data.GetByteOrder(), &version_min) == 0)
 break;
   MinOS min_os(version_min.version);
-  os << GetOSName(load_cmd.cmd) << min_os.major << '.' << min_os.minor
- << '.' << min_os.patch;
+  os << GetOSName(load_cmd.cmd) << min_os.major_version << '.'
+ << min_os.minor_version << '.' << min_os.patch_version;
   triple.setOSName(os.str());
   return true;
 }
@@ -5037,8 +5037,8 @@ bool ObjectFileMachO::GetArchitecture(co
   OSEnv os_env(build_version.platform);
   if (os_env.os_type.empty())
 continue;
-  os << os_env.os_type << min_os.major << '.' << min_os.minor << '.'
- << min_os.patch;
+  os << os_env.os_type << min_os.major_version << '.'
+ << min_os.minor_version << '.' << min_os.patch_version;
   triple.setOSName(os.str());
   if (!os_env.environment.empty())
 triple.setEnvironmentName(os_env.environment);


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

[Lldb-commits] [lldb] r344252 - [lldb] Surpress copy-elison warning.

2018-10-11 Thread Eric Liu via lldb-commits 
Author: ioeric
Date: Thu Oct 11 07:52:33 2018
New Revision: 344252

URL: http://llvm.org/viewvc/llvm-project?rev=344252&view=rev
Log:
[lldb] Surpress copy-elison warning.

Modified:
lldb/trunk/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp

Modified: lldb/trunk/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp?rev=344252&r1=344251&r2=344252&view=diff
==
--- lldb/trunk/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp 
(original)
+++ lldb/trunk/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp Thu 
Oct 11 07:52:33 2018
@@ -75,7 +75,7 @@ static std::unique_ptr loadPDBF
   if (auto EC = File->parseStreamData())
 return nullptr;
 
-  return std::move(File);
+  return File;
 }
 
 static std::unique_ptr
@@ -119,7 +119,7 @@ loadMatchingPDBFile(std::string exe_path
 
   if (expected_info->getGuid() != guid)
 return nullptr;
-  return std::move(pdb);
+  return pdb;
 }
 
 static bool IsFunctionPrologue(const CompilandIndexItem &cci,


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

[Lldb-commits] [lldb] r332733 - [lldb] Fix compile warnings in r332702

2018-07-06 Thread Eric Liu via lldb-commits 
Author: ioeric
Date: Fri May 18 09:19:52 2018
New Revision: 332733

URL: http://llvm.org/viewvc/llvm-project?rev=332733&view=rev
Log:
[lldb] Fix compile warnings in r332702

Summary:
- Fix #include path
- Fix warning:

error: format specifies type 'unsigned long long' but the argument has type 
'uint64_t'
(aka 'unsigned long') [-Werror,-Wformat]
 ```

Reviewers: labath, javed.absar

Differential Revision: https://reviews.llvm.org/D47072

Modified:
lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp
lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp

Modified: 
lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp?rev=332733&r1=332732&r2=332733&view=diff
==
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp 
(original)
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp Fri 
May 18 09:19:52 2018
@@ -29,7 +29,7 @@
 #endif
 
 // Project includes
-#include "ARM_DWARF_Registers.h"
+#include "Utility/ARM_DWARF_Registers.h"
 #include "Utility/ARM_ehframe_Registers.h"
 
 #include "llvm/ADT/STLExtras.h"

Modified: 
lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp?rev=332733&r1=332732&r2=332733&view=diff
==
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp 
(original)
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp 
Fri May 18 09:19:52 2018
@@ -33,7 +33,7 @@
 #endif
 
 // Project includes
-#include "ARM64_DWARF_Registers.h"
+#include "Utility/ARM64_DWARF_Registers.h"
 
 using namespace lldb;
 using namespace lldb_private;
@@ -293,8 +293,9 @@ int RegisterContextDarwin_arm64::WriteRe
 void RegisterContextDarwin_arm64::LogDBGRegisters(Log *log, const DBG &dbg) {
   if (log) {
 for (uint32_t i = 0; i < 16; i++)
-  log->Printf("BVR%-2u/BCR%-2u = { 0x%8.8llx, 0x%8.8llx } WVR%-2u/WCR%-2u "
-  "= { 0x%8.8llx, 0x%8.8llx }",
+  log->Printf("BVR%-2u/BCR%-2u = { 0x%8.8" PRIu64 ", 0x%8.8" PRIu64
+  " } WVR%-2u/WCR%-2u "
+  "= { 0x%8.8" PRIu64 ", 0x%8.8" PRIu64 " }",
   i, i, dbg.bvr[i], dbg.bcr[i], i, i, dbg.wvr[i], dbg.wcr[i]);
   }
 }


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