Merge branch 'swift/main' of github.com:apple/llvm-project into maxd/main-merge

# Conflicts:
#	llvm/lib/MC/WasmObjectWriter.cpp

Author: MaxDesiatov

.arcconfig

@@ -2,5 +2,6 @@
   "phabricator.uri" : "https://reviews.llvm.org/",
   "repository.callsign" : "G",
   "conduit_uri" : "https://reviews.llvm.org/",
-  "base": "git:HEAD^"
+  "base": "git:HEAD^",
+  "arc.land.onto.default": "main"
 }

.arclint

@@ -6,6 +6,9 @@
       "script-and-regex.regex": "/^(?P<severity>[[:alpha:]]+)\n(?P<message>[^\n]+)\n(====|(?P<line>\\d),(?P<char>\\d)\n(?P<original>.*)>>>>\n(?P<replacement>.*)<<<<\n)$/s",
       "include": [
         "(\\.(cc|cpp|h)$)"
+      ],
+      "exclude": [
+        "(^clang/test/)"
       ]
     }
   }

.git-blame-ignore-revs

@@ -22,3 +22,21 @@ b9c1b51e45b845debb76d8658edabca70ca56079
 
 # r302496: That is the revert of r302421
 ff63090b0e1072bd398b8efef8ae2291613a6ec9
+
+# Fix more line endings changed in r320089. NFC.
+d8f0e6caa91e230a486c948ab643174e40bdf215
+
+# Correct line endings that got mixed up in r320089; NFC.
+29dc5ded45447915d96ef7ca3f02acf2232282e0
+
+# Remove line-endings added by r320089. NFC.
+100a0eedc00b2bf48bcdc6c209c000745a4a0e48
+
+# Cleanup __config indention. NFC.
+2b772b930e097ed6f06d698a51e291c7fd318baa
+
+# Fixing whitespace problems
+94b2dd0998230c758abd92c99d3700c971f7a31a
+
+# Wiped out some non-ascii characters that snuck into the copyright.
+5b08a8a43254ed30bd953e869b0fd9fc1e8b82d0

.github/workflows/clang-tests.yml

@@ -0,0 +1,25 @@
+name: main branch sync
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  branch_sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+        with:
+          # persist-credentials: false allows us to use our own credentials for
+          # pushing to the repository.  Otherwise, the default github actions token
+          # is used.
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Update branch
+        env:
+          LLVMBOT_TOKEN: ${{ secrets.LLVMBOT_MAIN_SYNC }}
+        run: |
+          git push https://[email protected]/${{ github.repository }} HEAD:master

.github/workflows/libclc-tests.yml

@@ -53,6 +53,8 @@ autoconf/autom4te.cache
 # VS2017 and VSCode config files.
 .vscode
 .vs
+# pythonenv for github Codespaces
+pythonenv*
 # clangd index. (".clangd" is a config file now, thus trailing slash)
 .clangd/
 .cache