Skip to content

Commit 35db160

Browse files
committed
monorepo fixup: Merge --theirs all the untracked dirs in swift/master
Because LLDB branched significantly later than the other tracked directories, the generated content for swift/master has a much newer version of the untracked directories (llgo, polly, lld, etc.) than apple/stable/20190619. Alex did the work to fix this, running: for repo in debuginfo-tests libclc libcxxabi \ libunwind lld llgo openmp parallel-libs polly pstl do git rm -rf $repo > /dev/null latest_commit=$(git rev-list HEAD -n1 -- $repo) tree=$(git rev-parse origin/apple/stable/20190619:$repo) git read-tree --prefix=$repo $tree done I've just simplified by making this a simple re-merge from the merge-base with apple/stable/20190619 instead of an octopus from the last commit to each directory above (which seems to unnecessarily compilicate `git log --graph`). In case anyone does care about those commits, here they are: - 559c6e1: debuginfo-tests/ - 2abbe2f: libclc/ - 5a14c17: libcxxabi/ - d8bdb92: libunwind/ - d581dd5: lld/ - c0e6b8a: llgo/ - 673e547: openmp/ - 4a1b95b: parallel-libs/ - acbdd07: polly/ - 1b6d6e5: pstl/
2 parents 3bcca3a + 57755b1 commit 35db160

File tree

933 files changed

+38982
-39362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

933 files changed

+38982
-39362
lines changed

debuginfo-tests/nrvo-string.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
// RUN: %test_debuginfo %s %t.out
88
//
99
// PR34513
10-
volatile int sideeffect = 0;
11-
void __attribute__((noinline)) stop() { sideeffect++; }
10+
void __attribute__((noinline)) stop() {}
1211

1312
struct string {
1413
string() {}
@@ -19,7 +18,7 @@ struct string {
1918
string get_string() {
2019
string unused;
2120
string result = 3;
22-
// DEBUGGER: break 23
21+
// DEBUGGER: break 22
2322
stop();
2423
return result;
2524
}
@@ -35,7 +34,7 @@ string2 get_string2() {
3534
some_function(result.i);
3635
// Test that the debugger can get the value of result after another
3736
// function is called.
38-
// DEBUGGER: break 39
37+
// DEBUGGER: break 38
3938
stop();
4039
return result;
4140
}

libcxxabi/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ include(CMakeDependentOption)
4343
include(HandleCompilerRT)
4444

4545
# Define options.
46-
option(LIBCXXABI_ENABLE_EXCEPTIONS
47-
"Provide support for exceptions in the runtime.
48-
When disabled, libc++abi does not support stack unwinding and other exceptions-related features." ON)
46+
option(LIBCXXABI_ENABLE_EXCEPTIONS "Use exceptions." ON)
4947
option(LIBCXXABI_ENABLE_ASSERTIONS "Enable assertions independent of build mode." ON)
5048
option(LIBCXXABI_ENABLE_PEDANTIC "Compile with pedantic enabled." ON)
5149
option(LIBCXXABI_ENABLE_PIC "Build Position-Independent Code, even in static library" ON)

libcxxabi/cmake/Modules/HandleOutOfTreeLLVM.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ macro(find_llvm_parts)
99
set(LLVM_PATH ${LLVM_PATH} CACHE PATH "Path to LLVM source tree")
1010
set(LLVM_MAIN_SRC_DIR ${LLVM_PATH})
1111
set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules")
12-
if (NOT IS_DIRECTORY "${LLVM_PATH}")
13-
message(FATAL_ERROR "The provided LLVM_PATH (${LLVM_PATH}) is not a valid directory")
14-
endif()
1512
elseif(LLVM_CONFIG_PATH)
1613
message(STATUS "Found LLVM_CONFIG_PATH as ${LLVM_CONFIG_PATH}")
1714
set(LIBCXXABI_USING_INSTALLED_LLVM 1)

libcxxabi/include/__cxxabi_config.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@
7171
#define _LIBCXXABI_NO_CFI
7272
#endif
7373

74-
// wasm32 follows the arm32 ABI convention of using 32-bit guard.
75-
#if defined(__arm__) || defined(__wasm32__)
74+
#if defined(__arm__)
7675
# define _LIBCXXABI_GUARD_ABI_ARM
7776
#endif
7877

0 commit comments

Comments
 (0)