swiftlang · Michael137 · Nov 5, 2025 · Aug 19, 2025 · Aug 21, 2025 · Aug 21, 2025
diff --git a/clang/test/CodeGenCXX/debug-info-class-limited.test b/clang/test/CodeGenCXX/debug-info-class-limited.test
diff --git a/...est/CodeGenCXX/debug-info-lambda-this.cpp → clang/test/CodeGenCXX/lambda-this-2.cpp b/...est/CodeGenCXX/debug-info-lambda-this.cpp → clang/test/CodeGenCXX/lambda-this-2.cpp
diff --git a/.../CodeGen/AArch64/debug-sve-vector-types.c → ...test/DebugInfo/AArch64/sve-vector-types.c b/.../CodeGen/AArch64/debug-sve-vector-types.c → ...test/DebugInfo/AArch64/sve-vector-types.c
diff --git a/...odeGen/AArch64/debug-sve-vectorx2-types.c → ...st/DebugInfo/AArch64/sve-vectorx2-types.c b/...odeGen/AArch64/debug-sve-vectorx2-types.c → ...st/DebugInfo/AArch64/sve-vectorx2-types.c
diff --git a/...odeGen/AArch64/debug-sve-vectorx3-types.c → ...st/DebugInfo/AArch64/sve-vectorx3-types.c b/...odeGen/AArch64/debug-sve-vectorx3-types.c → ...st/DebugInfo/AArch64/sve-vectorx3-types.c
diff --git a/...odeGen/AArch64/debug-sve-vectorx4-types.c → ...st/DebugInfo/AArch64/sve-vectorx4-types.c b/...odeGen/AArch64/debug-sve-vectorx4-types.c → ...st/DebugInfo/AArch64/sve-vectorx4-types.c
diff --git a/clang/test/CodeGen/AArch64/debug-types.c → clang/test/DebugInfo/AArch64/types.c b/clang/test/CodeGen/AArch64/debug-types.c → clang/test/DebugInfo/AArch64/types.c
diff --git a/...signment-tracking/assignment-tracking.cpp → ...ssignmentTracking/assignment-tracking.cpp b/...signment-tracking/assignment-tracking.cpp → ...ssignmentTracking/assignment-tracking.cpp
diff --git a/...test/CodeGen/assignment-tracking/flag.cpp → ...est/DebugInfo/AssignmentTracking/flag.cpp b/...test/CodeGen/assignment-tracking/flag.cpp → ...est/DebugInfo/AssignmentTracking/flag.cpp
diff --git a/...n/assignment-tracking/memcpy-fragment.cpp → ...fo/AssignmentTracking/memcpy-fragment.cpp b/...n/assignment-tracking/memcpy-fragment.cpp → ...fo/AssignmentTracking/memcpy-fragment.cpp
diff --git a/...eGen/assignment-tracking/nested-scope.cpp → ...gInfo/AssignmentTracking/nested-scope.cpp b/...eGen/assignment-tracking/nested-scope.cpp → ...gInfo/AssignmentTracking/nested-scope.cpp
diff --git a/clang/test/CodeGen/attr-btf_tag-typedef.c → ...test/DebugInfo/BPF/attr-btf_tag-typedef.c b/clang/test/CodeGen/attr-btf_tag-typedef.c → ...test/DebugInfo/BPF/attr-btf_tag-typedef.c
diff --git a/clang/test/CodeGen/attr-btf_type_tag-func.c → ...st/DebugInfo/BPF/attr-btf_type_tag-func.c b/clang/test/CodeGen/attr-btf_type_tag-func.c → ...st/DebugInfo/BPF/attr-btf_type_tag-func.c
diff --git a/...g/test/CodeGen/bpf-attr-type-tag-atomic.c → .../DebugInfo/BPF/bpf-attr-type-tag-atomic.c b/...g/test/CodeGen/bpf-attr-type-tag-atomic.c → .../DebugInfo/BPF/bpf-attr-type-tag-atomic.c
diff --git a/...test/CodeGen/bpf-debug-info-extern-func.c → ...ebugInfo/BPF/bpf-debug-info-extern-func.c b/...test/CodeGen/bpf-debug-info-extern-func.c → ...ebugInfo/BPF/bpf-debug-info-extern-func.c
diff --git a/...en/builtin-preserve-access-index-nonptr.c → ...PF/builtin-preserve-access-index-nonptr.c b/...en/builtin-preserve-access-index-nonptr.c → ...PF/builtin-preserve-access-index-nonptr.c
diff --git a/...eGen/builtins-bpf-preserve-field-info-1.c → .../BPF/builtins-bpf-preserve-field-info-1.c b/...eGen/builtins-bpf-preserve-field-info-1.c → .../BPF/builtins-bpf-preserve-field-info-1.c
diff --git a/...eGen/builtins-bpf-preserve-field-info-2.c → .../BPF/builtins-bpf-preserve-field-info-2.c b/...eGen/builtins-bpf-preserve-field-info-2.c → .../BPF/builtins-bpf-preserve-field-info-2.c
diff --git a/...eGen/builtins-bpf-preserve-field-info-3.c → .../BPF/builtins-bpf-preserve-field-info-3.c b/...eGen/builtins-bpf-preserve-field-info-3.c → .../BPF/builtins-bpf-preserve-field-info-3.c
diff --git a/...eGen/builtins-bpf-preserve-field-info-4.c → .../BPF/builtins-bpf-preserve-field-info-4.c b/...eGen/builtins-bpf-preserve-field-info-4.c → .../BPF/builtins-bpf-preserve-field-info-4.c
diff --git a/...t/CodeGenCXX/2006-11-20-GlobalSymbols.cpp → ...ebugInfo/CXX/2006-11-20-GlobalSymbols.cpp b/...t/CodeGenCXX/2006-11-20-GlobalSymbols.cpp → ...ebugInfo/CXX/2006-11-20-GlobalSymbols.cpp
diff --git a/.../CodeGenCXX/2007-01-02-UnboundedArray.cpp → ...bugInfo/CXX/2007-01-02-UnboundedArray.cpp b/.../CodeGenCXX/2007-01-02-UnboundedArray.cpp → ...bugInfo/CXX/2007-01-02-UnboundedArray.cpp
diff --git a/clang/test/CodeGenCXX/2009-03-17-dbg.cpp → clang/test/DebugInfo/CXX/2009-03-17.cpp b/clang/test/CodeGenCXX/2009-03-17-dbg.cpp → clang/test/DebugInfo/CXX/2009-03-17.cpp
diff --git a/.../CodeGenCXX/2009-06-16-DebugInfoCrash.cpp → ...g/test/DebugInfo/CXX/2009-06-16-Crash.cpp b/.../CodeGenCXX/2009-06-16-DebugInfoCrash.cpp → ...g/test/DebugInfo/CXX/2009-06-16-Crash.cpp
diff --git a/...est/CodeGenCXX/2010-05-10-Var-DbgInfo.cpp → clang/test/DebugInfo/CXX/2010-05-10-Var.cpp b/...est/CodeGenCXX/2010-05-10-Var-DbgInfo.cpp → clang/test/DebugInfo/CXX/2010-05-10-Var.cpp
diff --git a/...CodeGenCXX/2010-05-12-PtrToMember-Dbg.cpp → .../DebugInfo/CXX/2010-05-12-PtrToMember.cpp b/...CodeGenCXX/2010-05-12-PtrToMember-Dbg.cpp → .../DebugInfo/CXX/2010-05-12-PtrToMember.cpp
diff --git a/...est/CodeGenCXX/2010-06-21-LocalVarDbg.cpp → .../DebugInfo/CXX/2010-06-21-LocalVarDbg.cpp b/...est/CodeGenCXX/2010-06-21-LocalVarDbg.cpp → .../DebugInfo/CXX/2010-06-21-LocalVarDbg.cpp
diff --git a/clang/test/CodeGenCXX/2010-07-23-DeclLoc.cpp → ...test/DebugInfo/CXX/2010-07-23-DeclLoc.cpp b/clang/test/CodeGenCXX/2010-07-23-DeclLoc.cpp → ...test/DebugInfo/CXX/2010-07-23-DeclLoc.cpp
diff --git a/...enCXX/Inputs/debug-info-class-limited.cpp → ...st/DebugInfo/CXX/Inputs/class-limited.cpp b/...enCXX/Inputs/debug-info-class-limited.cpp → ...st/DebugInfo/CXX/Inputs/class-limited.cpp
diff --git a/clang/test/CodeGenCXX/PR20038.cpp → clang/test/DebugInfo/CXX/PR20038.cpp b/clang/test/CodeGenCXX/PR20038.cpp → clang/test/DebugInfo/CXX/PR20038.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-access.cpp → clang/test/DebugInfo/CXX/access.cpp b/clang/test/CodeGenCXX/debug-info-access.cpp → clang/test/DebugInfo/CXX/access.cpp
diff --git a/...CodeGenCXX/aix-static-init-debug-info.cpp → clang/test/DebugInfo/CXX/aix-static-init.cpp b/...CodeGenCXX/aix-static-init-debug-info.cpp → clang/test/DebugInfo/CXX/aix-static-init.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-alias.cpp → clang/test/DebugInfo/CXX/alias.cpp b/clang/test/CodeGenCXX/debug-info-alias.cpp → clang/test/DebugInfo/CXX/alias.cpp
diff --git a/...deGenCXX/dbg-info-all-calls-described.cpp → ...est/DebugInfo/CXX/all-calls-described.cpp b/...deGenCXX/dbg-info-all-calls-described.cpp → ...est/DebugInfo/CXX/all-calls-described.cpp
diff --git a/.../CodeGenCXX/debug-info-anon-namespace.cpp → clang/test/DebugInfo/CXX/anon-namespace.cpp b/.../CodeGenCXX/debug-info-anon-namespace.cpp → clang/test/DebugInfo/CXX/anon-namespace.cpp
diff --git a/...CodeGenCXX/debug-info-anon-union-vars.cpp → clang/test/DebugInfo/CXX/anon-union-vars.cpp b/...CodeGenCXX/debug-info-anon-union-vars.cpp → clang/test/DebugInfo/CXX/anon-union-vars.cpp
@@ -46,7 +46,7 @@ void instantiate(int x) {
 
 // CHECK: !DIGlobalVariable(name: "c",{{.*}} file: [[FILE:.*]], line: 6,{{.*}} isLocal: true, isDefinition: true
 // CHECK: !DIGlobalVariable(name: "d",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true
-// CHECK: [[FILE]] = !DIFile(filename: "{{.*}}debug-info-anon-union-vars.cpp",
+// CHECK: [[FILE]] = !DIFile(filename: "{{.*}}anon-union-vars.cpp",
 // CHECK: !DIGlobalVariable(name: "a",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true
 // CHECK: !DIGlobalVariable(name: "b",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true
 // CHECK: !DIGlobalVariable(name: "result", {{.*}} isLocal: false, isDefinition: true

diff --git a/.../CodeGenCXX/debug-info-artificial-arg.cpp → clang/test/DebugInfo/CXX/artificial-arg.cpp b/.../CodeGenCXX/debug-info-artificial-arg.cpp → clang/test/DebugInfo/CXX/artificial-arg.cpp
diff --git a/...est/CodeGenCXX/debug-info-atexit-stub.cpp → clang/test/DebugInfo/CXX/atexit-stub.cpp b/...est/CodeGenCXX/debug-info-atexit-stub.cpp → clang/test/DebugInfo/CXX/atexit-stub.cpp
diff --git a/...est/CodeGenCXX/debug-info-auto-return.cpp → clang/test/DebugInfo/CXX/auto-return.cpp b/...est/CodeGenCXX/debug-info-auto-return.cpp → clang/test/DebugInfo/CXX/auto-return.cpp
diff --git a/...ug-info-block-invocation-linkage-name.cpp → ...nfo/CXX/block-invocation-linkage-name.cpp b/...ug-info-block-invocation-linkage-name.cpp → ...nfo/CXX/block-invocation-linkage-name.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-blocks.cpp → clang/test/DebugInfo/CXX/blocks.cpp b/clang/test/CodeGenCXX/debug-info-blocks.cpp → clang/test/DebugInfo/CXX/blocks.cpp
diff --git a/...g/test/CodeGenCXX/bpf-debug-structors.cpp → clang/test/DebugInfo/CXX/bpf-structors.cpp b/...g/test/CodeGenCXX/bpf-debug-structors.cpp → clang/test/DebugInfo/CXX/bpf-structors.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-byval.cpp → clang/test/DebugInfo/CXX/byval.cpp b/clang/test/CodeGenCXX/debug-info-byval.cpp → clang/test/DebugInfo/CXX/byval.cpp
diff --git a/...GenCXX/debug-info-calling-conventions.cpp → ...est/DebugInfo/CXX/calling-conventions.cpp b/...GenCXX/debug-info-calling-conventions.cpp → ...est/DebugInfo/CXX/calling-conventions.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-char16.cpp → clang/test/DebugInfo/CXX/char16.cpp b/clang/test/CodeGenCXX/debug-info-char16.cpp → clang/test/DebugInfo/CXX/char16.cpp
diff --git a/...nCXX/debug-info-class-limited-plugin.test → ...t/DebugInfo/CXX/class-limited-plugin.test b/...nCXX/debug-info-class-limited-plugin.test → ...t/DebugInfo/CXX/class-limited-plugin.test
@@ -1,2 +1,2 @@
-RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited -o - -load %llvmshlibdir/PrintFunctionNames%pluginext -add-plugin print-fns %S/Inputs/debug-info-class-limited.cpp 2>&1 | FileCheck %S/Inputs/debug-info-class-limited.cpp
+RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited -o - -load %llvmshlibdir/PrintFunctionNames%pluginext -add-plugin print-fns %S/Inputs/class-limited.cpp 2>&1 | FileCheck %S/Inputs/class-limited.cpp
 REQUIRES: plugins, examples
diff --git a/clang/test/DebugInfo/CXX/class-limited.test b/clang/test/DebugInfo/CXX/class-limited.test
@@ -0,0 +1 @@
+RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited %S/Inputs/class-limited.cpp -o - | FileCheck %S/Inputs/class-limited.cpp
diff --git a/...t/CodeGenCXX/debug-info-class-nolimit.cpp → clang/test/DebugInfo/CXX/class-nolimit.cpp b/...t/CodeGenCXX/debug-info-class-nolimit.cpp → clang/test/DebugInfo/CXX/class-nolimit.cpp
diff --git a/...st/CodeGenCXX/debug-info-class-optzns.cpp → clang/test/DebugInfo/CXX/class-optzns.cpp b/...st/CodeGenCXX/debug-info-class-optzns.cpp → clang/test/DebugInfo/CXX/class-optzns.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-class.cpp → clang/test/DebugInfo/CXX/class.cpp b/clang/test/CodeGenCXX/debug-info-class.cpp → clang/test/DebugInfo/CXX/class.cpp
diff --git a/...nCXX/debug-info-codeview-display-name.cpp → ...t/DebugInfo/CXX/codeview-display-name.cpp b/...nCXX/debug-info-codeview-display-name.cpp → ...t/DebugInfo/CXX/codeview-display-name.cpp
diff --git a/...CXX/debug-info-codeview-heapallocsite.cpp → .../DebugInfo/CXX/codeview-heapallocsite.cpp b/...CXX/debug-info-codeview-heapallocsite.cpp → .../DebugInfo/CXX/codeview-heapallocsite.cpp
diff --git a/...XX/debug-info-codeview-injected-class.cpp → ...DebugInfo/CXX/codeview-injected-class.cpp b/...XX/debug-info-codeview-injected-class.cpp → ...DebugInfo/CXX/codeview-injected-class.cpp
diff --git a/...nCXX/debug-info-codeview-nested-types.cpp → ...t/DebugInfo/CXX/codeview-nested-types.cpp b/...nCXX/debug-info-codeview-nested-types.cpp → ...t/DebugInfo/CXX/codeview-nested-types.cpp
diff --git a/...odeGenCXX/debug-info-codeview-nodebug.cpp → ...g/test/DebugInfo/CXX/codeview-nodebug.cpp b/...odeGenCXX/debug-info-codeview-nodebug.cpp → ...g/test/DebugInfo/CXX/codeview-nodebug.cpp
diff --git a/.../debug-info-codeview-template-literal.cpp → ...bugInfo/CXX/codeview-template-literal.cpp b/.../debug-info-codeview-template-literal.cpp → ...bugInfo/CXX/codeview-template-literal.cpp
diff --git a/...CXX/debug-info-codeview-template-type.cpp → .../DebugInfo/CXX/codeview-template-type.cpp b/...CXX/debug-info-codeview-template-type.cpp → .../DebugInfo/CXX/codeview-template-type.cpp
diff --git a/...odeGenCXX/debug-info-codeview-unnamed.cpp → ...g/test/DebugInfo/CXX/codeview-unnamed.cpp b/...odeGenCXX/debug-info-codeview-unnamed.cpp → ...g/test/DebugInfo/CXX/codeview-unnamed.cpp
diff --git a/...CXX/debug-info-codeview-var-templates.cpp → .../DebugInfo/CXX/codeview-var-templates.cpp b/...CXX/debug-info-codeview-var-templates.cpp → .../DebugInfo/CXX/codeview-var-templates.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-coff.cpp → clang/test/DebugInfo/CXX/coff.cpp b/clang/test/CodeGenCXX/debug-info-coff.cpp → clang/test/DebugInfo/CXX/coff.cpp
diff --git a/...st/CodeGenCXX/debug-info-composite-cc.cpp → clang/test/DebugInfo/CXX/composite-cc.cpp b/...st/CodeGenCXX/debug-info-composite-cc.cpp → clang/test/DebugInfo/CXX/composite-cc.cpp
diff --git a/...ug-info-composite-triviality-fwd-decl.cpp → ...nfo/CXX/composite-triviality-fwd-decl.cpp b/...ug-info-composite-triviality-fwd-decl.cpp → ...nfo/CXX/composite-triviality-fwd-decl.cpp
diff --git a/...enCXX/debug-info-composite-triviality.cpp → ...st/DebugInfo/CXX/composite-triviality.cpp b/...enCXX/debug-info-composite-triviality.cpp → ...st/DebugInfo/CXX/composite-triviality.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-context.cpp → clang/test/DebugInfo/CXX/context.cpp b/clang/test/CodeGenCXX/debug-info-context.cpp → clang/test/DebugInfo/CXX/context.cpp
diff --git a/.../test/CodeGenCXX/cp-blocks-linetables.cpp → ...st/DebugInfo/CXX/cp-blocks-linetables.cpp b/.../test/CodeGenCXX/cp-blocks-linetables.cpp → ...st/DebugInfo/CXX/cp-blocks-linetables.cpp
diff --git a/...odeGenCXX/debug-info-ctor-homing-flag.cpp → ...g/test/DebugInfo/CXX/ctor-homing-flag.cpp b/...odeGenCXX/debug-info-ctor-homing-flag.cpp → ...g/test/DebugInfo/CXX/ctor-homing-flag.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-ctor.cpp → clang/test/DebugInfo/CXX/ctor.cpp b/clang/test/CodeGenCXX/debug-info-ctor.cpp → clang/test/DebugInfo/CXX/ctor.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-ctor2.cpp → clang/test/DebugInfo/CXX/ctor2.cpp b/clang/test/CodeGenCXX/debug-info-ctor2.cpp → clang/test/DebugInfo/CXX/ctor2.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-cxx0x.cpp → clang/test/DebugInfo/CXX/cxx0x.cpp b/clang/test/CodeGenCXX/debug-info-cxx0x.cpp → clang/test/DebugInfo/CXX/cxx0x.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-cxx1y.cpp → clang/test/DebugInfo/CXX/cxx1y.cpp b/clang/test/CodeGenCXX/debug-info-cxx1y.cpp → clang/test/DebugInfo/CXX/cxx1y.cpp
diff --git a/clang/test/CodeGenCXX/debug-info.cpp → clang/test/DebugInfo/CXX/debug-info.cpp b/clang/test/CodeGenCXX/debug-info.cpp → clang/test/DebugInfo/CXX/debug-info.cpp
diff --git a/...est/CodeGenCXX/debug-info-decl-nested.cpp → clang/test/DebugInfo/CXX/decl-nested.cpp b/...est/CodeGenCXX/debug-info-decl-nested.cpp → clang/test/DebugInfo/CXX/decl-nested.cpp
diff --git a/...t/CodeGenCXX/defaulted-template-alias.cpp → ...ebugInfo/CXX/defaulted-template-alias.cpp b/...t/CodeGenCXX/defaulted-template-alias.cpp → ...ebugInfo/CXX/defaulted-template-alias.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-deleted.cpp → clang/test/DebugInfo/CXX/deleted.cpp b/clang/test/CodeGenCXX/debug-info-deleted.cpp → clang/test/DebugInfo/CXX/deleted.cpp
diff --git a/...t/CodeGenCXX/dependent-template-alias.cpp → ...ebugInfo/CXX/dependent-template-alias.cpp b/...t/CodeGenCXX/dependent-template-alias.cpp → ...ebugInfo/CXX/dependent-template-alias.cpp
diff --git a/.../CodeGenCXX/debug-info-destroy-helper.cpp → clang/test/DebugInfo/CXX/destroy-helper.cpp b/.../CodeGenCXX/debug-info-destroy-helper.cpp → clang/test/DebugInfo/CXX/destroy-helper.cpp
diff --git a/...test/CodeGenCXX/destructor-debug-info.cpp → clang/test/DebugInfo/CXX/destructor.cpp b/...test/CodeGenCXX/destructor-debug-info.cpp → clang/test/DebugInfo/CXX/destructor.cpp
diff --git a/...est/CodeGenCXX/debug-info-determinism.cpp → clang/test/DebugInfo/CXX/determinism.cpp b/...est/CodeGenCXX/debug-info-determinism.cpp → clang/test/DebugInfo/CXX/determinism.cpp
diff --git a/clang/test/CodeGenCXX/difile_entry.cpp → clang/test/DebugInfo/CXX/difile_entry.cpp b/clang/test/CodeGenCXX/difile_entry.cpp → clang/test/DebugInfo/CXX/difile_entry.cpp
diff --git a/...enCXX/debug-info-dllimport-base-class.cpp → ...st/DebugInfo/CXX/dllimport-base-class.cpp b/...enCXX/debug-info-dllimport-base-class.cpp → ...st/DebugInfo/CXX/dllimport-base-class.cpp
diff --git a/...eGenCXX/debug-info-dtor-implicit-args.cpp → ...test/DebugInfo/CXX/dtor-implicit-args.cpp b/...eGenCXX/debug-info-dtor-implicit-args.cpp → ...test/DebugInfo/CXX/dtor-implicit-args.cpp
diff --git a/...st/CodeGenCXX/debug-info-dup-fwd-decl.cpp → clang/test/DebugInfo/CXX/dup-fwd-decl.cpp b/...st/CodeGenCXX/debug-info-dup-fwd-decl.cpp → clang/test/DebugInfo/CXX/dup-fwd-decl.cpp
diff --git a/...test/CodeGenCXX/debug-info-enum-class.cpp → clang/test/DebugInfo/CXX/enum-class.cpp b/...test/CodeGenCXX/debug-info-enum-class.cpp → clang/test/DebugInfo/CXX/enum-class.cpp
diff --git a/.../test/CodeGenCXX/debug-info-enum-i128.cpp → clang/test/DebugInfo/CXX/enum-i128.cpp b/.../test/CodeGenCXX/debug-info-enum-i128.cpp → clang/test/DebugInfo/CXX/enum-i128.cpp
diff --git a/...XX/debug-info-enum-metadata-collision.cpp → ...DebugInfo/CXX/enum-metadata-collision.cpp b/...XX/debug-info-enum-metadata-collision.cpp → ...DebugInfo/CXX/enum-metadata-collision.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-enum.cpp → clang/test/DebugInfo/CXX/enum.cpp b/clang/test/CodeGenCXX/debug-info-enum.cpp → clang/test/DebugInfo/CXX/enum.cpp
diff --git a/...t/CodeGenCXX/debug-info-explicit-cast.cpp → clang/test/DebugInfo/CXX/explicit-cast.cpp b/...t/CodeGenCXX/debug-info-explicit-cast.cpp → clang/test/DebugInfo/CXX/explicit-cast.cpp
diff --git a/...t/CodeGenCXX/debug-info-explicit-this.cpp → clang/test/DebugInfo/CXX/explicit-this.cpp b/...t/CodeGenCXX/debug-info-explicit-this.cpp → clang/test/DebugInfo/CXX/explicit-this.cpp
diff --git a/.../CodeGenCXX/debug-info-export_symbols.cpp → clang/test/DebugInfo/CXX/export_symbols.cpp b/.../CodeGenCXX/debug-info-export_symbols.cpp → clang/test/DebugInfo/CXX/export_symbols.cpp
diff --git a/.../CodeGenCXX/fdebug-info-for-profiling.cpp → ...bugInfo/CXX/fdebug-info-for-profiling.cpp b/.../CodeGenCXX/fdebug-info-for-profiling.cpp → ...bugInfo/CXX/fdebug-info-for-profiling.cpp
diff --git a/...st/CodeGenCXX/field-access-debug-info.cpp → clang/test/DebugInfo/CXX/field-access.cpp b/...st/CodeGenCXX/field-access-debug-info.cpp → clang/test/DebugInfo/CXX/field-access.cpp
diff --git a/...est/CodeGenCXX/debug-info-fn-template.cpp → clang/test/DebugInfo/CXX/fn-template.cpp b/...est/CodeGenCXX/debug-info-fn-template.cpp → clang/test/DebugInfo/CXX/fn-template.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-friend.cpp → clang/test/DebugInfo/CXX/friend.cpp b/clang/test/CodeGenCXX/debug-info-friend.cpp → clang/test/DebugInfo/CXX/friend.cpp
diff --git a/...odeGenCXX/debug-info-function-context.cpp → ...g/test/DebugInfo/CXX/function-context.cpp b/...odeGenCXX/debug-info-function-context.cpp → ...g/test/DebugInfo/CXX/function-context.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited -triple x86_64-pc-linux-gnu %s -fdebug-compilation-dir=%S \
-// RUN:     -dwarf-version=5 -main-file-name debug-info-function-context.cpp  -o - | FileCheck %s
+// RUN:     -dwarf-version=5 -main-file-name function-context.cpp  -o - | FileCheck %s
 
 struct C {
   void member_function();

diff --git a/clang/test/CodeGenCXX/debug-info-fwd-ref.cpp → clang/test/DebugInfo/CXX/fwd-ref.cpp b/clang/test/CodeGenCXX/debug-info-fwd-ref.cpp → clang/test/DebugInfo/CXX/fwd-ref.cpp
diff --git a/...eGenCXX/debug-info-fwd-template-param.cpp → ...test/DebugInfo/CXX/fwd-template-param.cpp b/...eGenCXX/debug-info-fwd-template-param.cpp → ...test/DebugInfo/CXX/fwd-template-param.cpp
diff --git a/...debug-info-gline-tables-only-codeview.cpp → ...ugInfo/CXX/gline-tables-only-codeview.cpp b/...debug-info-gline-tables-only-codeview.cpp → ...ugInfo/CXX/gline-tables-only-codeview.cpp
diff --git a/...deGenCXX/debug-info-gline-tables-only.cpp → .../test/DebugInfo/CXX/gline-tables-only.cpp b/...deGenCXX/debug-info-gline-tables-only.cpp → .../test/DebugInfo/CXX/gline-tables-only.cpp
diff --git a/...odeGenCXX/debug-info-global-ctor-dtor.cpp → ...g/test/DebugInfo/CXX/global-ctor-dtor.cpp b/...odeGenCXX/debug-info-global-ctor-dtor.cpp → ...g/test/DebugInfo/CXX/global-ctor-dtor.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-global.cpp → clang/test/DebugInfo/CXX/global.cpp b/clang/test/CodeGenCXX/debug-info-global.cpp → clang/test/DebugInfo/CXX/global.cpp
diff --git a/clang/test/CodeGenCXX/globalinit-loc.cpp → clang/test/DebugInfo/CXX/globalinit-loc.cpp b/clang/test/CodeGenCXX/globalinit-loc.cpp → clang/test/DebugInfo/CXX/globalinit-loc.cpp
diff --git a/...test/CodeGenCXX/debug-info-globalinit.cpp → clang/test/DebugInfo/CXX/globalinit.cpp b/...test/CodeGenCXX/debug-info-globalinit.cpp → clang/test/DebugInfo/CXX/globalinit.cpp
diff --git a/...odeGenCXX/debug-info-hotpatch-aarch64.cpp → ...g/test/DebugInfo/CXX/hotpatch-aarch64.cpp b/...odeGenCXX/debug-info-hotpatch-aarch64.cpp → ...g/test/DebugInfo/CXX/hotpatch-aarch64.cpp
diff --git a/...st/CodeGenCXX/debug-info-hotpatch-arm.cpp → clang/test/DebugInfo/CXX/hotpatch-arm.cpp b/...st/CodeGenCXX/debug-info-hotpatch-arm.cpp → clang/test/DebugInfo/CXX/hotpatch-arm.cpp
diff --git a/...g/test/CodeGenCXX/debug-info-hotpatch.cpp → clang/test/DebugInfo/CXX/hotpatch.cpp b/...g/test/CodeGenCXX/debug-info-hotpatch.cpp → clang/test/DebugInfo/CXX/hotpatch.cpp
diff --git a/...odeGenCXX/debug-info-incomplete-types.cpp → ...g/test/DebugInfo/CXX/incomplete-types.cpp b/...odeGenCXX/debug-info-incomplete-types.cpp → ...g/test/DebugInfo/CXX/incomplete-types.cpp
diff --git a/...GenCXX/debug-info-indirect-field-decl.cpp → ...est/DebugInfo/CXX/indirect-field-decl.cpp b/...GenCXX/debug-info-indirect-field-decl.cpp → ...est/DebugInfo/CXX/indirect-field-decl.cpp
diff --git a/...CXX/debug-info-inheriting-constructor.cpp → .../DebugInfo/CXX/inheriting-constructor.cpp b/...CXX/debug-info-inheriting-constructor.cpp → .../DebugInfo/CXX/inheriting-constructor.cpp
diff --git a/...st/CodeGenCXX/inline-dllexport-member.cpp → ...DebugInfo/CXX/inline-dllexport-member.cpp b/...st/CodeGenCXX/inline-dllexport-member.cpp → ...DebugInfo/CXX/inline-dllexport-member.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-inlined.cpp → clang/test/DebugInfo/CXX/inlined.cpp b/clang/test/CodeGenCXX/debug-info-inlined.cpp → clang/test/DebugInfo/CXX/inlined.cpp
diff --git a/...t/CodeGenCXX/debug-lambda-expressions.cpp → ...test/DebugInfo/CXX/lambda-expressions.cpp b/...t/CodeGenCXX/debug-lambda-expressions.cpp → ...test/DebugInfo/CXX/lambda-expressions.cpp
@@ -21,7 +21,7 @@ int d(int x) { D y[10]; return [x,y] { return y[x].x; }(); }
 // CHECK-SAME:              line: [[VAR_LINE:[0-9]+]]
 // CHECK-SAME:              type: ![[VAR_T:[0-9]+]]
 
-// CHECK: [[FILE:.*]] = !DIFile(filename: "{{.*}}debug-lambda-expressions.cpp",
+// CHECK: [[FILE:.*]] = !DIFile(filename: "{{.*}}lambda-expressions.cpp",
 
 // CVAR:
 // CHECK: !DIGlobalVariable(name: "cvar"

diff --git a/clang/test/CodeGenCXX/debug-lambda-this.cpp → clang/test/DebugInfo/CXX/lambda-this.cpp b/clang/test/CodeGenCXX/debug-lambda-this.cpp → clang/test/DebugInfo/CXX/lambda-this.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-lambda.cpp → clang/test/DebugInfo/CXX/lambda.cpp b/clang/test/CodeGenCXX/debug-info-lambda.cpp → clang/test/DebugInfo/CXX/lambda.cpp
diff --git a/.../CodeGenCXX/debug-info-large-constant.cpp → clang/test/DebugInfo/CXX/large-constant.cpp b/.../CodeGenCXX/debug-info-large-constant.cpp → clang/test/DebugInfo/CXX/large-constant.cpp
diff --git a/...st/CodeGenCXX/debug-info-limited-ctor.cpp → clang/test/DebugInfo/CXX/limited-ctor.cpp b/...st/CodeGenCXX/debug-info-limited-ctor.cpp → clang/test/DebugInfo/CXX/limited-ctor.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-limited.cpp → clang/test/DebugInfo/CXX/limited.cpp b/clang/test/CodeGenCXX/debug-info-limited.cpp → clang/test/DebugInfo/CXX/limited.cpp
diff --git a/.../test/CodeGenCXX/debug-info-line-if-2.cpp → clang/test/DebugInfo/CXX/line-if-2.cpp b/.../test/CodeGenCXX/debug-info-line-if-2.cpp → clang/test/DebugInfo/CXX/line-if-2.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-line-if.cpp → clang/test/DebugInfo/CXX/line-if.cpp b/clang/test/CodeGenCXX/debug-info-line-if.cpp → clang/test/DebugInfo/CXX/line-if.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-line.cpp → clang/test/DebugInfo/CXX/line.cpp b/clang/test/CodeGenCXX/debug-info-line.cpp → clang/test/DebugInfo/CXX/line.cpp
diff --git a/clang/test/CodeGenCXX/linetable-cleanup.cpp → .../test/DebugInfo/CXX/linetable-cleanup.cpp b/clang/test/CodeGenCXX/linetable-cleanup.cpp → .../test/DebugInfo/CXX/linetable-cleanup.cpp
diff --git a/clang/test/CodeGenCXX/linetable-eh.cpp → clang/test/DebugInfo/CXX/linetable-eh.cpp b/clang/test/CodeGenCXX/linetable-eh.cpp → clang/test/DebugInfo/CXX/linetable-eh.cpp
diff --git a/clang/test/CodeGenCXX/linetable-fnbegin.cpp → .../test/DebugInfo/CXX/linetable-fnbegin.cpp b/clang/test/CodeGenCXX/linetable-fnbegin.cpp → .../test/DebugInfo/CXX/linetable-fnbegin.cpp
diff --git a/...CodeGenCXX/linetable-virtual-variadic.cpp → ...ugInfo/CXX/linetable-virtual-variadic.cpp b/...CodeGenCXX/linetable-virtual-variadic.cpp → ...ugInfo/CXX/linetable-virtual-variadic.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-loops.cpp → clang/test/DebugInfo/CXX/loops.cpp b/clang/test/CodeGenCXX/debug-info-loops.cpp → clang/test/DebugInfo/CXX/loops.cpp
diff --git a/clang/test/CodeGenCXX/lpad-linetable.cpp → clang/test/DebugInfo/CXX/lpad-linetable.cpp b/clang/test/CodeGenCXX/lpad-linetable.cpp → clang/test/DebugInfo/CXX/lpad-linetable.cpp
diff --git a/...est/CodeGenCXX/debug-info-member-call.cpp → clang/test/DebugInfo/CXX/member-call.cpp b/...est/CodeGenCXX/debug-info-member-call.cpp → clang/test/DebugInfo/CXX/member-call.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-member.cpp → clang/test/DebugInfo/CXX/member.cpp b/clang/test/CodeGenCXX/debug-info-member.cpp → clang/test/DebugInfo/CXX/member.cpp
diff --git a/.../CodeGenCXX/debug-info-method-nodebug.cpp → clang/test/DebugInfo/CXX/method-nodebug.cpp b/.../CodeGenCXX/debug-info-method-nodebug.cpp → clang/test/DebugInfo/CXX/method-nodebug.cpp
diff --git a/...est/CodeGenCXX/debug-info-method-spec.cpp → clang/test/DebugInfo/CXX/method-spec.cpp b/...est/CodeGenCXX/debug-info-method-spec.cpp → clang/test/DebugInfo/CXX/method-spec.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-method.cpp → clang/test/DebugInfo/CXX/method.cpp b/clang/test/CodeGenCXX/debug-info-method.cpp → clang/test/DebugInfo/CXX/method.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-method2.cpp → clang/test/DebugInfo/CXX/method2.cpp b/clang/test/CodeGenCXX/debug-info-method2.cpp → clang/test/DebugInfo/CXX/method2.cpp
diff --git a/...rosoft-abi-member-pointers-debug-info.cpp → ...nfo/CXX/microsoft-abi-member-pointers.cpp b/...rosoft-abi-member-pointers-debug-info.cpp → ...nfo/CXX/microsoft-abi-member-pointers.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-ms-abi.cpp → clang/test/DebugInfo/CXX/ms-abi.cpp b/clang/test/CodeGenCXX/debug-info-ms-abi.cpp → clang/test/DebugInfo/CXX/ms-abi.cpp
diff --git a/...odeGenCXX/debug-info-ms-anonymous-tag.cpp → ...g/test/DebugInfo/CXX/ms-anonymous-tag.cpp b/...odeGenCXX/debug-info-ms-anonymous-tag.cpp → ...g/test/DebugInfo/CXX/ms-anonymous-tag.cpp
diff --git a/...st/CodeGenCXX/debug-info-ms-bitfields.cpp → clang/test/DebugInfo/CXX/ms-bitfields.cpp b/...st/CodeGenCXX/debug-info-ms-bitfields.cpp → clang/test/DebugInfo/CXX/ms-bitfields.cpp
diff --git a/.../CodeGenCXX/debug-info-ms-dtor-thunks.cpp → clang/test/DebugInfo/CXX/ms-dtor-thunks.cpp b/.../CodeGenCXX/debug-info-ms-dtor-thunks.cpp → clang/test/DebugInfo/CXX/ms-dtor-thunks.cpp
diff --git a/...est/CodeGenCXX/debug-info-ms-novtable.cpp → clang/test/DebugInfo/CXX/ms-novtable.cpp b/...est/CodeGenCXX/debug-info-ms-novtable.cpp → clang/test/DebugInfo/CXX/ms-novtable.cpp
diff --git a/...odeGenCXX/debug-info-ms-ptr-to-member.cpp → ...g/test/DebugInfo/CXX/ms-ptr-to-member.cpp b/...odeGenCXX/debug-info-ms-ptr-to-member.cpp → ...g/test/DebugInfo/CXX/ms-ptr-to-member.cpp
diff --git a/...g/test/CodeGenCXX/debug-info-ms-vbase.cpp → clang/test/DebugInfo/CXX/ms-vbase.cpp b/...g/test/CodeGenCXX/debug-info-ms-vbase.cpp → clang/test/DebugInfo/CXX/ms-vbase.cpp
diff --git a/.../test/CodeGenCXX/debug-info-namespace.cpp → clang/test/DebugInfo/CXX/namespace.cpp b/.../test/CodeGenCXX/debug-info-namespace.cpp → clang/test/DebugInfo/CXX/namespace.cpp
diff --git a/...st/CodeGenCXX/debug-info-nested-exprs.cpp → clang/test/DebugInfo/CXX/nested-exprs.cpp b/...st/CodeGenCXX/debug-info-nested-exprs.cpp → clang/test/DebugInfo/CXX/nested-exprs.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-nodebug.cpp → clang/test/DebugInfo/CXX/nodebug.cpp b/clang/test/CodeGenCXX/debug-info-nodebug.cpp → clang/test/DebugInfo/CXX/nodebug.cpp
diff --git a/...g/test/CodeGenCXX/debug-info-noreturn.cpp → clang/test/DebugInfo/CXX/noreturn.cpp b/...g/test/CodeGenCXX/debug-info-noreturn.cpp → clang/test/DebugInfo/CXX/noreturn.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-nrvo.cpp → clang/test/DebugInfo/CXX/nrvo.cpp b/clang/test/CodeGenCXX/debug-info-nrvo.cpp → clang/test/DebugInfo/CXX/nrvo.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-nullptr.cpp → clang/test/DebugInfo/CXX/nullptr.cpp b/clang/test/CodeGenCXX/debug-info-nullptr.cpp → clang/test/DebugInfo/CXX/nullptr.cpp
diff --git a/.../CodeGenCXX/debug-info-object-pointer.cpp → clang/test/DebugInfo/CXX/object-pointer.cpp b/.../CodeGenCXX/debug-info-object-pointer.cpp → clang/test/DebugInfo/CXX/object-pointer.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-objname.cpp → clang/test/DebugInfo/CXX/objname.cpp b/clang/test/CodeGenCXX/debug-info-objname.cpp → clang/test/DebugInfo/CXX/objname.cpp
diff --git a/...st/CodeGenCXX/debug-prefix-map-lambda.cpp → .../test/DebugInfo/CXX/prefix-map-lambda.cpp b/...st/CodeGenCXX/debug-prefix-map-lambda.cpp → .../test/DebugInfo/CXX/prefix-map-lambda.cpp
diff --git a/...enCXX/debug-info-programming-language.cpp → ...st/DebugInfo/CXX/programming-language.cpp b/...enCXX/debug-info-programming-language.cpp → ...st/DebugInfo/CXX/programming-language.cpp
diff --git a/...CXX/debug-info-ptr-to-member-function.cpp → .../DebugInfo/CXX/ptr-to-member-function.cpp b/...CXX/debug-info-ptr-to-member-function.cpp → .../DebugInfo/CXX/ptr-to-member-function.cpp
diff --git a/...test/CodeGenCXX/debug-info-ptr-to-ptr.cpp → clang/test/DebugInfo/CXX/ptr-to-ptr.cpp b/...test/CodeGenCXX/debug-info-ptr-to-ptr.cpp → clang/test/DebugInfo/CXX/ptr-to-ptr.cpp
diff --git a/...test/CodeGenCXX/debug-info-qualifiers.cpp → clang/test/DebugInfo/CXX/qualifiers.cpp b/...test/CodeGenCXX/debug-info-qualifiers.cpp → clang/test/DebugInfo/CXX/qualifiers.cpp
diff --git a/...GenCXX/debug-info-range-for-var-names.cpp → ...est/DebugInfo/CXX/range-for-var-names.cpp b/...GenCXX/debug-info-range-for-var-names.cpp → ...est/DebugInfo/CXX/range-for-var-names.cpp
diff --git a/...test/CodeGenCXX/debug-info-rvalue-ref.cpp → clang/test/DebugInfo/CXX/rvalue-ref.cpp b/...test/CodeGenCXX/debug-info-rvalue-ref.cpp → clang/test/DebugInfo/CXX/rvalue-ref.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-scope.cpp → clang/test/DebugInfo/CXX/scope.cpp b/clang/test/CodeGenCXX/debug-info-scope.cpp → clang/test/DebugInfo/CXX/scope.cpp
diff --git a/...st/CodeGenCXX/debug-info-scoped-class.cpp → clang/test/DebugInfo/CXX/scoped-class.cpp b/...st/CodeGenCXX/debug-info-scoped-class.cpp → clang/test/DebugInfo/CXX/scoped-class.cpp
diff --git a/...st/CodeGenCXX/scoped-enums-debug-info.cpp → clang/test/DebugInfo/CXX/scoped-enums.cpp b/...st/CodeGenCXX/scoped-enums-debug-info.cpp → clang/test/DebugInfo/CXX/scoped-enums.cpp
diff --git a/...nCXX/debug-info-simple-template-names.cpp → ...t/DebugInfo/CXX/simple-template-names.cpp b/...nCXX/debug-info-simple-template-names.cpp → ...t/DebugInfo/CXX/simple-template-names.cpp
@@ -70,18 +70,18 @@ void f() {
   // anything other than another unnamed class/struct.
   auto Lambda = [] {};
   f1<decltype(Lambda)>();
-  // CHECK: !DISubprogram(name: "f1<(lambda at {{.*}}debug-info-simple-template-names.cpp:[[# @LINE - 2]]:17)>",
+  // CHECK: !DISubprogram(name: "f1<(lambda at {{.*}}simple-template-names.cpp:[[# @LINE - 2]]:17)>",
   f1<t1<t1<decltype(Lambda)>>>();
   // CHECK: !DISubprogram(name: "f1<t1<t1<(lambda at {{.*}}> > >",
   struct {
   } unnamed_struct;
   f1<decltype(unnamed_struct)>();
-  // CHECK: !DISubprogram(name: "f1<(unnamed struct at {{.*}}debug-info-simple-template-names.cpp:[[# @LINE - 3]]:3)>",
+  // CHECK: !DISubprogram(name: "f1<(unnamed struct at {{.*}}simple-template-names.cpp:[[# @LINE - 3]]:3)>",
   f1<void (decltype(unnamed_struct))>();
-  // CHECK: !DISubprogram(name: "f1<void ((unnamed struct at {{.*}}debug-info-simple-template-names.cpp:[[# @LINE - 5]]:3))>",
+  // CHECK: !DISubprogram(name: "f1<void ((unnamed struct at {{.*}}simple-template-names.cpp:[[# @LINE - 5]]:3))>",
   enum {} unnamed_enum;
   f1<decltype(unnamed_enum)>();
-  // CHECK: !DISubprogram(name: "f1<(unnamed enum at {{.*}}debug-info-simple-template-names.cpp:[[# @LINE - 2]]:3)>",
+  // CHECK: !DISubprogram(name: "f1<(unnamed enum at {{.*}}simple-template-names.cpp:[[# @LINE - 2]]:3)>",
 
   // Declarations can't readily be reversed as the value in the DWARF only
   // contains the address of the value - we'd have to do symbol lookup to find

diff --git a/...CodeGenCXX/standalone-debug-attribute.cpp → ...ugInfo/CXX/standalone-debug-attribute.cpp b/...CodeGenCXX/standalone-debug-attribute.cpp → ...ugInfo/CXX/standalone-debug-attribute.cpp
diff --git a/...test/CodeGenCXX/debug-info-static-fns.cpp → clang/test/DebugInfo/CXX/static-fns.cpp b/...test/CodeGenCXX/debug-info-static-fns.cpp → clang/test/DebugInfo/CXX/static-fns.cpp
diff --git a/...t/CodeGenCXX/debug-info-static-member.cpp → clang/test/DebugInfo/CXX/static-member.cpp b/...t/CodeGenCXX/debug-info-static-member.cpp → clang/test/DebugInfo/CXX/static-member.cpp
diff --git a/...st/CodeGenCXX/debug-info-struct-align.cpp → clang/test/DebugInfo/CXX/struct-align.cpp b/...st/CodeGenCXX/debug-info-struct-align.cpp → clang/test/DebugInfo/CXX/struct-align.cpp
diff --git a/...ebug-info-structured-binding-bitfield.cpp → ...gInfo/CXX/structured-binding-bitfield.cpp b/...ebug-info-structured-binding-bitfield.cpp → ...gInfo/CXX/structured-binding-bitfield.cpp
diff --git a/...eGenCXX/debug-info-structured-binding.cpp → ...test/DebugInfo/CXX/structured-binding.cpp b/...eGenCXX/debug-info-structured-binding.cpp → ...test/DebugInfo/CXX/structured-binding.cpp
diff --git a/clang/test/CodeGenCXX/template-alias.cpp → clang/test/DebugInfo/CXX/template-alias.cpp b/clang/test/CodeGenCXX/template-alias.cpp → clang/test/DebugInfo/CXX/template-alias.cpp
diff --git a/.../CodeGenCXX/debug-info-template-align.cpp → clang/test/DebugInfo/CXX/template-align.cpp b/.../CodeGenCXX/debug-info-template-align.cpp → clang/test/DebugInfo/CXX/template-align.cpp
diff --git a/.../CodeGenCXX/debug-info-template-array.cpp → clang/test/DebugInfo/CXX/template-array.cpp b/.../CodeGenCXX/debug-info-template-array.cpp → clang/test/DebugInfo/CXX/template-array.cpp
diff --git a/...X/debug-info-template-deduction-guide.cpp → ...ebugInfo/CXX/template-deduction-guide.cpp b/...X/debug-info-template-deduction-guide.cpp → ...ebugInfo/CXX/template-deduction-guide.cpp
diff --git a/...info-template-explicit-specialization.cpp → .../CXX/template-explicit-specialization.cpp b/...info-template-explicit-specialization.cpp → .../CXX/template-explicit-specialization.cpp
diff --git a/...st/CodeGenCXX/debug-info-template-fwd.cpp → clang/test/DebugInfo/CXX/template-fwd.cpp b/...st/CodeGenCXX/debug-info-template-fwd.cpp → clang/test/DebugInfo/CXX/template-fwd.cpp
diff --git a/.../CodeGenCXX/debug-info-template-limit.cpp → clang/test/DebugInfo/CXX/template-limit.cpp b/.../CodeGenCXX/debug-info-template-limit.cpp → clang/test/DebugInfo/CXX/template-limit.cpp
diff --git a/...CodeGenCXX/debug-info-template-member.cpp → clang/test/DebugInfo/CXX/template-member.cpp b/...CodeGenCXX/debug-info-template-member.cpp → clang/test/DebugInfo/CXX/template-member.cpp
diff --git a/...eGenCXX/debug-info-template-parameter.cpp → ...test/DebugInfo/CXX/template-parameter.cpp b/...eGenCXX/debug-info-template-parameter.cpp → ...test/DebugInfo/CXX/template-parameter.cpp
diff --git a/...-info-template-partial-specialization.cpp → ...o/CXX/template-partial-specialization.cpp b/...-info-template-partial-specialization.cpp → ...o/CXX/template-partial-specialization.cpp
diff --git a/.../CodeGenCXX/debug-info-template-quals.cpp → clang/test/DebugInfo/CXX/template-quals.cpp b/.../CodeGenCXX/debug-info-template-quals.cpp → clang/test/DebugInfo/CXX/template-quals.cpp
diff --git a/...eGenCXX/debug-info-template-recursive.cpp → ...test/DebugInfo/CXX/template-recursive.cpp b/...eGenCXX/debug-info-template-recursive.cpp → ...test/DebugInfo/CXX/template-recursive.cpp
diff --git a/...g/test/CodeGenCXX/debug-info-template.cpp → clang/test/DebugInfo/CXX/template.cpp b/...g/test/CodeGenCXX/debug-info-template.cpp → clang/test/DebugInfo/CXX/template.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-this.cpp → clang/test/DebugInfo/CXX/this.cpp b/clang/test/CodeGenCXX/debug-info-this.cpp → clang/test/DebugInfo/CXX/this.cpp
diff --git a/...est/CodeGenCXX/debug-info-thunk-msabi.cpp → clang/test/DebugInfo/CXX/thunk-msabi.cpp b/...est/CodeGenCXX/debug-info-thunk-msabi.cpp → clang/test/DebugInfo/CXX/thunk-msabi.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-thunk.cpp → clang/test/DebugInfo/CXX/thunk.cpp b/clang/test/CodeGenCXX/debug-info-thunk.cpp → clang/test/DebugInfo/CXX/thunk.cpp
diff --git a/...test/CodeGenCXX/trivial_abi_debuginfo.cpp → clang/test/DebugInfo/CXX/trivial_abi.cpp b/...test/CodeGenCXX/trivial_abi_debuginfo.cpp → clang/test/DebugInfo/CXX/trivial_abi.cpp
diff --git a/...test/CodeGenCXX/ubsan-check-debuglocs.cpp → ...t/DebugInfo/CXX/ubsan-check-debuglocs.cpp b/...test/CodeGenCXX/ubsan-check-debuglocs.cpp → ...t/DebugInfo/CXX/ubsan-check-debuglocs.cpp
diff --git a/.../CodeGenCXX/debug-info-union-template.cpp → clang/test/DebugInfo/CXX/union-template.cpp b/.../CodeGenCXX/debug-info-union-template.cpp → clang/test/DebugInfo/CXX/union-template.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-union.cpp → clang/test/DebugInfo/CXX/union.cpp b/clang/test/CodeGenCXX/debug-info-union.cpp → clang/test/DebugInfo/CXX/union.cpp
diff --git a/.../CodeGenCXX/debug-info-use-after-free.cpp → clang/test/DebugInfo/CXX/use-after-free.cpp b/.../CodeGenCXX/debug-info-use-after-free.cpp → clang/test/DebugInfo/CXX/use-after-free.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-uuid.cpp → clang/test/DebugInfo/CXX/uuid.cpp b/clang/test/CodeGenCXX/debug-info-uuid.cpp → clang/test/DebugInfo/CXX/uuid.cpp
diff --git a/.../debug-info-var-template-partial-spec.cpp → ...bugInfo/CXX/var-template-partial-spec.cpp b/.../debug-info-var-template-partial-spec.cpp → ...bugInfo/CXX/var-template-partial-spec.cpp
diff --git a/...enCXX/debug-info-var-template-partial.cpp → ...st/DebugInfo/CXX/var-template-partial.cpp b/...enCXX/debug-info-var-template-partial.cpp → ...st/DebugInfo/CXX/var-template-partial.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-varargs.cpp → clang/test/DebugInfo/CXX/varargs.cpp b/clang/test/CodeGenCXX/debug-info-varargs.cpp → clang/test/DebugInfo/CXX/varargs.cpp
diff --git a/...st/CodeGenCXX/variadic-template-alias.cpp → ...DebugInfo/CXX/variadic-template-alias.cpp b/...st/CodeGenCXX/variadic-template-alias.cpp → ...DebugInfo/CXX/variadic-template-alias.cpp
diff --git a/...st/CodeGenCXX/debug-info-verbose-trap.cpp → clang/test/DebugInfo/CXX/verbose-trap.cpp b/...st/CodeGenCXX/debug-info-verbose-trap.cpp → clang/test/DebugInfo/CXX/verbose-trap.cpp
@@ -17,7 +17,7 @@
 
 // CHECK: attributes #[[ATTR1]] = { cold {{.*}}}
 
-// CHECK: ![[FILESCOPE:.*]] = !DIFile(filename: "{{.*}}debug-info-verbose-trap.cpp"
+// CHECK: ![[FILESCOPE:.*]] = !DIFile(filename: "{{.*}}verbose-trap.cpp"
 
 char const constCat[] = "category2";
 char const constMsg[] = "hello";

diff --git a/clang/test/CodeGenCXX/debug-info-vla.cpp → clang/test/DebugInfo/CXX/vla.cpp b/clang/test/CodeGenCXX/debug-info-vla.cpp → clang/test/DebugInfo/CXX/vla.cpp
diff --git a/...deGenCXX/vtable-holder-self-reference.cpp → ...Info/CXX/vtable-holder-self-reference.cpp b/...deGenCXX/vtable-holder-self-reference.cpp → ...Info/CXX/vtable-holder-self-reference.cpp
diff --git a/...vtable-debug-info-inheritance-diamond.cpp → ...ugInfo/CXX/vtable-inheritance-diamond.cpp b/...vtable-debug-info-inheritance-diamond.cpp → ...ugInfo/CXX/vtable-inheritance-diamond.cpp
diff --git a/...table-debug-info-inheritance-multiple.cpp → ...gInfo/CXX/vtable-inheritance-multiple.cpp b/...table-debug-info-inheritance-multiple.cpp → ...gInfo/CXX/vtable-inheritance-multiple.cpp
diff --git a/...le-debug-info-inheritance-simple-main.cpp → ...fo/CXX/vtable-inheritance-simple-main.cpp b/...le-debug-info-inheritance-simple-main.cpp → ...fo/CXX/vtable-inheritance-simple-main.cpp
diff --git a/.../vtable-debug-info-inheritance-simple.cpp → ...bugInfo/CXX/vtable-inheritance-simple.cpp b/.../vtable-debug-info-inheritance-simple.cpp → ...bugInfo/CXX/vtable-inheritance-simple.cpp
diff --git a/...vtable-debug-info-inheritance-virtual.cpp → ...ugInfo/CXX/vtable-inheritance-virtual.cpp b/...vtable-debug-info-inheritance-virtual.cpp → ...ugInfo/CXX/vtable-inheritance-virtual.cpp
diff --git a/...st/CodeGenCXX/debug-info-vtable-optzn.cpp → clang/test/DebugInfo/CXX/vtable-optzn.cpp b/...st/CodeGenCXX/debug-info-vtable-optzn.cpp → clang/test/DebugInfo/CXX/vtable-optzn.cpp
diff --git a/clang/test/CodeGenCXX/vtable-debug-info.cpp → clang/test/DebugInfo/CXX/vtable.cpp b/clang/test/CodeGenCXX/vtable-debug-info.cpp → clang/test/DebugInfo/CXX/vtable.cpp
diff --git a/clang/test/CodeGenCXX/debug-info-wchar.cpp → clang/test/DebugInfo/CXX/wchar.cpp b/clang/test/CodeGenCXX/debug-info-wchar.cpp → clang/test/DebugInfo/CXX/wchar.cpp
diff --git a/...st/CodeGenCXX/debug-info-windows-dtor.cpp → clang/test/DebugInfo/CXX/windows-dtor.cpp b/...st/CodeGenCXX/debug-info-windows-dtor.cpp → clang/test/DebugInfo/CXX/windows-dtor.cpp
diff --git a/...eGenCXX/debug-info-zero-length-arrays.cpp → ...test/DebugInfo/CXX/zero-length-arrays.cpp b/...eGenCXX/debug-info-zero-length-arrays.cpp → ...test/DebugInfo/CXX/zero-length-arrays.cpp
diff --git a/clang/test/CodeGen/2007-05-11-str-const.c → .../DebugInfo/Generic/2007-05-11-str-const.c b/clang/test/CodeGen/2007-05-11-str-const.c → .../DebugInfo/Generic/2007-05-11-str-const.c
diff --git a/clang/test/CodeGen/2009-03-13-dbg.c → ...g/test/DebugInfo/Generic/2009-03-13-dbg.c b/clang/test/CodeGen/2009-03-13-dbg.c → ...g/test/DebugInfo/Generic/2009-03-13-dbg.c
diff --git a/clang/test/CodeGen/2009-04-23-dbg.c → ...g/test/DebugInfo/Generic/2009-04-23-dbg.c b/clang/test/CodeGen/2009-04-23-dbg.c → ...g/test/DebugInfo/Generic/2009-04-23-dbg.c
diff --git a/clang/test/CodeGen/2009-07-31-DbgDeclare.c → ...DebugInfo/Generic/2009-07-31-DbgDeclare.c b/clang/test/CodeGen/2009-07-31-DbgDeclare.c → ...DebugInfo/Generic/2009-07-31-DbgDeclare.c
diff --git a/...est/CodeGen/2010-01-14-FnType-DebugInfo.c → ...nfo/Generic/2010-01-14-FnType-DebugInfo.c b/...est/CodeGen/2010-01-14-FnType-DebugInfo.c → ...nfo/Generic/2010-01-14-FnType-DebugInfo.c
diff --git a/...g/test/CodeGen/2010-01-18-Inlined-Debug.c → ...ugInfo/Generic/2010-01-18-Inlined-Debug.c b/...g/test/CodeGen/2010-01-18-Inlined-Debug.c → ...ugInfo/Generic/2010-01-18-Inlined-Debug.c
diff --git a/clang/test/CodeGen/2010-02-10-PointerName.c → ...ebugInfo/Generic/2010-02-10-PointerName.c b/clang/test/CodeGen/2010-02-10-PointerName.c → ...ebugInfo/Generic/2010-02-10-PointerName.c
diff --git a/clang/test/CodeGen/2010-02-15-DbgStaticVar.c → ...bugInfo/Generic/2010-02-15-DbgStaticVar.c b/clang/test/CodeGen/2010-02-15-DbgStaticVar.c → ...bugInfo/Generic/2010-02-15-DbgStaticVar.c
diff --git a/clang/test/CodeGen/2010-02-16-DbgScopes.c → .../DebugInfo/Generic/2010-02-16-DbgScopes.c b/clang/test/CodeGen/2010-02-16-DbgScopes.c → .../DebugInfo/Generic/2010-02-16-DbgScopes.c
diff --git a/clang/test/CodeGen/2010-03-5-LexicalScope.c → ...ebugInfo/Generic/2010-03-5-LexicalScope.c b/clang/test/CodeGen/2010-03-5-LexicalScope.c → ...ebugInfo/Generic/2010-03-5-LexicalScope.c
diff --git a/...test/CodeGen/2010-07-08-DeclDebugLineNo.c → ...Info/Generic/2010-07-08-DeclDebugLineNo.c b/...test/CodeGen/2010-07-08-DeclDebugLineNo.c → ...Info/Generic/2010-07-08-DeclDebugLineNo.c
diff --git a/clang/test/CodeGen/2010-08-10-DbgConstant.c → ...ebugInfo/Generic/2010-08-10-DbgConstant.c b/clang/test/CodeGen/2010-08-10-DbgConstant.c → ...ebugInfo/Generic/2010-08-10-DbgConstant.c
diff --git a/clang/test/CodeGen/debug-info-257-args.c → clang/test/DebugInfo/Generic/257-args.c b/clang/test/CodeGen/debug-info-257-args.c → clang/test/DebugInfo/Generic/257-args.c
diff --git a/.../CodeGen/Inputs/debug-info-embed-source.c → .../Generic/Inputs/debug-info-embed-source.c b/.../CodeGen/Inputs/debug-info-embed-source.c → .../Generic/Inputs/debug-info-embed-source.c
diff --git a/.../Inputs/debug-info-file-checksum-line.cpp → .../Inputs/debug-info-file-checksum-line.cpp b/.../Inputs/debug-info-file-checksum-line.cpp → .../Inputs/debug-info-file-checksum-line.cpp
diff --git a/...n/Inputs/debug-info-file-checksum-pre.cpp → ...c/Inputs/debug-info-file-checksum-pre.cpp b/...n/Inputs/debug-info-file-checksum-pre.cpp → ...c/Inputs/debug-info-file-checksum-pre.cpp
diff --git a/...CodeGen/Inputs/debug-info-file-checksum.c → ...Generic/Inputs/debug-info-file-checksum.c b/...CodeGen/Inputs/debug-info-file-checksum.c → ...Generic/Inputs/debug-info-file-checksum.c
diff --git a/clang/test/CodeGen/Inputs/debug-info-macro.h → ...bugInfo/Generic/Inputs/debug-info-macro.h b/clang/test/CodeGen/Inputs/debug-info-macro.h → ...bugInfo/Generic/Inputs/debug-info-macro.h
diff --git a/.../test/CodeGen/Inputs/debug-info-slash.cpp → ...gInfo/Generic/Inputs/debug-info-slash.cpp b/.../test/CodeGen/Inputs/debug-info-slash.cpp → ...gInfo/Generic/Inputs/debug-info-slash.cpp
diff --git a/clang/test/CodeGen/Inputs/debug-info-slash.h → ...bugInfo/Generic/Inputs/debug-info-slash.h b/clang/test/CodeGen/Inputs/debug-info-slash.h → ...bugInfo/Generic/Inputs/debug-info-slash.h
diff --git a/clang/test/DebugInfo/Generic/Inputs/stdio.h b/clang/test/DebugInfo/Generic/Inputs/stdio.h
@@ -0,0 +1,9 @@
+struct FILE;
+extern int vfprintf(struct FILE *s, const char *format, __builtin_va_list arg);
+extern int vprintf(const char *format, __builtin_va_list arg);
+
+extern __inline __attribute__((gnu_inline,always_inline)) int
+vprintf(const char *x, __builtin_va_list y)
+{
+  return vfprintf (0, 0, y);
+}
diff --git a/clang/test/CodeGen/debug-info-abspath.c → clang/test/DebugInfo/Generic/abspath.c b/clang/test/CodeGen/debug-info-abspath.c → clang/test/DebugInfo/Generic/abspath.c
@@ -1,9 +1,9 @@
 // RUN: mkdir -p %t/UNIQUEISH_SENTINEL
-// RUN: cp %s %t/UNIQUEISH_SENTINEL/debug-info-abspath.c
+// RUN: cp %s %t/UNIQUEISH_SENTINEL/abspath.c
 
 // RUN: %clang_cc1 -debug-info-kind=limited -triple %itanium_abi_triple \
-// RUN:   -fdebug-compilation-dir=%t/UNIQUEISH_SENTINEL/debug-info-abspath.c \
-// RUN:   %t/UNIQUEISH_SENTINEL/debug-info-abspath.c -emit-llvm -o - \
+// RUN:   -fdebug-compilation-dir=%t/UNIQUEISH_SENTINEL/abspath.c \
+// RUN:   %t/UNIQUEISH_SENTINEL/abspath.c -emit-llvm -o - \
 // RUN:   | FileCheck %s
 
 // RUN: cp %s %t.c
@@ -18,8 +18,8 @@ void foo(void) {}
 
 // CHECK: = distinct !DISubprogram({{.*}}file: ![[SPFILE:[0-9]+]]
 // CHECK: ![[SPFILE]] = !DIFile(filename: "{{.*}}UNIQUEISH_SENTINEL
-// CHECK-SAME:                  debug-info-abspath.c"
+// CHECK-SAME:                  abspath.c"
 // CHECK-NOT:                   directory: "{{.*}}UNIQUEISH_SENTINEL
 
 // INTREE: = distinct !DISubprogram({{.*}}![[SPFILE:[0-9]+]]
-// INTREE: DIFile({{.*}}directory: "{{.+}}CodeGen{{.*}}")
+// INTREE: DIFile({{.*}}directory: "{{.+}}Generic{{.*}}")
diff --git a/...g/test/CodeGen/debug-info-alias-pointer.c → clang/test/DebugInfo/Generic/alias-pointer.c b/...g/test/CodeGen/debug-info-alias-pointer.c → clang/test/DebugInfo/Generic/alias-pointer.c
diff --git a/clang/test/CodeGen/debug-info-alias.c → clang/test/DebugInfo/Generic/alias.c b/clang/test/CodeGen/debug-info-alias.c → clang/test/DebugInfo/Generic/alias.c
diff --git a/.../CodeGen/amdgpu-barrier-type-debug-info.c → .../Generic/amdgpu-barrier-type-debug-info.c b/.../CodeGen/amdgpu-barrier-type-debug-info.c → .../Generic/amdgpu-barrier-type-debug-info.c
diff --git a/...eGen/amdgpu-buffer-rsrc-type-debug-info.c → ...eric/amdgpu-buffer-rsrc-type-debug-info.c b/...eGen/amdgpu-buffer-rsrc-type-debug-info.c → ...eric/amdgpu-buffer-rsrc-type-debug-info.c
diff --git a/clang/test/CodeGen/debug-info-args.c → clang/test/DebugInfo/Generic/args.c b/clang/test/CodeGen/debug-info-args.c → clang/test/DebugInfo/Generic/args.c
diff --git a/clang/test/CodeGen/artificial.c → clang/test/DebugInfo/Generic/artificial.c b/clang/test/CodeGen/artificial.c → clang/test/DebugInfo/Generic/artificial.c
diff --git a/clang/test/CodeGen/debug-info-atomic.c → clang/test/DebugInfo/Generic/atomic.c b/clang/test/CodeGen/debug-info-atomic.c → clang/test/DebugInfo/Generic/atomic.c
diff --git a/...test/CodeGen/attr-btf_type_tag-func-ptr.c → ...Info/Generic/attr-btf_type_tag-func-ptr.c b/...test/CodeGen/attr-btf_type_tag-func-ptr.c → ...Info/Generic/attr-btf_type_tag-func-ptr.c
diff --git a/.../CodeGen/attr-btf_type_tag-similar-type.c → .../Generic/attr-btf_type_tag-similar-type.c b/.../CodeGen/attr-btf_type_tag-similar-type.c → .../Generic/attr-btf_type_tag-similar-type.c
diff --git a/...CodeGen/attr-btf_type_tag-typedef-field.c → ...Generic/attr-btf_type_tag-typedef-field.c b/...CodeGen/attr-btf_type_tag-typedef-field.c → ...Generic/attr-btf_type_tag-typedef-field.c
diff --git a/clang/test/CodeGen/attr-btf_type_tag-var.c → ...DebugInfo/Generic/attr-btf_type_tag-var.c b/clang/test/CodeGen/attr-btf_type_tag-var.c → ...DebugInfo/Generic/attr-btf_type_tag-var.c
diff --git a/...test/CodeGen/attr-counted-by-debug-info.c → ...Info/Generic/attr-counted-by-debug-info.c b/...test/CodeGen/attr-counted-by-debug-info.c → ...Info/Generic/attr-counted-by-debug-info.c
diff --git a/clang/test/CodeGen/attr-nodebug.c → clang/test/DebugInfo/Generic/attr-nodebug.c b/clang/test/CodeGen/attr-nodebug.c → clang/test/DebugInfo/Generic/attr-nodebug.c
diff --git a/clang/test/CodeGen/attr-nodebug2.c → clang/test/DebugInfo/Generic/attr-nodebug2.c b/clang/test/CodeGen/attr-nodebug2.c → clang/test/DebugInfo/Generic/attr-nodebug2.c
diff --git a/...test/CodeGen/debug-info-attributed-stmt.c → .../test/DebugInfo/Generic/attributed-stmt.c b/...test/CodeGen/debug-info-attributed-stmt.c → .../test/DebugInfo/Generic/attributed-stmt.c
diff --git a/...st/CodeGen/debug-info-bitfield-0-struct.c → ...est/DebugInfo/Generic/bitfield-0-struct.c b/...st/CodeGen/debug-info-bitfield-0-struct.c → ...est/DebugInfo/Generic/bitfield-0-struct.c
diff --git a/clang/test/CodeGen/debug-info-block-decl.c → clang/test/DebugInfo/Generic/block-decl.c b/clang/test/CodeGen/debug-info-block-decl.c → clang/test/DebugInfo/Generic/block-decl.c
diff --git a/clang/test/CodeGen/debug-info-block-expr.c → clang/test/DebugInfo/Generic/block-expr.c b/clang/test/CodeGen/debug-info-block-expr.c → clang/test/DebugInfo/Generic/block-expr.c
diff --git a/...est/CodeGen/debug-info-block-out-return.c → ...test/DebugInfo/Generic/block-out-return.c b/...est/CodeGen/debug-info-block-out-return.c → ...test/DebugInfo/Generic/block-out-return.c
diff --git a/clang/test/CodeGen/debug-info-block-vars.c → clang/test/DebugInfo/Generic/block-vars.c b/clang/test/CodeGen/debug-info-block-vars.c → clang/test/DebugInfo/Generic/block-vars.c
diff --git a/clang/test/CodeGen/debug-info-block.c → clang/test/DebugInfo/Generic/block.c b/clang/test/CodeGen/debug-info-block.c → clang/test/DebugInfo/Generic/block.c
diff --git a/.../test/CodeGen/bounds-checking-debuginfo.c → ...gInfo/Generic/bounds-checking-debuginfo.c b/.../test/CodeGen/bounds-checking-debuginfo.c → ...gInfo/Generic/bounds-checking-debuginfo.c
diff --git a/clang/test/CodeGen/bpf-debug-info-unref.c → .../DebugInfo/Generic/bpf-debug-info-unref.c b/clang/test/CodeGen/bpf-debug-info-unref.c → .../DebugInfo/Generic/bpf-debug-info-unref.c
diff --git a/...Gen/builtin-preserve-access-index-array.c → ...ric/builtin-preserve-access-index-array.c b/...Gen/builtin-preserve-access-index-array.c → ...ric/builtin-preserve-access-index-array.c
diff --git a/clang/test/CodeGen/debug-info-cc.c → clang/test/DebugInfo/Generic/cc.c b/clang/test/CodeGen/debug-info-cc.c → clang/test/DebugInfo/Generic/cc.c
diff --git a/...g/test/CodeGen/cfi-check-fail-debuginfo.c → ...ugInfo/Generic/cfi-check-fail-debuginfo.c b/...g/test/CodeGen/cfi-check-fail-debuginfo.c → ...ugInfo/Generic/cfi-check-fail-debuginfo.c
diff --git a/.../CodeGen/cfi-icall-generalize-debuginfo.c → .../Generic/cfi-icall-generalize-debuginfo.c b/.../CodeGen/cfi-icall-generalize-debuginfo.c → .../Generic/cfi-icall-generalize-debuginfo.c
diff --git a/.../CodeGen/cfi-icall-normalize2-debuginfo.c → .../Generic/cfi-icall-normalize2-debuginfo.c b/.../CodeGen/cfi-icall-normalize2-debuginfo.c → .../Generic/cfi-icall-normalize2-debuginfo.c
diff --git a/...t/CodeGen/debug-info-codeview-buildinfo.c → ...st/DebugInfo/Generic/codeview-buildinfo.c b/...t/CodeGen/debug-info-codeview-buildinfo.c → ...st/DebugInfo/Generic/codeview-buildinfo.c
@@ -17,7 +17,7 @@ int main(void) { return 42; }
 // CHECK:                       Types (.debug$T)
 // CHECK: ============================================================
 // CHECK: 0x[[PWD:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String: [[PWDVAL:.+]]
-// CHECK: 0x[[FILEPATH:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String: [[FILEPATHVAL:.+[\\/]debug-info-codeview-buildinfo.c]]
+// CHECK: 0x[[FILEPATH:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String: [[FILEPATHVAL:.+[\\/]codeview-buildinfo.c]]
 // CHECK: 0x[[ZIPDB:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String:
 // CHECK: 0x[[TOOL:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String: [[TOOLVAL:.+[\\/][clang|llvm].*]]
 // CHECK: 0x[[CMDLINE:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String: "-cc1

diff --git a/...deGen/debug-info-codeview-heapallocsite.c → ...ebugInfo/Generic/codeview-heapallocsite.c b/...deGen/debug-info-codeview-heapallocsite.c → ...ebugInfo/Generic/codeview-heapallocsite.c
diff --git a/...est/CodeGen/debug-info-codeview-unnamed.c → ...test/DebugInfo/Generic/codeview-unnamed.c b/...est/CodeGen/debug-info-codeview-unnamed.c → ...test/DebugInfo/Generic/codeview-unnamed.c
diff --git a/...test/CodeGen/debug-info-compilation-dir.c → .../test/DebugInfo/Generic/compilation-dir.c b/...test/CodeGen/debug-info-compilation-dir.c → .../test/DebugInfo/Generic/compilation-dir.c
@@ -5,12 +5,12 @@
 // CHECK-NONSENSE: nonsense
 
 // RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited %s -o - | FileCheck -check-prefix=CHECK-DIR %s
-// CHECK-DIR: CodeGen
+// CHECK-DIR: Generic
 
 /// Test path remapping.
 // RUN: %clang_cc1 -fdebug-compilation-dir=%S -main-file-name %s -emit-llvm -debug-info-kind=limited %s -o - | FileCheck -check-prefix=CHECK-ABS %s
-// CHECK-ABS: DIFile(filename: "{{.*}}debug-info-compilation-dir.c", directory: "{{.*}}CodeGen")
+// CHECK-ABS: DIFile(filename: "{{.*}}compilation-dir.c", directory: "{{.*}}Generic")
 
 // RUN: %clang_cc1 -main-file-name %s -emit-llvm -debug-info-kind=limited %s -o - | FileCheck -check-prefix=CHECK-NOMAP %s
-// CHECK-NOMAP: DIFile(filename: "{{.*}}debug-info-compilation-dir.c", directory: "")
+// CHECK-NOMAP: DIFile(filename: "{{.*}}compilation-dir.c", directory: "")
 
diff --git a/clang/test/CodeGen/debug-info-crash.c → clang/test/DebugInfo/Generic/crash.c b/clang/test/CodeGen/debug-info-crash.c → clang/test/DebugInfo/Generic/crash.c
diff --git a/clang/test/CodeGen/dbg-const-int128.c → ...test/DebugInfo/Generic/dbg-const-int128.c b/clang/test/CodeGen/dbg-const-int128.c → ...test/DebugInfo/Generic/dbg-const-int128.c
diff --git a/clang/test/CodeGen/debug-info.c → clang/test/DebugInfo/Generic/debug-info.c b/clang/test/CodeGen/debug-info.c → clang/test/DebugInfo/Generic/debug-info.c
diff --git a/clang/test/CodeGen/debug-label-inline.c → ...st/DebugInfo/Generic/debug-label-inline.c b/clang/test/CodeGen/debug-label-inline.c → ...st/DebugInfo/Generic/debug-label-inline.c
diff --git a/clang/test/CodeGen/debug-line-1.c → clang/test/DebugInfo/Generic/debug-line-1.c b/clang/test/CodeGen/debug-line-1.c → clang/test/DebugInfo/Generic/debug-line-1.c
diff --git a/clang/test/CodeGen/debug-prefix-map.c → ...test/DebugInfo/Generic/debug-prefix-map.c b/clang/test/CodeGen/debug-prefix-map.c → ...test/DebugInfo/Generic/debug-prefix-map.c
diff --git a/clang/test/CodeGen/debug-prefix-map.cpp → ...st/DebugInfo/Generic/debug-prefix-map.cpp b/clang/test/CodeGen/debug-prefix-map.cpp → ...st/DebugInfo/Generic/debug-prefix-map.cpp
diff --git a/clang/test/CodeGen/debug-info-embed-source.c → clang/test/DebugInfo/Generic/embed-source.c b/clang/test/CodeGen/debug-info-embed-source.c → clang/test/DebugInfo/Generic/embed-source.c
diff --git a/...g/test/CodeGen/debug-info-enum-case-val.c → clang/test/DebugInfo/Generic/enum-case-val.c b/...g/test/CodeGen/debug-info-enum-case-val.c → clang/test/DebugInfo/Generic/enum-case-val.c
diff --git a/...t/CodeGen/debug-info-enum-extensibility.c → ...st/DebugInfo/Generic/enum-extensibility.c b/...t/CodeGen/debug-info-enum-extensibility.c → ...st/DebugInfo/Generic/enum-extensibility.c
diff --git a/clang/test/CodeGen/debug-info-enum.c → clang/test/DebugInfo/Generic/enum.c b/clang/test/CodeGen/debug-info-enum.c → clang/test/DebugInfo/Generic/enum.c
diff --git a/clang/test/CodeGen/debug-info-enum.cpp → clang/test/DebugInfo/Generic/enum.cpp b/clang/test/CodeGen/debug-info-enum.cpp → clang/test/DebugInfo/Generic/enum.cpp
diff --git a/clang/test/CodeGen/enum2.c → clang/test/DebugInfo/Generic/enum2.c b/clang/test/CodeGen/enum2.c → clang/test/DebugInfo/Generic/enum2.c
diff --git a/clang/test/CodeGen/debug-info-extern-basic.c → clang/test/DebugInfo/Generic/extern-basic.c b/clang/test/CodeGen/debug-info-extern-basic.c → clang/test/DebugInfo/Generic/extern-basic.c
diff --git a/.../test/CodeGen/debug-info-extern-basic.cpp → ...g/test/DebugInfo/Generic/extern-basic.cpp b/.../test/CodeGen/debug-info-extern-basic.cpp → ...g/test/DebugInfo/Generic/extern-basic.cpp
diff --git a/clang/test/CodeGen/debug-info-extern-call.c → clang/test/DebugInfo/Generic/extern-call.c b/clang/test/CodeGen/debug-info-extern-call.c → clang/test/DebugInfo/Generic/extern-call.c
diff --git a/...test/CodeGen/debug-info-extern-callback.c → .../test/DebugInfo/Generic/extern-callback.c b/...test/CodeGen/debug-info-extern-callback.c → .../test/DebugInfo/Generic/extern-callback.c
diff --git a/...est/CodeGen/debug-info-extern-duplicate.c → ...test/DebugInfo/Generic/extern-duplicate.c b/...est/CodeGen/debug-info-extern-duplicate.c → ...test/DebugInfo/Generic/extern-duplicate.c
diff --git a/clang/test/CodeGen/debug-info-extern-multi.c → clang/test/DebugInfo/Generic/extern-multi.c b/clang/test/CodeGen/debug-info-extern-multi.c → clang/test/DebugInfo/Generic/extern-multi.c
diff --git a/...g/test/CodeGen/debug-info-extern-unused.c → clang/test/DebugInfo/Generic/extern-unused.c b/...g/test/CodeGen/debug-info-extern-unused.c → clang/test/DebugInfo/Generic/extern-unused.c
diff --git a/clang/test/CodeGen/fake-use-return-line.c → .../DebugInfo/Generic/fake-use-return-line.c b/clang/test/CodeGen/fake-use-return-line.c → .../DebugInfo/Generic/fake-use-return-line.c
diff --git a/clang/test/CodeGen/debug-info-file-change.c → clang/test/DebugInfo/Generic/file-change.c b/clang/test/CodeGen/debug-info-file-change.c → clang/test/DebugInfo/Generic/file-change.c
diff --git a/...g/test/CodeGen/debug-info-file-checksum.c → clang/test/DebugInfo/Generic/file-checksum.c b/...g/test/CodeGen/debug-info-file-checksum.c → clang/test/DebugInfo/Generic/file-checksum.c
diff --git a/...st/CodeGen/debug-info-gline-tables-only.c → ...est/DebugInfo/Generic/gline-tables-only.c b/...st/CodeGen/debug-info-gline-tables-only.c → ...est/DebugInfo/Generic/gline-tables-only.c
diff --git a/...t/CodeGen/debug-info-gline-tables-only2.c → ...st/DebugInfo/Generic/gline-tables-only2.c b/...t/CodeGen/debug-info-gline-tables-only2.c → ...st/DebugInfo/Generic/gline-tables-only2.c
diff --git a/clang/test/CodeGen/global-blocks-lines.c → ...t/DebugInfo/Generic/global-blocks-lines.c b/clang/test/CodeGen/global-blocks-lines.c → ...t/DebugInfo/Generic/global-blocks-lines.c
diff --git a/...test/CodeGen/debug-info-global-constant.c → .../test/DebugInfo/Generic/global-constant.c b/...test/CodeGen/debug-info-global-constant.c → .../test/DebugInfo/Generic/global-constant.c
diff --git a/...st/CodeGen/debug-info-imported-entity.cpp → ...est/DebugInfo/Generic/imported-entity.cpp b/...st/CodeGen/debug-info-imported-entity.cpp → ...est/DebugInfo/Generic/imported-entity.cpp
@@ -7,4 +7,4 @@ using std::A; using ::A;
 // CHECK: [[Imports]] = !{[[ImportedEntity:![0-9]+]]}
 // CHECK: [[ImportedEntity]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[CompileUnit]], entity: [[STDA:![0-9]+]], file: [[FILE:![0-9]+]], line: 4)
 // CHECK: [[STDA]] = !DICompositeType(tag: DW_TAG_class_type, name: "A",
-// CHECK: [[FILE]] = !DIFile(filename: {{.*}}debug-info-imported-entity.cpp
+// CHECK: [[FILE]] = !DIFile(filename: {{.*}}imported-entity.cpp
diff --git a/clang/test/CodeGen/debug-info-inline-for.c → clang/test/DebugInfo/Generic/inline-for.c b/clang/test/CodeGen/debug-info-inline-for.c → clang/test/DebugInfo/Generic/inline-for.c
diff --git a/clang/test/CodeGen/debug-label.c → clang/test/DebugInfo/Generic/label.c b/clang/test/CodeGen/debug-label.c → clang/test/DebugInfo/Generic/label.c
diff --git a/clang/test/CodeGen/lifetime-debuginfo-1.c → .../DebugInfo/Generic/lifetime-debuginfo-1.c b/clang/test/CodeGen/lifetime-debuginfo-1.c → .../DebugInfo/Generic/lifetime-debuginfo-1.c
diff --git a/clang/test/CodeGen/lifetime-debuginfo-2.c → .../DebugInfo/Generic/lifetime-debuginfo-2.c b/clang/test/CodeGen/lifetime-debuginfo-2.c → .../DebugInfo/Generic/lifetime-debuginfo-2.c
diff --git a/clang/test/CodeGen/debug-info-limited.c → clang/test/DebugInfo/Generic/limited.c b/clang/test/CodeGen/debug-info-limited.c → clang/test/DebugInfo/Generic/limited.c
diff --git a/clang/test/CodeGen/debug-info-line.c → clang/test/DebugInfo/Generic/line.c b/clang/test/CodeGen/debug-info-line.c → clang/test/DebugInfo/Generic/line.c
diff --git a/clang/test/CodeGen/debug-info-line2.c → clang/test/DebugInfo/Generic/line2.c b/clang/test/CodeGen/debug-info-line2.c → clang/test/DebugInfo/Generic/line2.c
diff --git a/clang/test/CodeGen/debug-info-line3.c → clang/test/DebugInfo/Generic/line3.c b/clang/test/CodeGen/debug-info-line3.c → clang/test/DebugInfo/Generic/line3.c
diff --git a/clang/test/CodeGen/debug-info-line4.c → clang/test/DebugInfo/Generic/line4.c b/clang/test/CodeGen/debug-info-line4.c → clang/test/DebugInfo/Generic/line4.c
diff --git a/clang/test/CodeGen/lineno-dbginfo.c → ...g/test/DebugInfo/Generic/lineno-dbginfo.c b/clang/test/CodeGen/lineno-dbginfo.c → ...g/test/DebugInfo/Generic/lineno-dbginfo.c
diff --git a/clang/test/CodeGen/linetable-endscope.c → ...st/DebugInfo/Generic/linetable-endscope.c b/clang/test/CodeGen/linetable-endscope.c → ...st/DebugInfo/Generic/linetable-endscope.c
diff --git a/clang/test/CodeGen/debug-info-lto.c → clang/test/DebugInfo/Generic/lto.c b/clang/test/CodeGen/debug-info-lto.c → clang/test/DebugInfo/Generic/lto.c
diff --git a/clang/test/CodeGen/debug-info-macro.c → clang/test/DebugInfo/Generic/macro.c b/clang/test/CodeGen/debug-info-macro.c → clang/test/DebugInfo/Generic/macro.c
@@ -30,7 +30,7 @@
 // PCH:    [[Macros]] = !{[[MainMacroFile:![0-9]+]], [[DefineC1:![0-9]+]], [[DefineA:![0-9]+]], [[UndefC1:![0-9]+]]}
 
 // CHECK:  [[MainMacroFile]] = !DIMacroFile(file: [[MainFile:![0-9]+]], nodes: [[N1:![0-9]+]])
-// CHECK:  [[MainFile]] = !DIFile(filename: "{{.*}}debug-info-macro.c"
+// CHECK:  [[MainFile]] = !DIFile(filename: "{{.*}}macro.c"
 // CHECK:  [[N1]] = !{[[CommandLineInclude:![0-9]+]], [[DefineD1:![0-9]+]], [[FileInclude1:![0-9]+]], [[UndefD1:![0-9]+]], [[DefineD2:![0-9]+]], [[FileInclude2:![0-9]+]], [[UndefD2:![0-9]+]]}
 
 // CHECK:  [[CommandLineInclude]] = !DIMacroFile(file: [[HeaderFile:![0-9]+]], nodes: [[N2:![0-9]+]])

diff --git a/clang/test/CodeGen/debug-info-matrix-types.c → clang/test/DebugInfo/Generic/matrix-types.c b/clang/test/CodeGen/debug-info-matrix-types.c → clang/test/DebugInfo/Generic/matrix-types.c
diff --git a/clang/test/CodeGen/debug-info-member.c → clang/test/DebugInfo/Generic/member.c b/clang/test/CodeGen/debug-info-member.c → clang/test/DebugInfo/Generic/member.c
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited %S/Inputs/class-limited.cpp -o - \| FileCheck %S/Inputs/class-limited.cpp