Skip to content

Commit

Permalink
[Monorepo fixup] reset untracked directory contents to match apple/st…
Browse files Browse the repository at this point in the history
…able/20190619

The monorepo conversion for the swift/master branch brought in contents in
untracked directory that landed after the apple/stable/20190619 branch was cut.

This commit fixes this content by resetting the sub-trees to match apple/stable/20190619.

Here's how this commit was contructed:

Step 1: reset the subtrees to match the apple/stable/20190619 state

repos="debuginfo-tests libclc libcxxabi libunwind lld llgo openmp parallel-libs polly pstl"

for repo in $repos
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
  echo "LATEST COMMIT FOR $repo -p $latest_commit"
done

Step 2: construct an octopus merge commit with new subtrees

tree=$(git write-tree)
git commit-tree -p HEAD -p ... -m "[Monorepo fixup] ..." $tree
  • Loading branch information
hyp committed Oct 21, 2019
11 parents 3bcca3a + 559c6e1 + 2abbe2f + 5a14c17 + d8bdb92 + d581dd5 + c0e6b8a + 673e547 + 4a1b95b + acbdd07 + 1b6d6e5 commit e62327a
Show file tree
Hide file tree
Showing 933 changed files with 38,982 additions and 39,362 deletions.
7 changes: 3 additions & 4 deletions debuginfo-tests/nrvo-string.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
// RUN: %test_debuginfo %s %t.out
//
// PR34513
volatile int sideeffect = 0;
void __attribute__((noinline)) stop() { sideeffect++; }
void __attribute__((noinline)) stop() {}

struct string {
string() {}
Expand All @@ -19,7 +18,7 @@ struct string {
string get_string() {
string unused;
string result = 3;
// DEBUGGER: break 23
// DEBUGGER: break 22
stop();
return result;
}
Expand All @@ -35,7 +34,7 @@ string2 get_string2() {
some_function(result.i);
// Test that the debugger can get the value of result after another
// function is called.
// DEBUGGER: break 39
// DEBUGGER: break 38
stop();
return result;
}
Expand Down
4 changes: 1 addition & 3 deletions libcxxabi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ include(CMakeDependentOption)
include(HandleCompilerRT)

# Define options.
option(LIBCXXABI_ENABLE_EXCEPTIONS
"Provide support for exceptions in the runtime.
When disabled, libc++abi does not support stack unwinding and other exceptions-related features." ON)
option(LIBCXXABI_ENABLE_EXCEPTIONS "Use exceptions." ON)
option(LIBCXXABI_ENABLE_ASSERTIONS "Enable assertions independent of build mode." ON)
option(LIBCXXABI_ENABLE_PEDANTIC "Compile with pedantic enabled." ON)
option(LIBCXXABI_ENABLE_PIC "Build Position-Independent Code, even in static library" ON)
Expand Down
3 changes: 0 additions & 3 deletions libcxxabi/cmake/Modules/HandleOutOfTreeLLVM.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ macro(find_llvm_parts)
set(LLVM_PATH ${LLVM_PATH} CACHE PATH "Path to LLVM source tree")
set(LLVM_MAIN_SRC_DIR ${LLVM_PATH})
set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules")
if (NOT IS_DIRECTORY "${LLVM_PATH}")
message(FATAL_ERROR "The provided LLVM_PATH (${LLVM_PATH}) is not a valid directory")
endif()
elseif(LLVM_CONFIG_PATH)
message(STATUS "Found LLVM_CONFIG_PATH as ${LLVM_CONFIG_PATH}")
set(LIBCXXABI_USING_INSTALLED_LLVM 1)
Expand Down
3 changes: 1 addition & 2 deletions libcxxabi/include/__cxxabi_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@
#define _LIBCXXABI_NO_CFI
#endif

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

Expand Down
Loading

0 comments on commit e62327a

Please sign in to comment.