[Lldb-commits] [lldb] r124931 - in /lldb/trunk: include/lldb/ include/lldb/API/ include/lldb/Core/ include/lldb/Expression/ include/lldb/Host/ include/lldb/Interpreter/ include/lldb/Target/ include/lldb/Utility/ source/Commands/ source/Core/ source/Host/macosx/ source/Interpreter/ source/Plugins/Instruction/ARM/ source/Plugins/SymbolFile/DWARF/

Greg Clayton gclayton at apple.com
Fri Feb 4 18:56:16 PST 2011


Author: gclayton
Date: Fri Feb  4 20:56:16 2011
New Revision: 124931

URL: http://llvm.org/viewvc/llvm-project?rev=124931&view=rev
Log:
Header patch, virtual dtor patch and missed UUID patch from Kirk Beitz.


Modified:
    lldb/trunk/include/lldb/API/SBInputReader.h
    lldb/trunk/include/lldb/Core/EmulateInstruction.h
    lldb/trunk/include/lldb/Core/InputReader.h
    lldb/trunk/include/lldb/Expression/ASTStructExtractor.h
    lldb/trunk/include/lldb/Expression/IRDynamicChecks.h
    lldb/trunk/include/lldb/Expression/IRForTarget.h
    lldb/trunk/include/lldb/Expression/IRToDWARF.h
    lldb/trunk/include/lldb/Host/Endian.h
    lldb/trunk/include/lldb/Host/Symbols.h
    lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h
    lldb/trunk/include/lldb/Target/ThreadPlanTracer.h
    lldb/trunk/include/lldb/Utility/PseudoTerminal.h
    lldb/trunk/include/lldb/lldb-forward-rtti.h
    lldb/trunk/include/lldb/lldb-include.h
    lldb/trunk/source/Commands/CommandObjectBreakpoint.h
    lldb/trunk/source/Core/Debugger.cpp
    lldb/trunk/source/Core/EmulateInstruction.cpp
    lldb/trunk/source/Core/Error.cpp
    lldb/trunk/source/Core/UUID.cpp
    lldb/trunk/source/Host/macosx/Symbols.cpp
    lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp
    lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h

Modified: lldb/trunk/include/lldb/API/SBInputReader.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBInputReader.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBInputReader.h (original)
+++ lldb/trunk/include/lldb/API/SBInputReader.h Fri Feb  4 20:56:16 2011
@@ -12,8 +12,6 @@
 
 #include "lldb/API/SBDefines.h"
 
-#include <termios.h>
-
 namespace lldb {
 
 class SBInputReader

Modified: lldb/trunk/include/lldb/Core/EmulateInstruction.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/EmulateInstruction.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/EmulateInstruction.h (original)
+++ lldb/trunk/include/lldb/Core/EmulateInstruction.h Fri Feb  4 20:56:16 2011
@@ -168,7 +168,7 @@
         eOpcode16,
         eOpcode32,
         eOpcode64,
-        eOpcodeBytes,
+        eOpcodeBytes
     };
 
     struct Instruction

Modified: lldb/trunk/include/lldb/Core/InputReader.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/InputReader.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/InputReader.h (original)
+++ lldb/trunk/include/lldb/Core/InputReader.h Fri Feb  4 20:56:16 2011
@@ -10,8 +10,6 @@
 #ifndef liblldb_InputReader_h_
 #define liblldb_InputReader_h_
 
-#include <termios.h>
-
 #include "lldb/lldb-include.h"
 #include "lldb/lldb-enumerations.h"
 #include "lldb/Core/Debugger.h"

Modified: lldb/trunk/include/lldb/Expression/ASTStructExtractor.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ASTStructExtractor.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ASTStructExtractor.h (original)
+++ lldb/trunk/include/lldb/Expression/ASTStructExtractor.h Fri Feb  4 20:56:16 2011
@@ -59,7 +59,7 @@
     //----------------------------------------------------------------------
     /// Destructor
     //----------------------------------------------------------------------
-    ~ASTStructExtractor();
+    virtual ~ASTStructExtractor();
     
     //----------------------------------------------------------------------
     /// Link this consumer with a particular AST context

Modified: lldb/trunk/include/lldb/Expression/IRDynamicChecks.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/IRDynamicChecks.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/IRDynamicChecks.h (original)
+++ lldb/trunk/include/lldb/Expression/IRDynamicChecks.h Fri Feb  4 20:56:16 2011
@@ -111,7 +111,7 @@
     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    ~IRDynamicChecks();
+    virtual ~IRDynamicChecks();
     
     //------------------------------------------------------------------
     /// Run this IR transformer on a single module

Modified: lldb/trunk/include/lldb/Expression/IRForTarget.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/IRForTarget.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/IRForTarget.h (original)
+++ lldb/trunk/include/lldb/Expression/IRForTarget.h Fri Feb  4 20:56:16 2011
@@ -82,7 +82,7 @@
     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    ~IRForTarget();
+    virtual ~IRForTarget();
     
     //------------------------------------------------------------------
     /// Run this IR transformer on a single module

Modified: lldb/trunk/include/lldb/Expression/IRToDWARF.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/IRToDWARF.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/IRToDWARF.h (original)
+++ lldb/trunk/include/lldb/Expression/IRToDWARF.h Fri Feb  4 20:56:16 2011
@@ -62,7 +62,7 @@
     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    ~IRToDWARF();
+    virtual ~IRToDWARF();
     
     //------------------------------------------------------------------
     /// Run this IR transformer on a single module

Modified: lldb/trunk/include/lldb/Host/Endian.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/Endian.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/Endian.h (original)
+++ lldb/trunk/include/lldb/Host/Endian.h Fri Feb  4 20:56:16 2011
@@ -10,7 +10,7 @@
 #ifndef liblldb_host_endian_h_
 #define liblldb_host_endian_h_
 
-#include <lldb-enumerations.h>
+#include "lldb/lldb-enumerations.h"
 
 namespace lldb {
 

Modified: lldb/trunk/include/lldb/Host/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/Symbols.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/Symbols.h (original)
+++ lldb/trunk/include/lldb/Host/Symbols.h Fri Feb  4 20:56:16 2011
@@ -25,10 +25,10 @@
 {
 public:
     static FileSpec
-    LocateExecutableObjectFile (const FileSpec *in_exec, const ArchSpec* arch, const UUID *uuid);
+    LocateExecutableObjectFile (const FileSpec *in_exec, const ArchSpec* arch, const lldb_private::UUID *uuid);
 
     static FileSpec
-    LocateExecutableSymbolFile (const FileSpec *in_exec, const ArchSpec* arch, const UUID *uuid);
+    LocateExecutableSymbolFile (const FileSpec *in_exec, const ArchSpec* arch, const lldb_private::UUID *uuid);
 };
 
 } // namespace lldb_private

Modified: lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h (original)
+++ lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h Fri Feb  4 20:56:16 2011
@@ -17,6 +17,8 @@
 #include <Python.h>
 #endif
 
+#include <termios.h>
+
 #include "lldb/lldb-private.h"
 #include "lldb/Interpreter/ScriptInterpreter.h"
 #include "lldb/Core/InputReader.h"

Modified: lldb/trunk/include/lldb/Target/ThreadPlanTracer.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/ThreadPlanTracer.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/ThreadPlanTracer.h (original)
+++ lldb/trunk/include/lldb/Target/ThreadPlanTracer.h Fri Feb  4 20:56:16 2011
@@ -31,7 +31,7 @@
         eLocation = 0,
         eStateChange,
         eCheckFrames,
-        ePython,
+        ePython
     } ThreadPlanTracerStyle;
     ThreadPlanTracer (Thread &thread, lldb::StreamSP &stream_sp);    
     ThreadPlanTracer (Thread &thread);

Modified: lldb/trunk/include/lldb/Utility/PseudoTerminal.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/PseudoTerminal.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/PseudoTerminal.h (original)
+++ lldb/trunk/include/lldb/Utility/PseudoTerminal.h Fri Feb  4 20:56:16 2011
@@ -13,7 +13,6 @@
 
 
 #include <fcntl.h>
-#include <termios.h>
 #include <string>
 
 #include "lldb/lldb-defines.h"

Modified: lldb/trunk/include/lldb/lldb-forward-rtti.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-forward-rtti.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-forward-rtti.h (original)
+++ lldb/trunk/include/lldb/lldb-forward-rtti.h Fri Feb  4 20:56:16 2011
@@ -13,7 +13,6 @@
 #if defined(__cplusplus)
 
 #include "lldb/lldb-types.h"
-#include "lldb/lldb-forward.h"
 
 //----------------------------------------------------------------------
 // lldb forward declarations

Modified: lldb/trunk/include/lldb/lldb-include.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-include.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-include.h (original)
+++ lldb/trunk/include/lldb/lldb-include.h Fri Feb  4 20:56:16 2011
@@ -11,9 +11,6 @@
 #define LLDB_include_h_
 
 #include "lldb/lldb-defines.h"
-#include "lldb/lldb-enumerations.h"
-#include "lldb/lldb-forward.h"
 #include "lldb/lldb-forward-rtti.h"
-#include "lldb/lldb-types.h"
 
 #endif  // LLDB_include_h_

Modified: lldb/trunk/source/Commands/CommandObjectBreakpoint.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectBreakpoint.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectBreakpoint.h (original)
+++ lldb/trunk/source/Commands/CommandObjectBreakpoint.h Fri Feb  4 20:56:16 2011
@@ -284,7 +284,7 @@
     typedef enum BreakpointClearType
     {
         eClearTypeInvalid,
-        eClearTypeFileAndLine,
+        eClearTypeFileAndLine
     } BreakpointClearType;
 
     CommandObjectBreakpointClear (CommandInterpreter &interpreter);

Modified: lldb/trunk/source/Core/Debugger.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Debugger.cpp?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/source/Core/Debugger.cpp (original)
+++ lldb/trunk/source/Core/Debugger.cpp Fri Feb  4 20:56:16 2011
@@ -21,6 +21,7 @@
 #include "lldb/Target/StopInfo.h"
 #include "lldb/Target/Thread.h"
 
+#include <termios.h>
 
 using namespace lldb;
 using namespace lldb_private;

Modified: lldb/trunk/source/Core/EmulateInstruction.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/EmulateInstruction.cpp?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/source/Core/EmulateInstruction.cpp (original)
+++ lldb/trunk/source/Core/EmulateInstruction.cpp Fri Feb  4 20:56:16 2011
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "EmulateInstruction.h"
+#include "lldb/Core/EmulateInstruction.h"
 
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/PluginManager.h"

Modified: lldb/trunk/source/Core/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Error.cpp?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/source/Core/Error.cpp (original)
+++ lldb/trunk/source/Core/Error.cpp Fri Feb  4 20:56:16 2011
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // C Includes
-#include <sys/errno.h>
+#include <errno.h>
 
 // C++ Includes
 // Other libraries and framework includes

Modified: lldb/trunk/source/Core/UUID.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/UUID.cpp?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/source/Core/UUID.cpp (original)
+++ lldb/trunk/source/Core/UUID.cpp Fri Feb  4 20:56:16 2011
@@ -186,7 +186,7 @@
 bool
 lldb_private::operator != (const lldb_private::UUID &lhs, const lldb_private::UUID &rhs)
 {
-    return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), UUID::GetByteSize()) != 0;
+    return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), lldb_private::UUID::GetByteSize()) != 0;
 }
 
 bool

Modified: lldb/trunk/source/Host/macosx/Symbols.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Symbols.cpp?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Symbols.cpp (original)
+++ lldb/trunk/source/Host/macosx/Symbols.cpp Fri Feb  4 20:56:16 2011
@@ -11,7 +11,6 @@
 
 // C Includes
 #include <dirent.h>
-#include <mach/machine.h>
 #include "llvm/Support/MachO.h"
 
 // C++ Includes

Modified: lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp (original)
+++ lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp Fri Feb  4 20:56:16 2011
@@ -8,19 +8,11 @@
 //===----------------------------------------------------------------------===//
 
 // In order to guarantee correct working with Python, Python.h *MUST* be
-// the *FIRST* header file included:
-
-#if defined (__APPLE__)
-#include <Python/Python.h>
-#else
-#include <Python.h>
-#endif
+// the *FIRST* header file included in ScriptInterpreterPython.h, and that
+// must be the *FIRST* header file included here.
 
 #include "lldb/Interpreter/ScriptInterpreterPython.h"
 
-
-#include <sys/ioctl.h>
-#include <termios.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -28,20 +20,12 @@
 
 #include "lldb/API/SBFrame.h"
 #include "lldb/API/SBBreakpointLocation.h"
-#include "lldb/Breakpoint/Breakpoint.h"
-#include "lldb/Breakpoint/BreakpointLocation.h"
 #include "lldb/Breakpoint/StoppointCallbackContext.h"
 #include "lldb/Core/Debugger.h"
-#include "lldb/Core/FileSpec.h"
-#include "lldb/Core/InputReader.h"
-#include "lldb/Core/Stream.h"
-#include "lldb/Core/StreamString.h"
 #include "lldb/Core/Timer.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
-#include "lldb/Core/Debugger.h"
-#include "lldb/Target/Process.h"
 #include "lldb/Target/Thread.h"
 
 // This function is in the C++ output file generated by SWIG after it is 

Modified: lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h (original)
+++ lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h Fri Feb  4 20:56:16 2011
@@ -56,7 +56,7 @@
         eEncodingT2,
         eEncodingT3,
         eEncodingT4,
-        eEncodingT5,
+        eEncodingT5
     } ARMEncoding;
     
 

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h?rev=124931&r1=124930&r2=124931&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h Fri Feb  4 20:56:16 2011
@@ -217,7 +217,7 @@
         flagsGotDebugPubNamesData   = (1 << 7),
         flagsGotDebugPubTypesData   = (1 << 8),
         flagsGotDebugRangesData     = (1 << 9),
-        flagsGotDebugStrData        = (1 << 10),
+        flagsGotDebugStrData        = (1 << 10)
     };
 
     DISALLOW_COPY_AND_ASSIGN (SymbolFileDWARF);





More information about the lldb-commits mailing list