From 41de9a9791370e9af19720664e00ff322ba526e5 Mon Sep 17 00:00:00 2001
From: Kate Stone <katherine.stone@apple.com>
Date: Fri, 19 Aug 2016 20:44:07 +0000
Subject: [PATCH] Moved #include for lldb-python.h to a distinct group with a
 reminder comment declaring that it must be first.  Failure to do so results
 in build failures on macOS due to subtle header conflicts.

llvm-svn: 279315
---
 lldb/.clang-format                                                | 8 --------
 lldb/packages/Python/lldbsuite/.clang-format                      | 4 ++++
 lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h  | 4 +++-
 .../Plugins/ScriptInterpreter/Python/PythonExceptionState.cpp     | 2 ++
 .../Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp  | 2 ++
 5 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 lldb/packages/Python/lldbsuite/.clang-format

diff --git a/lldb/.clang-format b/lldb/.clang-format
index c698dc5..9b3aa8b 100644
--- a/lldb/.clang-format
+++ b/lldb/.clang-format
@@ -1,9 +1 @@
 BasedOnStyle: LLVM
-IndentWidth:     4
-ColumnLimit:     120
-BreakBeforeBraces: Allman
-AlwaysBreakAfterReturnType: All
-AllowShortFunctionsOnASingleLine: Inline
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-IndentCaseLabels: true
-AccessModifierOffset: -4
diff --git a/lldb/packages/Python/lldbsuite/.clang-format b/lldb/packages/Python/lldbsuite/.clang-format
new file mode 100644
index 0000000..7de7a51
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/.clang-format
@@ -0,0 +1,4 @@
+DisableFormat: true
+
+# Disabling formatting doesn't implicitly disable include sorting
+SortIncludes: false
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
index 16e106d..1f03de8 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
@@ -12,11 +12,13 @@
 
 #ifndef LLDB_DISABLE_PYTHON
 
+// LLDB Python header must be included first
+#include "lldb-python.h"
+
 // C Includes
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "lldb-python.h"
 #include "lldb/Core/ConstString.h"
 #include "lldb/Core/Flags.h"
 #include "lldb/Core/StructuredData.h"
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonExceptionState.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/PythonExceptionState.cpp
index 2cbd85b..10de1d1 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonExceptionState.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonExceptionState.cpp
@@ -9,7 +9,9 @@
 
 #ifndef LLDB_DISABLE_PYTHON
 
+// LLDB Python header must be included first
 #include "lldb-python.h"
+
 #include "PythonExceptionState.h"
 
 #include "llvm/ADT/StringRef.h"
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
index 23075e1..5e010bc 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -13,7 +13,9 @@
 
 #else
 
+// LLDB Python header must be included first
 #include "lldb-python.h"
+
 #include "ScriptInterpreterPython.h"
 #include "PythonDataObjects.h"
 #include "PythonExceptionState.h"
-- 
2.7.4