[Lldb-commits] [lldb] r360693 - lldb-server: rename `llgs::terminate` (NFC)

Saleem Abdulrasool via lldb-commits lldb-commits at lists.llvm.org
Tue May 14 10:07:36 PDT 2019


Author: compnerd
Date: Tue May 14 10:07:36 2019
New Revision: 360693

URL: http://llvm.org/viewvc/llvm-project?rev=360693&view=rev
Log:
lldb-server: rename `llgs::terminate` (NFC)

`terminate` overlaps with a C function on Windows:

```
D:\a\1\s\lldb\tools\lldb-server\lldb-server.cpp(45,13):  warning: 'terminate' redeclared without 'dllimport' attribute: 'dllexport' attribute added [-Winconsistent-dllimport]
static void terminate() { g_debugger_lifetime->Terminate(); }
            ^
C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\ucrt\corecrt_terminate.h(29,48):  note: previous declaration is here
    _ACRTIMP __declspec(noreturn) void __cdecl terminate() throw();
                                               ^
D:\a\1\s\lldb\tools\lldb-server\lldb-server.cpp(45,61):  warning: function declared 'noreturn' should not return [-Winvalid-noreturn]
static void terminate() { g_debugger_lifetime->Terminate(); }
                                                            ^
```

Rename the function to `terminate_debugger` to avoid the errant match.

Modified:
    lldb/trunk/tools/lldb-server/lldb-server.cpp

Modified: lldb/trunk/tools/lldb-server/lldb-server.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-server/lldb-server.cpp?rev=360693&r1=360692&r2=360693&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-server/lldb-server.cpp (original)
+++ lldb/trunk/tools/lldb-server/lldb-server.cpp Tue May 14 10:07:36 2019
@@ -43,7 +43,7 @@ static void initialize() {
     llvm::consumeError(std::move(e));
 }
 
-static void terminate() { g_debugger_lifetime->Terminate(); }
+static void terminate_debugger() { g_debugger_lifetime->Terminate(); }
 } // namespace llgs
 
 // main
@@ -63,12 +63,12 @@ int main(int argc, char *argv[]) {
   case 'g':
     llgs::initialize();
     main_gdbserver(argc, argv);
-    llgs::terminate();
+    llgs::terminate_debugger();
     break;
   case 'p':
     llgs::initialize();
     main_platform(argc, argv);
-    llgs::terminate();
+    llgs::terminate_debugger();
     break;
   case 'v':
     fprintf(stderr, "%s\n", lldb_private::GetVersion());




More information about the lldb-commits mailing list