[Lldb-commits] [lldb] r372483 - [LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition to MSVC defines

2019-09-21 Thread Martin Storsjo via lldb-commits 
Author: mstorsjo
Date: Sat Sep 21 12:09:49 2019
New Revision: 372483

URL: http://llvm.org/viewvc/llvm-project?rev=372483&view=rev
Log:
[LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition 
to MSVC defines

This matches how it is done in all other similar ifdefs throughout
lldb.

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

Modified:
lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp
lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp

Modified: 
lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp?rev=372483&r1=372482&r2=372483&view=diff
==
--- lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp 
(original)
+++ lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp 
Sat Sep 21 12:09:49 2019
@@ -84,7 +84,7 @@ bool RegisterContextWindows::AddHardware
   case 1:
   case 2:
   case 4:
-#if defined(_M_AMD64)
+#if defined(__x86_64__) || defined(_M_AMD64)
   case 8:
 #endif
 break;

Modified: 
lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp?rev=372483&r1=372482&r2=372483&view=diff
==
--- lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp 
(original)
+++ lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp 
Sat Sep 21 12:09:49 2019
@@ -21,9 +21,9 @@
 #include "TargetThreadWindows.h"
 
 // TODO support _M_ARM and _M_ARM64
-#if defined(_M_AMD64)
+#if defined(__x86_64__) || defined(_M_AMD64)
 #include "x64/RegisterContextWindows_x64.h"
-#elif defined(_M_IX86)
+#elif defined(__i386__) || defined(_M_IX86)
 #include "x86/RegisterContextWindows_x86.h"
 #endif
 
@@ -77,7 +77,7 @@ TargetThreadWindows::CreateRegisterConte
 break;
 
   case llvm::Triple::x86:
-#if defined(_M_IX86)
+#if defined(__i386__) || defined(_M_IX86)
 m_thread_reg_ctx_sp.reset(
 new RegisterContextWindows_x86(*this, concrete_frame_idx));
 #else
@@ -86,7 +86,7 @@ TargetThreadWindows::CreateRegisterConte
 break;
 
   case llvm::Triple::x86_64:
-#if defined(_M_AMD64)
+#if defined(__x86_64__) || defined(_M_AMD64)
 m_thread_reg_ctx_sp.reset(
 new RegisterContextWindows_x64(*this, concrete_frame_idx));
 #else


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

[Lldb-commits] [lldb] r372482 - [LLDB] Fix compilation for MinGW, remove redundant class name on inline member

2019-09-21 Thread Martin Storsjo via lldb-commits 
Author: mstorsjo
Date: Sat Sep 21 12:09:43 2019
New Revision: 372482

URL: http://llvm.org/viewvc/llvm-project?rev=372482&view=rev
Log:
[LLDB] Fix compilation for MinGW, remove redundant class name on inline member

This fixes build errors like these:

NativeRegisterContextWindows.h:22:33: error: extra qualification on member 
'NativeRegisterContextWindows'
  NativeRegisterContextWindows::NativeRegisterContextWindows(
  ~~^

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

Modified:

lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h

Modified: 
lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h?rev=372482&r1=372481&r2=372482&view=diff
==
--- 
lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h 
(original)
+++ 
lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h 
Sat Sep 21 12:09:43 2019
@@ -19,7 +19,7 @@ class NativeThreadWindows;
 
 class NativeRegisterContextWindows : public NativeRegisterContextRegisterInfo {
 public:
-  NativeRegisterContextWindows::NativeRegisterContextWindows(
+  NativeRegisterContextWindows(
   NativeThreadProtocol &native_thread,
   RegisterInfoInterface *reg_info_interface_p);
 


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

[Lldb-commits] [lldb] r372485 - [LLDB] Use SetErrorStringWithFormatv for cases that use LLVM style format strings

2019-09-21 Thread Martin Storsjo via lldb-commits 
Author: mstorsjo
Date: Sat Sep 21 12:10:00 2019
New Revision: 372485

URL: http://llvm.org/viewvc/llvm-project?rev=372485&view=rev
Log:
[LLDB] Use SetErrorStringWithFormatv for cases that use LLVM style format 
strings

SetErrorStringWithFormat only supports normal printf style format
strings.

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

Modified:
lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp

Modified: 
lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp?rev=372485&r1=372484&r2=372485&view=diff
==
--- lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp 
(original)
+++ lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp 
Sat Sep 21 12:10:00 2019
@@ -177,9 +177,9 @@ Status NativeProcessWindows::Detach() {
 else
   LLDB_LOG(log, "Detaching process error: {0}", error);
   } else {
-error.SetErrorStringWithFormat("error: process {0} in state = {1}, but "
-   "cannot detach it in this state.",
-   GetID(), state);
+error.SetErrorStringWithFormatv("error: process {0} in state = {1}, but "
+"cannot detach it in this state.",
+GetID(), state);
 LLDB_LOG(log, "error: {0}", error);
   }
   return error;

Modified: lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp?rev=372485&r1=372484&r2=372485&view=diff
==
--- lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp 
(original)
+++ lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp Sat Sep 
21 12:10:00 2019
@@ -170,9 +170,9 @@ Status ProcessWindows::DoDetach(bool kee
 else
   LLDB_LOG(log, "Detaching process error: {0}", error);
   } else {
-error.SetErrorStringWithFormat("error: process {0} in state = {1}, but "
-   "cannot detach it in this state.",
-   GetID(), private_state);
+error.SetErrorStringWithFormatv("error: process {0} in state = {1}, but "
+"cannot detach it in this state.",
+GetID(), private_state);
 LLDB_LOG(log, "error: {0}", error);
   }
   return error;


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

[Lldb-commits] [lldb] r372486 - [LLDB] Cast -1 (as invalid socket) to the socket type before comparing

2019-09-21 Thread Martin Storsjo via lldb-commits 
Author: mstorsjo
Date: Sat Sep 21 12:10:15 2019
New Revision: 372486

URL: http://llvm.org/viewvc/llvm-project?rev=372486&view=rev
Log:
[LLDB] Cast -1 (as invalid socket) to the socket type before comparing

This silences warnings about comparison of integers between unsigned
long long (which is what the Windows SOCKET type is) and signed int
when building in MinGW mode.

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

Modified:
lldb/trunk/source/Host/common/Socket.cpp
lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp

Modified: lldb/trunk/source/Host/common/Socket.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Socket.cpp?rev=372486&r1=372485&r2=372486&view=diff
==
--- lldb/trunk/source/Host/common/Socket.cpp (original)
+++ lldb/trunk/source/Host/common/Socket.cpp Sat Sep 21 12:10:15 2019
@@ -476,11 +476,11 @@ NativeSocket Socket::AcceptSocket(Native
   if (!child_processes_inherit) {
 flags |= SOCK_CLOEXEC;
   }
-  NativeSocket fd = llvm::sys::RetryAfterSignal(-1, ::accept4,
-  sockfd, addr, addrlen, flags);
+  NativeSocket fd = llvm::sys::RetryAfterSignal(
+  static_cast(-1), ::accept4, sockfd, addr, addrlen, flags);
 #else
-  NativeSocket fd = llvm::sys::RetryAfterSignal(-1, ::accept,
-  sockfd, addr, addrlen);
+  NativeSocket fd = llvm::sys::RetryAfterSignal(
+  static_cast(-1), ::accept, sockfd, addr, addrlen);
 #endif
   if (fd == kInvalidSocketValue)
 SetLastError(error);

Modified: lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp?rev=372486&r1=372485&r2=372486&view=diff
==
--- lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp (original)
+++ lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp Sat Sep 21 12:10:15 2019
@@ -93,8 +93,9 @@ SOCKET AcceptConnection(int portno) {
 } else {
   listen(sockfd, 5);
   socklen_t clilen = sizeof(cli_addr);
-  newsockfd = llvm::sys::RetryAfterSignal(-1, accept,
-  sockfd, (struct sockaddr *)&cli_addr, &clilen);
+  newsockfd =
+  llvm::sys::RetryAfterSignal(static_cast(-1), accept, sockfd,
+  (struct sockaddr *)&cli_addr, &clilen);
   if (newsockfd < 0)
 if (g_vsc.log)
   *g_vsc.log << "error: accept (" << strerror(errno) << ")"


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

[Lldb-commits] [lldb] r372484 - [LLDB] Use LLVM_FALLTHROUGH instead of a custom comment

2019-09-21 Thread Martin Storsjo via lldb-commits 
Author: mstorsjo
Date: Sat Sep 21 12:09:54 2019
New Revision: 372484

URL: http://llvm.org/viewvc/llvm-project?rev=372484&view=rev
Log:
[LLDB] Use LLVM_FALLTHROUGH instead of a custom comment

This fixes a warning when built with Clang in MinGW mode.

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

Modified:
lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp

Modified: 
lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp?rev=372484&r1=372483&r2=372484&view=diff
==
--- lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp 
(original)
+++ lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp 
Sat Sep 21 12:09:54 2019
@@ -479,7 +479,7 @@ NativeProcessWindows::OnDebugException(b
   return ExceptionResult::BreakInDebugger;
 }
 
-// Fall through
+LLVM_FALLTHROUGH;
   default:
 LLDB_LOG(log,
  "Debugger thread reported exception {0:x} at address {1:x} "


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

[Lldb-commits] [PATCH] D67856: [LLDB] Fix compilation for MinGW, remove redundant class name on inline member

2019-09-21 Thread Martin Storsjö via Phabricator via lldb-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL372482: [LLDB] Fix compilation for MinGW, remove redundant 
class name on inline member (authored by mstorsjo, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D67856?vs=221098&id=221192#toc

Repository:
  rL LLVM

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

https://reviews.llvm.org/D67856

Files:
  
lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h


Index: 
lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h
===
--- 
lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h
+++ 
lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h
@@ -19,7 +19,7 @@
 
 class NativeRegisterContextWindows : public NativeRegisterContextRegisterInfo {
 public:
-  NativeRegisterContextWindows::NativeRegisterContextWindows(
+  NativeRegisterContextWindows(
   NativeThreadProtocol &native_thread,
   RegisterInfoInterface *reg_info_interface_p);
 


Index: lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h
+++ lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows.h
@@ -19,7 +19,7 @@
 
 class NativeRegisterContextWindows : public NativeRegisterContextRegisterInfo {
 public:
-  NativeRegisterContextWindows::NativeRegisterContextWindows(
+  NativeRegisterContextWindows(
   NativeThreadProtocol &native_thread,
   RegisterInfoInterface *reg_info_interface_p);
 
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D67858: [LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition to MSVC defines

2019-09-21 Thread Martin Storsjö via Phabricator via lldb-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL372483: [LLDB] Check for the GCC/MinGW compatible arch 
defines for windows, in addition… (authored by mstorsjo, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D67858?vs=221102&id=221193#toc

Repository:
  rL LLVM

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

https://reviews.llvm.org/D67858

Files:
  lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp
  lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp


Index: 
lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp
@@ -84,7 +84,7 @@
   case 1:
   case 2:
   case 4:
-#if defined(_M_AMD64)
+#if defined(__x86_64__) || defined(_M_AMD64)
   case 8:
 #endif
 break;
Index: lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp
@@ -21,9 +21,9 @@
 #include "TargetThreadWindows.h"
 
 // TODO support _M_ARM and _M_ARM64
-#if defined(_M_AMD64)
+#if defined(__x86_64__) || defined(_M_AMD64)
 #include "x64/RegisterContextWindows_x64.h"
-#elif defined(_M_IX86)
+#elif defined(__i386__) || defined(_M_IX86)
 #include "x86/RegisterContextWindows_x86.h"
 #endif
 
@@ -77,7 +77,7 @@
 break;
 
   case llvm::Triple::x86:
-#if defined(_M_IX86)
+#if defined(__i386__) || defined(_M_IX86)
 m_thread_reg_ctx_sp.reset(
 new RegisterContextWindows_x86(*this, concrete_frame_idx));
 #else
@@ -86,7 +86,7 @@
 break;
 
   case llvm::Triple::x86_64:
-#if defined(_M_AMD64)
+#if defined(__x86_64__) || defined(_M_AMD64)
 m_thread_reg_ctx_sp.reset(
 new RegisterContextWindows_x64(*this, concrete_frame_idx));
 #else


Index: lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/RegisterContextWindows.cpp
@@ -84,7 +84,7 @@
   case 1:
   case 2:
   case 4:
-#if defined(_M_AMD64)
+#if defined(__x86_64__) || defined(_M_AMD64)
   case 8:
 #endif
 break;
Index: lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp
@@ -21,9 +21,9 @@
 #include "TargetThreadWindows.h"
 
 // TODO support _M_ARM and _M_ARM64
-#if defined(_M_AMD64)
+#if defined(__x86_64__) || defined(_M_AMD64)
 #include "x64/RegisterContextWindows_x64.h"
-#elif defined(_M_IX86)
+#elif defined(__i386__) || defined(_M_IX86)
 #include "x86/RegisterContextWindows_x86.h"
 #endif
 
@@ -77,7 +77,7 @@
 break;
 
   case llvm::Triple::x86:
-#if defined(_M_IX86)
+#if defined(__i386__) || defined(_M_IX86)
 m_thread_reg_ctx_sp.reset(
 new RegisterContextWindows_x86(*this, concrete_frame_idx));
 #else
@@ -86,7 +86,7 @@
 break;
 
   case llvm::Triple::x86_64:
-#if defined(_M_AMD64)
+#if defined(__x86_64__) || defined(_M_AMD64)
 m_thread_reg_ctx_sp.reset(
 new RegisterContextWindows_x64(*this, concrete_frame_idx));
 #else
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D67860: [LLDB] Use LLVM_FALLTHROUGH instead of a custom comment

2019-09-21 Thread Martin Storsjö via Phabricator via lldb-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL372484: [LLDB] Use LLVM_FALLTHROUGH instead of a custom 
comment (authored by mstorsjo, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D67860?vs=221105&id=221194#toc

Repository:
  rL LLVM

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

https://reviews.llvm.org/D67860

Files:
  lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp


Index: lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
@@ -479,7 +479,7 @@
   return ExceptionResult::BreakInDebugger;
 }
 
-// Fall through
+LLVM_FALLTHROUGH;
   default:
 LLDB_LOG(log,
  "Debugger thread reported exception {0:x} at address {1:x} "


Index: lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
@@ -479,7 +479,7 @@
   return ExceptionResult::BreakInDebugger;
 }
 
-// Fall through
+LLVM_FALLTHROUGH;
   default:
 LLDB_LOG(log,
  "Debugger thread reported exception {0:x} at address {1:x} "
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D67862: [LLDB] Use SetErrorStringWithFormatv for cases that use LLVM style format strings

2019-09-21 Thread Martin Storsjö via Phabricator via lldb-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL372485: [LLDB] Use SetErrorStringWithFormatv for cases that 
use LLVM style format… (authored by mstorsjo, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D67862?vs=221108&id=221195#toc

Repository:
  rL LLVM

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

https://reviews.llvm.org/D67862

Files:
  lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
  lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp


Index: lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
@@ -170,9 +170,9 @@
 else
   LLDB_LOG(log, "Detaching process error: {0}", error);
   } else {
-error.SetErrorStringWithFormat("error: process {0} in state = {1}, but "
-   "cannot detach it in this state.",
-   GetID(), private_state);
+error.SetErrorStringWithFormatv("error: process {0} in state = {1}, but "
+"cannot detach it in this state.",
+GetID(), private_state);
 LLDB_LOG(log, "error: {0}", error);
   }
   return error;
Index: lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
@@ -177,9 +177,9 @@
 else
   LLDB_LOG(log, "Detaching process error: {0}", error);
   } else {
-error.SetErrorStringWithFormat("error: process {0} in state = {1}, but "
-   "cannot detach it in this state.",
-   GetID(), state);
+error.SetErrorStringWithFormatv("error: process {0} in state = {1}, but "
+"cannot detach it in this state.",
+GetID(), state);
 LLDB_LOG(log, "error: {0}", error);
   }
   return error;


Index: lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
@@ -170,9 +170,9 @@
 else
   LLDB_LOG(log, "Detaching process error: {0}", error);
   } else {
-error.SetErrorStringWithFormat("error: process {0} in state = {1}, but "
-   "cannot detach it in this state.",
-   GetID(), private_state);
+error.SetErrorStringWithFormatv("error: process {0} in state = {1}, but "
+"cannot detach it in this state.",
+GetID(), private_state);
 LLDB_LOG(log, "error: {0}", error);
   }
   return error;
Index: lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
===
--- lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp
@@ -177,9 +177,9 @@
 else
   LLDB_LOG(log, "Detaching process error: {0}", error);
   } else {
-error.SetErrorStringWithFormat("error: process {0} in state = {1}, but "
-   "cannot detach it in this state.",
-   GetID(), state);
+error.SetErrorStringWithFormatv("error: process {0} in state = {1}, but "
+"cannot detach it in this state.",
+GetID(), state);
 LLDB_LOG(log, "error: {0}", error);
   }
   return error;
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D67863: [LLDB] Cast -1 (as invalid socket) to the socket type before comparing

2019-09-21 Thread Martin Storsjö via Phabricator via lldb-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL372486: [LLDB] Cast -1 (as invalid socket) to the socket 
type before comparing (authored by mstorsjo, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D67863?vs=221122&id=221196#toc

Repository:
  rL LLVM

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

https://reviews.llvm.org/D67863

Files:
  lldb/trunk/source/Host/common/Socket.cpp
  lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp


Index: lldb/trunk/source/Host/common/Socket.cpp
===
--- lldb/trunk/source/Host/common/Socket.cpp
+++ lldb/trunk/source/Host/common/Socket.cpp
@@ -476,11 +476,11 @@
   if (!child_processes_inherit) {
 flags |= SOCK_CLOEXEC;
   }
-  NativeSocket fd = llvm::sys::RetryAfterSignal(-1, ::accept4,
-  sockfd, addr, addrlen, flags);
+  NativeSocket fd = llvm::sys::RetryAfterSignal(
+  static_cast(-1), ::accept4, sockfd, addr, addrlen, flags);
 #else
-  NativeSocket fd = llvm::sys::RetryAfterSignal(-1, ::accept,
-  sockfd, addr, addrlen);
+  NativeSocket fd = llvm::sys::RetryAfterSignal(
+  static_cast(-1), ::accept, sockfd, addr, addrlen);
 #endif
   if (fd == kInvalidSocketValue)
 SetLastError(error);
Index: lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp
===
--- lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp
+++ lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp
@@ -93,8 +93,9 @@
 } else {
   listen(sockfd, 5);
   socklen_t clilen = sizeof(cli_addr);
-  newsockfd = llvm::sys::RetryAfterSignal(-1, accept,
-  sockfd, (struct sockaddr *)&cli_addr, &clilen);
+  newsockfd =
+  llvm::sys::RetryAfterSignal(static_cast(-1), accept, sockfd,
+  (struct sockaddr *)&cli_addr, &clilen);
   if (newsockfd < 0)
 if (g_vsc.log)
   *g_vsc.log << "error: accept (" << strerror(errno) << ")"


Index: lldb/trunk/source/Host/common/Socket.cpp
===
--- lldb/trunk/source/Host/common/Socket.cpp
+++ lldb/trunk/source/Host/common/Socket.cpp
@@ -476,11 +476,11 @@
   if (!child_processes_inherit) {
 flags |= SOCK_CLOEXEC;
   }
-  NativeSocket fd = llvm::sys::RetryAfterSignal(-1, ::accept4,
-  sockfd, addr, addrlen, flags);
+  NativeSocket fd = llvm::sys::RetryAfterSignal(
+  static_cast(-1), ::accept4, sockfd, addr, addrlen, flags);
 #else
-  NativeSocket fd = llvm::sys::RetryAfterSignal(-1, ::accept,
-  sockfd, addr, addrlen);
+  NativeSocket fd = llvm::sys::RetryAfterSignal(
+  static_cast(-1), ::accept, sockfd, addr, addrlen);
 #endif
   if (fd == kInvalidSocketValue)
 SetLastError(error);
Index: lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp
===
--- lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp
+++ lldb/trunk/tools/lldb-vscode/lldb-vscode.cpp
@@ -93,8 +93,9 @@
 } else {
   listen(sockfd, 5);
   socklen_t clilen = sizeof(cli_addr);
-  newsockfd = llvm::sys::RetryAfterSignal(-1, accept,
-  sockfd, (struct sockaddr *)&cli_addr, &clilen);
+  newsockfd =
+  llvm::sys::RetryAfterSignal(static_cast(-1), accept, sockfd,
+  (struct sockaddr *)&cli_addr, &clilen);
   if (newsockfd < 0)
 if (g_vsc.log)
   *g_vsc.log << "error: accept (" << strerror(errno) << ")"
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D67793: new api class: SBFile

2019-09-21 Thread Lawrence D'Anna via Phabricator via lldb-commits 
lawrence_danna added a comment.

@labath So what do you think?
Update all the lldb_private::File clients to use shared_ptr instead?
Or do it this way, with sharing handled inside of File?


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D67793



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

[Lldb-commits] [PATCH] D67885: [LLDB] Add a missing specification of linking against dbghelp

2019-09-21 Thread Martin Storsjö via Phabricator via lldb-commits 
mstorsjo created this revision.
mstorsjo added reviewers: amccarth, compnerd, hhb.
Herald added subscribers: JDevlieghere, abidh, mgorny.
Herald added a project: LLDB.

The PECOFF object file plugin uses the dbghelp API, but doesn't specify that it 
has to be linked in anywhere.

Current MSVC based builds have probably succeeded, as other parts in LLDB have 
had a "#pragma comment(lib, "dbghelp.lib")", but there's currently no such 
pragma in the PECOFF plugin.

The "#pragma comment(lib, ...)" approach doesn't work in MinGW mode (unless the 
compiler is given the -fms-extensions option, and even then, it's only 
supported by clang/lld, not by GCC/binutils), thus add it to be linked via 
CMake. (The other parts of LLDB that use dbghelp are within _MSC_VER ifdefs.)


Repository:
  rLLDB LLDB

https://reviews.llvm.org/D67885

Files:
  lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt


Index: lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
===
--- lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
+++ lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
@@ -1,3 +1,9 @@
+if(WIN32)
+  set(DBGHELP_LINK_FILES dbghelp)
+else()
+  set(DBGHELP_LINK_FILES "")
+endif()
+
 add_lldb_library(lldbPluginObjectFilePECOFF PLUGIN
   ObjectFilePECOFF.cpp
   WindowsMiniDump.cpp
@@ -7,6 +13,7 @@
 lldbHost
 lldbSymbol
 lldbTarget
+${DBGHELP_LINK_FILES}
   LINK_COMPONENTS
 BinaryFormat
 Support


Index: lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
===
--- lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
+++ lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
@@ -1,3 +1,9 @@
+if(WIN32)
+  set(DBGHELP_LINK_FILES dbghelp)
+else()
+  set(DBGHELP_LINK_FILES "")
+endif()
+
 add_lldb_library(lldbPluginObjectFilePECOFF PLUGIN
   ObjectFilePECOFF.cpp
   WindowsMiniDump.cpp
@@ -7,6 +13,7 @@
 lldbHost
 lldbSymbol
 lldbTarget
+${DBGHELP_LINK_FILES}
   LINK_COMPONENTS
 BinaryFormat
 Support
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D67887: Use _WIN32 instead of _MSC_VER

2019-09-21 Thread Haibo Huang via Phabricator via lldb-commits 
hhb created this revision.
Herald added subscribers: lldb-commits, mstorsjo.
Herald added a project: LLDB.

This way it works better with MinGW.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D67887

Files:
  lldb/source/Core/IOHandler.cpp


Index: lldb/source/Core/IOHandler.cpp
===
--- lldb/source/Core/IOHandler.cpp
+++ lldb/source/Core/IOHandler.cpp
@@ -52,7 +52,7 @@
 
 #include "llvm/ADT/StringRef.h"
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #include "lldb/Host/windows/windows.h"
 #endif
 


Index: lldb/source/Core/IOHandler.cpp
===
--- lldb/source/Core/IOHandler.cpp
+++ lldb/source/Core/IOHandler.cpp
@@ -52,7 +52,7 @@
 
 #include "llvm/ADT/StringRef.h"
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #include "lldb/Host/windows/windows.h"
 #endif
 
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D67887: Use _WIN32 instead of _MSC_VER

2019-09-21 Thread Haibo Huang via Phabricator via lldb-commits 
This revision was not accepted when it landed; it landed in state "Needs 
Review".
This revision was automatically updated to reflect the committed changes.
Closed by commit rL372493: Use _WIN32 instead of _MSC_VER (authored by hhb, 
committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D67887?vs=221206&id=221207#toc

Repository:
  rL LLVM

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

https://reviews.llvm.org/D67887

Files:
  lldb/trunk/source/Core/IOHandler.cpp


Index: lldb/trunk/source/Core/IOHandler.cpp
===
--- lldb/trunk/source/Core/IOHandler.cpp
+++ lldb/trunk/source/Core/IOHandler.cpp
@@ -52,7 +52,7 @@
 
 #include "llvm/ADT/StringRef.h"
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #include "lldb/Host/windows/windows.h"
 #endif
 


Index: lldb/trunk/source/Core/IOHandler.cpp
===
--- lldb/trunk/source/Core/IOHandler.cpp
+++ lldb/trunk/source/Core/IOHandler.cpp
@@ -52,7 +52,7 @@
 
 #include "llvm/ADT/StringRef.h"
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #include "lldb/Host/windows/windows.h"
 #endif
 
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits