Update the file headers across all of the LLVM projects in the monorepo

to reflect the new license.

We understand that people may be surprised that we're moving the header
entirely to discuss the new license. We checked this carefully with the
Foundation's lawyer and we believe this is the correct approach.

Essentially, all code in the project is now made available by the LLVM
project under our new license, so you will see that the license headers
include that license only. Some of our contributors have contributed
code under our old license, and accordingly, we have retained a copy of
our old license notice in the top-level files in each project and
repository.

llvm-svn: 351636

57 files changed, 171 insertions, 228 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/main.c
index 5f0680a43b8..eda7dc3d6ac 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/main.c
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 int main (int argc, char const *argv[])
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/main.c
index fe972dbbe85..c21cfc9a9fb 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/main.c
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <stdint.h>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/main.c
index 59ea2130069..924336e97e0 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/main.c
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <stdio.h>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/main.c
index 8be3c4d46b3..f8710f67720 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/main.c
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/a.c b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/a.c
index d169d5d6324..ce3e6f9a2d4 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/a.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/a.c
@@ -1,9 +1,8 @@
 //===-- a.c -----------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 int g_a = 123;
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/main.c
index b37c97bad9d..ea54eb927c0 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/main.c
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <stdio.h>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/main.c
index 64f01a97a28..64bc95fb5a8 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/main.c
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <stdio.h>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/main.c
index d8b4a2da761..fce61bfd93e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/main.c
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <stdio.h>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/strings/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/strings/main.c
index e02580b407f..3e7ead08478 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/strings/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/strings/main.c
@@ -1,9 +1,8 @@
 //===-- main.c ----------------------------------------------------*- C -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/main.c
index 02fefd36cee..f166232b755 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/main.c
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/a.c b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/a.c
index ab1022514d1..00803964e61 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/a.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/a.c
@@ -1,9 +1,8 @@
 //===-- a.c -----------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/main.c
index 73e32ca39a5..c9c1e681dc0 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/main.c
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <stdio.h>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/main.c
index 62f8a00e664..467612e9b37 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/main.c
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 void test()
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp
index 6aee25c2160..d411af67911 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/main.cpp
index 88d02d5b289..a14cc690da7 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/main.cpp
index b92c2d57292..8cd0cfc77c5 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp
index 90e63b40f41..1f25b0206b3 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LIDENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/main.cpp
index 2068eadcac5..319a05a7bee 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp
index 2d02cbe0f05..179f2177793 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/main.cpp
index 7614977b245..c244e1bf44e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
index bfe098a089f..31329b271e2 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <stdio.h>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/sbvalue-cast.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/sbvalue-cast.cpp
index 00fd7dad438..9e03594a734 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/sbvalue-cast.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/sbvalue-cast.cpp
@@ -1,9 +1,8 @@
 //===-- sbvalue-cast.cpp ----------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifdef DO_VIRTUAL_INHERITANCE
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/main.cpp
index 8595050afbb..31d130cce90 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <stdio.h>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/main.cpp
index a4006c2f7ed..47769014d49 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/main.cpp
index 494b846336f..2489506b280 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/main.cpp
index e802d40e5f8..eea2830aef8 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LIDENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/lambdas/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/lambdas/main.cpp
index 0432cc1357d..5870c877f4a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/lambdas/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/lambdas/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/main.cpp
index 21ce8ca7080..048eeb2d27b 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LIDENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
index 9f5eb06cccd..22c0309695c 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp
index bb7731cf87b..481a9866fcb 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp
@@ -1,9 +1,8 @@
 //===-- ns.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h
index a0f9be88216..d04b45a7d7a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h
@@ -1,9 +1,8 @@
 //===-- ns.h ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp
index 0051d478395..9aae5d0a495 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp
@@ -1,9 +1,8 @@
 //===-- ns2.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp
index 205e1931f3e..0f7a5050fde 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp
@@ -1,9 +1,8 @@
 //===-- ns3.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/main.cpp
index 5dfca5b7f99..0349365d843 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.cpp
index 2ea0d2df2ec..2795b206e8e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.cpp
@@ -1,9 +1,8 @@
 //===-- a.cpp ---------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.cpp
index 6e7b41e0016..b676865c4d2 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.cpp
@@ -1,9 +1,8 @@
 //===-- b.cpp ---------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/foo.h b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/foo.h
index 76b8e70880e..a2c64ab5928 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/foo.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/foo.h
@@ -1,9 +1,8 @@
 //===-- foo.h ---------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/main.cpp
index 076814eae1d..8703cd99246 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/printf/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/printf/main.cpp
index badf1be0b41..27395eb6f41 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/printf/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/printf/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/main.cpp
index dbf3606aeba..4f180bbbd13 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <stdio.h>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/main.cpp
index 7ccc2f9a328..ab8ae1b645f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/main.cpp
index 5141a407d11..4c57e09296c 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/main.cpp
index cfdb7b2d3db..89895196b15 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <cstdio>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/main.cpp
index 292f9f64bcc..cbd3ab253d6 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LIDENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/template/main.cpp
index 40825cd7c1a..445a34fe067 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/template/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <tuple>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/this/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/main.cpp
index 4448a5cadf5..4026de0222f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/this/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp
index ae44bfa7c7d..f2803e36152 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/main.cpp
index fda951a7899..a98fb44e5f4 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/main.cpp
index c551c0e2c0d..839fd93f764 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <vector>
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/main.cpp
index b0d68377e98..8d0a0c386e3 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 int main (int argc, char const *argv[])
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/main.cpp
index e249c37b678..4d6a1072d69 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/main.cpp
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/main.m
index 9ee3bbe6677..e19f291ecf9 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/main.m
@@ -1,9 +1,8 @@
 //===-- main.m -------------------------------------------*- Objective-C-*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/main.mm b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/main.mm
index 5683882486d..b5c71f9fcf9 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/main.mm
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/main.mm
@@ -1,9 +1,8 @@
 //===-- main.m ------------------------------------------------*- ObjC -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/blocked.m b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/blocked.m
index ba249755444..58771264062 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/blocked.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/blocked.m
@@ -1,9 +1,8 @@
 //===-- blocked.m --------------------------------------------------*- ObjC -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/main.m
index 8203165e497..94bf0fb9fc5 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/main.m
@@ -1,9 +1,8 @@
 //===-- main.c --------------------------------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/self/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/self/main.m
index 928aaf2ff02..8f4e61202a3 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/self/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/self/main.m
@@ -1,9 +1,8 @@
 //===-- main.m ------------------------------------------*- Objective-C -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/variadic_methods/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/variadic_methods/main.m
index f48710e880f..609d783dd59 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/variadic_methods/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/variadic_methods/main.m
@@ -1,9 +1,8 @@
 //===-- main.m -------------------------------------------*- Objective-C-*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//