Author: Michael Buch
Date: 2025-08-21T09:26:08+01:00
New Revision: f2aedc21f9fc9f3cd67116b0de35d09aa9f15fe4

URL: 
https://github.com/llvm/llvm-project/commit/f2aedc21f9fc9f3cd67116b0de35d09aa9f15fe4
DIFF: 
https://github.com/llvm/llvm-project/commit/f2aedc21f9fc9f3cd67116b0de35d09aa9f15fe4.diff

LOG: [clang][DebugInfo][test] Move debug-info tests from CodeGenCXX to 
DebugInfo directory (#154538)

This patch works towards consolidating all Clang debug-info into the
`clang/test/DebugInfo` directory
(https://discourse.llvm.org/t/clang-test-location-of-clang-debug-info-tests/87958).

Here we move only the `clang/test/CodeGenCXX` tests. I created a `CXX`
subdirectory for now because many of the tests I checked actually did
seem C++-specific. There is probably overlap between the `Generic` and
`CXX` subdirectory, but I haven't gone through and audited them all.

The list of files i came up with is:
1. searched for anything with `*debug-info*` in the filename
2. searched for occurrences of `debug-info-kind` in the tests

There's a couple of tests in `clang/test/CodeGenCXX` that still set
`-debug-info-kind`. They probably don't need to do that, but I'm not
changing that as part of this PR.

Added: 
    clang/test/CodeGenCXX/lambda-this-2.cpp
    clang/test/DebugInfo/CXX/2006-11-20-GlobalSymbols.cpp
    clang/test/DebugInfo/CXX/2007-01-02-UnboundedArray.cpp
    clang/test/DebugInfo/CXX/2009-03-17.cpp
    clang/test/DebugInfo/CXX/2009-06-16-Crash.cpp
    clang/test/DebugInfo/CXX/2010-05-10-Var.cpp
    clang/test/DebugInfo/CXX/2010-05-12-PtrToMember.cpp
    clang/test/DebugInfo/CXX/2010-06-21-LocalVarDbg.cpp
    clang/test/DebugInfo/CXX/2010-07-23-DeclLoc.cpp
    clang/test/DebugInfo/CXX/Inputs/class-limited.cpp
    clang/test/DebugInfo/CXX/PR20038.cpp
    clang/test/DebugInfo/CXX/access.cpp
    clang/test/DebugInfo/CXX/aix-static-init.cpp
    clang/test/DebugInfo/CXX/alias.cpp
    clang/test/DebugInfo/CXX/all-calls-described.cpp
    clang/test/DebugInfo/CXX/anon-namespace.cpp
    clang/test/DebugInfo/CXX/anon-union-vars.cpp
    clang/test/DebugInfo/CXX/artificial-arg.cpp
    clang/test/DebugInfo/CXX/atexit-stub.cpp
    clang/test/DebugInfo/CXX/auto-return.cpp
    clang/test/DebugInfo/CXX/block-invocation-linkage-name.cpp
    clang/test/DebugInfo/CXX/blocks.cpp
    clang/test/DebugInfo/CXX/bpf-structors.cpp
    clang/test/DebugInfo/CXX/byval.cpp
    clang/test/DebugInfo/CXX/calling-conventions.cpp
    clang/test/DebugInfo/CXX/char16.cpp
    clang/test/DebugInfo/CXX/class-limited-plugin.test
    clang/test/DebugInfo/CXX/class-limited.test
    clang/test/DebugInfo/CXX/class-nolimit.cpp
    clang/test/DebugInfo/CXX/class-optzns.cpp
    clang/test/DebugInfo/CXX/class.cpp
    clang/test/DebugInfo/CXX/codeview-display-name.cpp
    clang/test/DebugInfo/CXX/codeview-heapallocsite.cpp
    clang/test/DebugInfo/CXX/codeview-injected-class.cpp
    clang/test/DebugInfo/CXX/codeview-nested-types.cpp
    clang/test/DebugInfo/CXX/codeview-nodebug.cpp
    clang/test/DebugInfo/CXX/codeview-template-literal.cpp
    clang/test/DebugInfo/CXX/codeview-template-type.cpp
    clang/test/DebugInfo/CXX/codeview-unnamed.cpp
    clang/test/DebugInfo/CXX/codeview-var-templates.cpp
    clang/test/DebugInfo/CXX/coff.cpp
    clang/test/DebugInfo/CXX/composite-cc.cpp
    clang/test/DebugInfo/CXX/composite-triviality-fwd-decl.cpp
    clang/test/DebugInfo/CXX/composite-triviality.cpp
    clang/test/DebugInfo/CXX/context.cpp
    clang/test/DebugInfo/CXX/cp-blocks-linetables.cpp
    clang/test/DebugInfo/CXX/ctor-homing-flag.cpp
    clang/test/DebugInfo/CXX/ctor.cpp
    clang/test/DebugInfo/CXX/ctor2.cpp
    clang/test/DebugInfo/CXX/cxx0x.cpp
    clang/test/DebugInfo/CXX/cxx1y.cpp
    clang/test/DebugInfo/CXX/debug-info.cpp
    clang/test/DebugInfo/CXX/decl-nested.cpp
    clang/test/DebugInfo/CXX/defaulted-template-alias.cpp
    clang/test/DebugInfo/CXX/deleted.cpp
    clang/test/DebugInfo/CXX/dependent-template-alias.cpp
    clang/test/DebugInfo/CXX/destroy-helper.cpp
    clang/test/DebugInfo/CXX/destructor.cpp
    clang/test/DebugInfo/CXX/determinism.cpp
    clang/test/DebugInfo/CXX/difile_entry.cpp
    clang/test/DebugInfo/CXX/dllimport-base-class.cpp
    clang/test/DebugInfo/CXX/dtor-implicit-args.cpp
    clang/test/DebugInfo/CXX/dup-fwd-decl.cpp
    clang/test/DebugInfo/CXX/enum-class.cpp
    clang/test/DebugInfo/CXX/enum-i128.cpp
    clang/test/DebugInfo/CXX/enum-metadata-collision.cpp
    clang/test/DebugInfo/CXX/enum.cpp
    clang/test/DebugInfo/CXX/explicit-cast.cpp
    clang/test/DebugInfo/CXX/explicit-this.cpp
    clang/test/DebugInfo/CXX/export_symbols.cpp
    clang/test/DebugInfo/CXX/fdebug-info-for-profiling.cpp
    clang/test/DebugInfo/CXX/field-access.cpp
    clang/test/DebugInfo/CXX/fn-template.cpp
    clang/test/DebugInfo/CXX/friend.cpp
    clang/test/DebugInfo/CXX/function-context.cpp
    clang/test/DebugInfo/CXX/fwd-ref.cpp
    clang/test/DebugInfo/CXX/fwd-template-param.cpp
    clang/test/DebugInfo/CXX/gline-tables-only-codeview.cpp
    clang/test/DebugInfo/CXX/gline-tables-only.cpp
    clang/test/DebugInfo/CXX/global-ctor-dtor.cpp
    clang/test/DebugInfo/CXX/global.cpp
    clang/test/DebugInfo/CXX/globalinit-loc.cpp
    clang/test/DebugInfo/CXX/globalinit.cpp
    clang/test/DebugInfo/CXX/hotpatch-aarch64.cpp
    clang/test/DebugInfo/CXX/hotpatch-arm.cpp
    clang/test/DebugInfo/CXX/hotpatch.cpp
    clang/test/DebugInfo/CXX/incomplete-types.cpp
    clang/test/DebugInfo/CXX/indirect-field-decl.cpp
    clang/test/DebugInfo/CXX/inheriting-constructor.cpp
    clang/test/DebugInfo/CXX/inline-dllexport-member.cpp
    clang/test/DebugInfo/CXX/inlined.cpp
    clang/test/DebugInfo/CXX/lambda-expressions.cpp
    clang/test/DebugInfo/CXX/lambda-this.cpp
    clang/test/DebugInfo/CXX/lambda.cpp
    clang/test/DebugInfo/CXX/large-constant.cpp
    clang/test/DebugInfo/CXX/limited-ctor.cpp
    clang/test/DebugInfo/CXX/limited.cpp
    clang/test/DebugInfo/CXX/line-if-2.cpp
    clang/test/DebugInfo/CXX/line-if.cpp
    clang/test/DebugInfo/CXX/line.cpp
    clang/test/DebugInfo/CXX/linetable-cleanup.cpp
    clang/test/DebugInfo/CXX/linetable-eh.cpp
    clang/test/DebugInfo/CXX/linetable-fnbegin.cpp
    clang/test/DebugInfo/CXX/linetable-virtual-variadic.cpp
    clang/test/DebugInfo/CXX/loops.cpp
    clang/test/DebugInfo/CXX/lpad-linetable.cpp
    clang/test/DebugInfo/CXX/member-call.cpp
    clang/test/DebugInfo/CXX/member.cpp
    clang/test/DebugInfo/CXX/method-nodebug.cpp
    clang/test/DebugInfo/CXX/method-spec.cpp
    clang/test/DebugInfo/CXX/method.cpp
    clang/test/DebugInfo/CXX/method2.cpp
    clang/test/DebugInfo/CXX/microsoft-abi-member-pointers.cpp
    clang/test/DebugInfo/CXX/ms-abi.cpp
    clang/test/DebugInfo/CXX/ms-anonymous-tag.cpp
    clang/test/DebugInfo/CXX/ms-bitfields.cpp
    clang/test/DebugInfo/CXX/ms-dtor-thunks.cpp
    clang/test/DebugInfo/CXX/ms-novtable.cpp
    clang/test/DebugInfo/CXX/ms-ptr-to-member.cpp
    clang/test/DebugInfo/CXX/ms-vbase.cpp
    clang/test/DebugInfo/CXX/namespace.cpp
    clang/test/DebugInfo/CXX/nested-exprs.cpp
    clang/test/DebugInfo/CXX/nodebug.cpp
    clang/test/DebugInfo/CXX/noreturn.cpp
    clang/test/DebugInfo/CXX/nrvo.cpp
    clang/test/DebugInfo/CXX/nullptr.cpp
    clang/test/DebugInfo/CXX/object-pointer.cpp
    clang/test/DebugInfo/CXX/objname.cpp
    clang/test/DebugInfo/CXX/prefix-map-lambda.cpp
    clang/test/DebugInfo/CXX/programming-language.cpp
    clang/test/DebugInfo/CXX/ptr-to-member-function.cpp
    clang/test/DebugInfo/CXX/ptr-to-ptr.cpp
    clang/test/DebugInfo/CXX/qualifiers.cpp
    clang/test/DebugInfo/CXX/range-for-var-names.cpp
    clang/test/DebugInfo/CXX/rvalue-ref.cpp
    clang/test/DebugInfo/CXX/scope.cpp
    clang/test/DebugInfo/CXX/scoped-class.cpp
    clang/test/DebugInfo/CXX/scoped-enums.cpp
    clang/test/DebugInfo/CXX/simple-template-names.cpp
    clang/test/DebugInfo/CXX/standalone-debug-attribute.cpp
    clang/test/DebugInfo/CXX/static-fns.cpp
    clang/test/DebugInfo/CXX/static-member.cpp
    clang/test/DebugInfo/CXX/struct-align.cpp
    clang/test/DebugInfo/CXX/structured-binding-bitfield.cpp
    clang/test/DebugInfo/CXX/structured-binding.cpp
    clang/test/DebugInfo/CXX/template-alias.cpp
    clang/test/DebugInfo/CXX/template-align.cpp
    clang/test/DebugInfo/CXX/template-array.cpp
    clang/test/DebugInfo/CXX/template-deduction-guide.cpp
    clang/test/DebugInfo/CXX/template-explicit-specialization.cpp
    clang/test/DebugInfo/CXX/template-fwd.cpp
    clang/test/DebugInfo/CXX/template-limit.cpp
    clang/test/DebugInfo/CXX/template-member.cpp
    clang/test/DebugInfo/CXX/template-parameter.cpp
    clang/test/DebugInfo/CXX/template-partial-specialization.cpp
    clang/test/DebugInfo/CXX/template-quals.cpp
    clang/test/DebugInfo/CXX/template-recursive.cpp
    clang/test/DebugInfo/CXX/template.cpp
    clang/test/DebugInfo/CXX/this.cpp
    clang/test/DebugInfo/CXX/thunk-msabi.cpp
    clang/test/DebugInfo/CXX/thunk.cpp
    clang/test/DebugInfo/CXX/trivial_abi.cpp
    clang/test/DebugInfo/CXX/ubsan-check-debuglocs.cpp
    clang/test/DebugInfo/CXX/union-template.cpp
    clang/test/DebugInfo/CXX/union.cpp
    clang/test/DebugInfo/CXX/use-after-free.cpp
    clang/test/DebugInfo/CXX/uuid.cpp
    clang/test/DebugInfo/CXX/var-template-partial-spec.cpp
    clang/test/DebugInfo/CXX/var-template-partial.cpp
    clang/test/DebugInfo/CXX/varargs.cpp
    clang/test/DebugInfo/CXX/variadic-template-alias.cpp
    clang/test/DebugInfo/CXX/verbose-trap.cpp
    clang/test/DebugInfo/CXX/vla.cpp
    clang/test/DebugInfo/CXX/vtable-holder-self-reference.cpp
    clang/test/DebugInfo/CXX/vtable-inheritance-diamond.cpp
    clang/test/DebugInfo/CXX/vtable-inheritance-multiple.cpp
    clang/test/DebugInfo/CXX/vtable-inheritance-simple-main.cpp
    clang/test/DebugInfo/CXX/vtable-inheritance-simple.cpp
    clang/test/DebugInfo/CXX/vtable-inheritance-virtual.cpp
    clang/test/DebugInfo/CXX/vtable-optzn.cpp
    clang/test/DebugInfo/CXX/vtable.cpp
    clang/test/DebugInfo/CXX/wchar.cpp
    clang/test/DebugInfo/CXX/windows-dtor.cpp
    clang/test/DebugInfo/CXX/zero-length-arrays.cpp

Modified: 
    

Removed: 
    clang/test/CodeGenCXX/2006-11-20-GlobalSymbols.cpp
    clang/test/CodeGenCXX/2007-01-02-UnboundedArray.cpp
    clang/test/CodeGenCXX/2009-03-17-dbg.cpp
    clang/test/CodeGenCXX/2009-06-16-DebugInfoCrash.cpp
    clang/test/CodeGenCXX/2010-05-10-Var-DbgInfo.cpp
    clang/test/CodeGenCXX/2010-05-12-PtrToMember-Dbg.cpp
    clang/test/CodeGenCXX/2010-06-21-LocalVarDbg.cpp
    clang/test/CodeGenCXX/2010-07-23-DeclLoc.cpp
    clang/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp
    clang/test/CodeGenCXX/PR20038.cpp
    clang/test/CodeGenCXX/aix-static-init-debug-info.cpp
    clang/test/CodeGenCXX/bpf-debug-structors.cpp
    clang/test/CodeGenCXX/cp-blocks-linetables.cpp
    clang/test/CodeGenCXX/dbg-info-all-calls-described.cpp
    clang/test/CodeGenCXX/debug-info-access.cpp
    clang/test/CodeGenCXX/debug-info-alias.cpp
    clang/test/CodeGenCXX/debug-info-anon-namespace.cpp
    clang/test/CodeGenCXX/debug-info-anon-union-vars.cpp
    clang/test/CodeGenCXX/debug-info-artificial-arg.cpp
    clang/test/CodeGenCXX/debug-info-atexit-stub.cpp
    clang/test/CodeGenCXX/debug-info-auto-return.cpp
    clang/test/CodeGenCXX/debug-info-block-invocation-linkage-name.cpp
    clang/test/CodeGenCXX/debug-info-blocks.cpp
    clang/test/CodeGenCXX/debug-info-byval.cpp
    clang/test/CodeGenCXX/debug-info-calling-conventions.cpp
    clang/test/CodeGenCXX/debug-info-char16.cpp
    clang/test/CodeGenCXX/debug-info-class-limited-plugin.test
    clang/test/CodeGenCXX/debug-info-class-limited.test
    clang/test/CodeGenCXX/debug-info-class-nolimit.cpp
    clang/test/CodeGenCXX/debug-info-class-optzns.cpp
    clang/test/CodeGenCXX/debug-info-class.cpp
    clang/test/CodeGenCXX/debug-info-codeview-display-name.cpp
    clang/test/CodeGenCXX/debug-info-codeview-heapallocsite.cpp
    clang/test/CodeGenCXX/debug-info-codeview-injected-class.cpp
    clang/test/CodeGenCXX/debug-info-codeview-nested-types.cpp
    clang/test/CodeGenCXX/debug-info-codeview-nodebug.cpp
    clang/test/CodeGenCXX/debug-info-codeview-template-literal.cpp
    clang/test/CodeGenCXX/debug-info-codeview-template-type.cpp
    clang/test/CodeGenCXX/debug-info-codeview-unnamed.cpp
    clang/test/CodeGenCXX/debug-info-codeview-var-templates.cpp
    clang/test/CodeGenCXX/debug-info-coff.cpp
    clang/test/CodeGenCXX/debug-info-composite-cc.cpp
    clang/test/CodeGenCXX/debug-info-composite-triviality-fwd-decl.cpp
    clang/test/CodeGenCXX/debug-info-composite-triviality.cpp
    clang/test/CodeGenCXX/debug-info-context.cpp
    clang/test/CodeGenCXX/debug-info-ctor-homing-flag.cpp
    clang/test/CodeGenCXX/debug-info-ctor.cpp
    clang/test/CodeGenCXX/debug-info-ctor2.cpp
    clang/test/CodeGenCXX/debug-info-cxx0x.cpp
    clang/test/CodeGenCXX/debug-info-cxx1y.cpp
    clang/test/CodeGenCXX/debug-info-decl-nested.cpp
    clang/test/CodeGenCXX/debug-info-deleted.cpp
    clang/test/CodeGenCXX/debug-info-destroy-helper.cpp
    clang/test/CodeGenCXX/debug-info-determinism.cpp
    clang/test/CodeGenCXX/debug-info-dllimport-base-class.cpp
    clang/test/CodeGenCXX/debug-info-dtor-implicit-args.cpp
    clang/test/CodeGenCXX/debug-info-dup-fwd-decl.cpp
    clang/test/CodeGenCXX/debug-info-enum-class.cpp
    clang/test/CodeGenCXX/debug-info-enum-i128.cpp
    clang/test/CodeGenCXX/debug-info-enum-metadata-collision.cpp
    clang/test/CodeGenCXX/debug-info-enum.cpp
    clang/test/CodeGenCXX/debug-info-explicit-cast.cpp
    clang/test/CodeGenCXX/debug-info-explicit-this.cpp
    clang/test/CodeGenCXX/debug-info-export_symbols.cpp
    clang/test/CodeGenCXX/debug-info-fn-template.cpp
    clang/test/CodeGenCXX/debug-info-friend.cpp
    clang/test/CodeGenCXX/debug-info-function-context.cpp
    clang/test/CodeGenCXX/debug-info-fwd-ref.cpp
    clang/test/CodeGenCXX/debug-info-fwd-template-param.cpp
    clang/test/CodeGenCXX/debug-info-gline-tables-only-codeview.cpp
    clang/test/CodeGenCXX/debug-info-gline-tables-only.cpp
    clang/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp
    clang/test/CodeGenCXX/debug-info-global.cpp
    clang/test/CodeGenCXX/debug-info-globalinit.cpp
    clang/test/CodeGenCXX/debug-info-hotpatch-aarch64.cpp
    clang/test/CodeGenCXX/debug-info-hotpatch-arm.cpp
    clang/test/CodeGenCXX/debug-info-hotpatch.cpp
    clang/test/CodeGenCXX/debug-info-incomplete-types.cpp
    clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp
    clang/test/CodeGenCXX/debug-info-inheriting-constructor.cpp
    clang/test/CodeGenCXX/debug-info-inlined.cpp
    clang/test/CodeGenCXX/debug-info-lambda-this.cpp
    clang/test/CodeGenCXX/debug-info-lambda.cpp
    clang/test/CodeGenCXX/debug-info-large-constant.cpp
    clang/test/CodeGenCXX/debug-info-limited-ctor.cpp
    clang/test/CodeGenCXX/debug-info-limited.cpp
    clang/test/CodeGenCXX/debug-info-line-if-2.cpp
    clang/test/CodeGenCXX/debug-info-line-if.cpp
    clang/test/CodeGenCXX/debug-info-line.cpp
    clang/test/CodeGenCXX/debug-info-loops.cpp
    clang/test/CodeGenCXX/debug-info-member-call.cpp
    clang/test/CodeGenCXX/debug-info-member.cpp
    clang/test/CodeGenCXX/debug-info-method-nodebug.cpp
    clang/test/CodeGenCXX/debug-info-method-spec.cpp
    clang/test/CodeGenCXX/debug-info-method.cpp
    clang/test/CodeGenCXX/debug-info-method2.cpp
    clang/test/CodeGenCXX/debug-info-ms-abi.cpp
    clang/test/CodeGenCXX/debug-info-ms-anonymous-tag.cpp
    clang/test/CodeGenCXX/debug-info-ms-bitfields.cpp
    clang/test/CodeGenCXX/debug-info-ms-dtor-thunks.cpp
    clang/test/CodeGenCXX/debug-info-ms-novtable.cpp
    clang/test/CodeGenCXX/debug-info-ms-ptr-to-member.cpp
    clang/test/CodeGenCXX/debug-info-ms-vbase.cpp
    clang/test/CodeGenCXX/debug-info-namespace.cpp
    clang/test/CodeGenCXX/debug-info-nested-exprs.cpp
    clang/test/CodeGenCXX/debug-info-nodebug.cpp
    clang/test/CodeGenCXX/debug-info-noreturn.cpp
    clang/test/CodeGenCXX/debug-info-nrvo.cpp
    clang/test/CodeGenCXX/debug-info-nullptr.cpp
    clang/test/CodeGenCXX/debug-info-object-pointer.cpp
    clang/test/CodeGenCXX/debug-info-objname.cpp
    clang/test/CodeGenCXX/debug-info-programming-language.cpp
    clang/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp
    clang/test/CodeGenCXX/debug-info-ptr-to-ptr.cpp
    clang/test/CodeGenCXX/debug-info-qualifiers.cpp
    clang/test/CodeGenCXX/debug-info-range-for-var-names.cpp
    clang/test/CodeGenCXX/debug-info-rvalue-ref.cpp
    clang/test/CodeGenCXX/debug-info-scope.cpp
    clang/test/CodeGenCXX/debug-info-scoped-class.cpp
    clang/test/CodeGenCXX/debug-info-simple-template-names.cpp
    clang/test/CodeGenCXX/debug-info-static-fns.cpp
    clang/test/CodeGenCXX/debug-info-static-member.cpp
    clang/test/CodeGenCXX/debug-info-struct-align.cpp
    clang/test/CodeGenCXX/debug-info-structured-binding-bitfield.cpp
    clang/test/CodeGenCXX/debug-info-structured-binding.cpp
    clang/test/CodeGenCXX/debug-info-template-align.cpp
    clang/test/CodeGenCXX/debug-info-template-array.cpp
    clang/test/CodeGenCXX/debug-info-template-deduction-guide.cpp
    clang/test/CodeGenCXX/debug-info-template-explicit-specialization.cpp
    clang/test/CodeGenCXX/debug-info-template-fwd.cpp
    clang/test/CodeGenCXX/debug-info-template-limit.cpp
    clang/test/CodeGenCXX/debug-info-template-member.cpp
    clang/test/CodeGenCXX/debug-info-template-parameter.cpp
    clang/test/CodeGenCXX/debug-info-template-partial-specialization.cpp
    clang/test/CodeGenCXX/debug-info-template-quals.cpp
    clang/test/CodeGenCXX/debug-info-template-recursive.cpp
    clang/test/CodeGenCXX/debug-info-template.cpp
    clang/test/CodeGenCXX/debug-info-this.cpp
    clang/test/CodeGenCXX/debug-info-thunk-msabi.cpp
    clang/test/CodeGenCXX/debug-info-thunk.cpp
    clang/test/CodeGenCXX/debug-info-union-template.cpp
    clang/test/CodeGenCXX/debug-info-union.cpp
    clang/test/CodeGenCXX/debug-info-use-after-free.cpp
    clang/test/CodeGenCXX/debug-info-uuid.cpp
    clang/test/CodeGenCXX/debug-info-var-template-partial-spec.cpp
    clang/test/CodeGenCXX/debug-info-var-template-partial.cpp
    clang/test/CodeGenCXX/debug-info-varargs.cpp
    clang/test/CodeGenCXX/debug-info-verbose-trap.cpp
    clang/test/CodeGenCXX/debug-info-vla.cpp
    clang/test/CodeGenCXX/debug-info-vtable-optzn.cpp
    clang/test/CodeGenCXX/debug-info-wchar.cpp
    clang/test/CodeGenCXX/debug-info-windows-dtor.cpp
    clang/test/CodeGenCXX/debug-info-zero-length-arrays.cpp
    clang/test/CodeGenCXX/debug-info.cpp
    clang/test/CodeGenCXX/debug-lambda-expressions.cpp
    clang/test/CodeGenCXX/debug-lambda-this.cpp
    clang/test/CodeGenCXX/debug-prefix-map-lambda.cpp
    clang/test/CodeGenCXX/defaulted-template-alias.cpp
    clang/test/CodeGenCXX/dependent-template-alias.cpp
    clang/test/CodeGenCXX/destructor-debug-info.cpp
    clang/test/CodeGenCXX/difile_entry.cpp
    clang/test/CodeGenCXX/fdebug-info-for-profiling.cpp
    clang/test/CodeGenCXX/field-access-debug-info.cpp
    clang/test/CodeGenCXX/globalinit-loc.cpp
    clang/test/CodeGenCXX/inline-dllexport-member.cpp
    clang/test/CodeGenCXX/linetable-cleanup.cpp
    clang/test/CodeGenCXX/linetable-eh.cpp
    clang/test/CodeGenCXX/linetable-fnbegin.cpp
    clang/test/CodeGenCXX/linetable-virtual-variadic.cpp
    clang/test/CodeGenCXX/lpad-linetable.cpp
    clang/test/CodeGenCXX/microsoft-abi-member-pointers-debug-info.cpp
    clang/test/CodeGenCXX/scoped-enums-debug-info.cpp
    clang/test/CodeGenCXX/standalone-debug-attribute.cpp
    clang/test/CodeGenCXX/template-alias.cpp
    clang/test/CodeGenCXX/trivial_abi_debuginfo.cpp
    clang/test/CodeGenCXX/ubsan-check-debuglocs.cpp
    clang/test/CodeGenCXX/variadic-template-alias.cpp
    clang/test/CodeGenCXX/vtable-debug-info-inheritance-diamond.cpp
    clang/test/CodeGenCXX/vtable-debug-info-inheritance-multiple.cpp
    clang/test/CodeGenCXX/vtable-debug-info-inheritance-simple-main.cpp
    clang/test/CodeGenCXX/vtable-debug-info-inheritance-simple.cpp
    clang/test/CodeGenCXX/vtable-debug-info-inheritance-virtual.cpp
    clang/test/CodeGenCXX/vtable-debug-info.cpp
    clang/test/CodeGenCXX/vtable-holder-self-reference.cpp


################################################################################
diff  --git a/clang/test/CodeGenCXX/debug-info-class-limited.test 
b/clang/test/CodeGenCXX/debug-info-class-limited.test
deleted file mode 100644
index c2e332866f9fa..0000000000000
--- a/clang/test/CodeGenCXX/debug-info-class-limited.test
+++ /dev/null
@@ -1 +0,0 @@
-RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited 
%S/Inputs/debug-info-class-limited.cpp -o - | FileCheck 
%S/Inputs/debug-info-class-limited.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-lambda-this.cpp 
b/clang/test/CodeGenCXX/lambda-this-2.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-lambda-this.cpp
rename to clang/test/CodeGenCXX/lambda-this-2.cpp

diff  --git a/clang/test/CodeGenCXX/2006-11-20-GlobalSymbols.cpp 
b/clang/test/DebugInfo/CXX/2006-11-20-GlobalSymbols.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/2006-11-20-GlobalSymbols.cpp
rename to clang/test/DebugInfo/CXX/2006-11-20-GlobalSymbols.cpp

diff  --git a/clang/test/CodeGenCXX/2007-01-02-UnboundedArray.cpp 
b/clang/test/DebugInfo/CXX/2007-01-02-UnboundedArray.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/2007-01-02-UnboundedArray.cpp
rename to clang/test/DebugInfo/CXX/2007-01-02-UnboundedArray.cpp

diff  --git a/clang/test/CodeGenCXX/2009-03-17-dbg.cpp 
b/clang/test/DebugInfo/CXX/2009-03-17.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/2009-03-17-dbg.cpp
rename to clang/test/DebugInfo/CXX/2009-03-17.cpp

diff  --git a/clang/test/CodeGenCXX/2009-06-16-DebugInfoCrash.cpp 
b/clang/test/DebugInfo/CXX/2009-06-16-Crash.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/2009-06-16-DebugInfoCrash.cpp
rename to clang/test/DebugInfo/CXX/2009-06-16-Crash.cpp

diff  --git a/clang/test/CodeGenCXX/2010-05-10-Var-DbgInfo.cpp 
b/clang/test/DebugInfo/CXX/2010-05-10-Var.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/2010-05-10-Var-DbgInfo.cpp
rename to clang/test/DebugInfo/CXX/2010-05-10-Var.cpp

diff  --git a/clang/test/CodeGenCXX/2010-05-12-PtrToMember-Dbg.cpp 
b/clang/test/DebugInfo/CXX/2010-05-12-PtrToMember.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/2010-05-12-PtrToMember-Dbg.cpp
rename to clang/test/DebugInfo/CXX/2010-05-12-PtrToMember.cpp

diff  --git a/clang/test/CodeGenCXX/2010-06-21-LocalVarDbg.cpp 
b/clang/test/DebugInfo/CXX/2010-06-21-LocalVarDbg.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/2010-06-21-LocalVarDbg.cpp
rename to clang/test/DebugInfo/CXX/2010-06-21-LocalVarDbg.cpp

diff  --git a/clang/test/CodeGenCXX/2010-07-23-DeclLoc.cpp 
b/clang/test/DebugInfo/CXX/2010-07-23-DeclLoc.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/2010-07-23-DeclLoc.cpp
rename to clang/test/DebugInfo/CXX/2010-07-23-DeclLoc.cpp

diff  --git a/clang/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp 
b/clang/test/DebugInfo/CXX/Inputs/class-limited.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp
rename to clang/test/DebugInfo/CXX/Inputs/class-limited.cpp

diff  --git a/clang/test/CodeGenCXX/PR20038.cpp 
b/clang/test/DebugInfo/CXX/PR20038.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/PR20038.cpp
rename to clang/test/DebugInfo/CXX/PR20038.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-access.cpp 
b/clang/test/DebugInfo/CXX/access.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-access.cpp
rename to clang/test/DebugInfo/CXX/access.cpp

diff  --git a/clang/test/CodeGenCXX/aix-static-init-debug-info.cpp 
b/clang/test/DebugInfo/CXX/aix-static-init.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/aix-static-init-debug-info.cpp
rename to clang/test/DebugInfo/CXX/aix-static-init.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-alias.cpp 
b/clang/test/DebugInfo/CXX/alias.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-alias.cpp
rename to clang/test/DebugInfo/CXX/alias.cpp

diff  --git a/clang/test/CodeGenCXX/dbg-info-all-calls-described.cpp 
b/clang/test/DebugInfo/CXX/all-calls-described.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/dbg-info-all-calls-described.cpp
rename to clang/test/DebugInfo/CXX/all-calls-described.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-anon-namespace.cpp 
b/clang/test/DebugInfo/CXX/anon-namespace.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-anon-namespace.cpp
rename to clang/test/DebugInfo/CXX/anon-namespace.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-anon-union-vars.cpp 
b/clang/test/DebugInfo/CXX/anon-union-vars.cpp
similarity index 95%
rename from clang/test/CodeGenCXX/debug-info-anon-union-vars.cpp
rename to clang/test/DebugInfo/CXX/anon-union-vars.cpp
index 61b3c7c0526c8..3aca4e199ab8d 100644
--- a/clang/test/CodeGenCXX/debug-info-anon-union-vars.cpp
+++ b/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/clang/test/CodeGenCXX/debug-info-artificial-arg.cpp 
b/clang/test/DebugInfo/CXX/artificial-arg.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-artificial-arg.cpp
rename to clang/test/DebugInfo/CXX/artificial-arg.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-atexit-stub.cpp 
b/clang/test/DebugInfo/CXX/atexit-stub.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-atexit-stub.cpp
rename to clang/test/DebugInfo/CXX/atexit-stub.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-auto-return.cpp 
b/clang/test/DebugInfo/CXX/auto-return.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-auto-return.cpp
rename to clang/test/DebugInfo/CXX/auto-return.cpp

diff  --git 
a/clang/test/CodeGenCXX/debug-info-block-invocation-linkage-name.cpp 
b/clang/test/DebugInfo/CXX/block-invocation-linkage-name.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-block-invocation-linkage-name.cpp
rename to clang/test/DebugInfo/CXX/block-invocation-linkage-name.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-blocks.cpp 
b/clang/test/DebugInfo/CXX/blocks.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-blocks.cpp
rename to clang/test/DebugInfo/CXX/blocks.cpp

diff  --git a/clang/test/CodeGenCXX/bpf-debug-structors.cpp 
b/clang/test/DebugInfo/CXX/bpf-structors.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/bpf-debug-structors.cpp
rename to clang/test/DebugInfo/CXX/bpf-structors.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-byval.cpp 
b/clang/test/DebugInfo/CXX/byval.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-byval.cpp
rename to clang/test/DebugInfo/CXX/byval.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-calling-conventions.cpp 
b/clang/test/DebugInfo/CXX/calling-conventions.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-calling-conventions.cpp
rename to clang/test/DebugInfo/CXX/calling-conventions.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-char16.cpp 
b/clang/test/DebugInfo/CXX/char16.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-char16.cpp
rename to clang/test/DebugInfo/CXX/char16.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-class-limited-plugin.test 
b/clang/test/DebugInfo/CXX/class-limited-plugin.test
similarity index 62%
rename from clang/test/CodeGenCXX/debug-info-class-limited-plugin.test
rename to clang/test/DebugInfo/CXX/class-limited-plugin.test
index 17248d5743dac..1a2cc223a3829 100644
--- a/clang/test/CodeGenCXX/debug-info-class-limited-plugin.test
+++ b/clang/test/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
new file mode 100644
index 0000000000000..b1279d9855bf7
--- /dev/null
+++ 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/clang/test/CodeGenCXX/debug-info-class-nolimit.cpp 
b/clang/test/DebugInfo/CXX/class-nolimit.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-class-nolimit.cpp
rename to clang/test/DebugInfo/CXX/class-nolimit.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-class-optzns.cpp 
b/clang/test/DebugInfo/CXX/class-optzns.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-class-optzns.cpp
rename to clang/test/DebugInfo/CXX/class-optzns.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-class.cpp 
b/clang/test/DebugInfo/CXX/class.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-class.cpp
rename to clang/test/DebugInfo/CXX/class.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-codeview-display-name.cpp 
b/clang/test/DebugInfo/CXX/codeview-display-name.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-codeview-display-name.cpp
rename to clang/test/DebugInfo/CXX/codeview-display-name.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-codeview-heapallocsite.cpp 
b/clang/test/DebugInfo/CXX/codeview-heapallocsite.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-codeview-heapallocsite.cpp
rename to clang/test/DebugInfo/CXX/codeview-heapallocsite.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-codeview-injected-class.cpp 
b/clang/test/DebugInfo/CXX/codeview-injected-class.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-codeview-injected-class.cpp
rename to clang/test/DebugInfo/CXX/codeview-injected-class.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-codeview-nested-types.cpp 
b/clang/test/DebugInfo/CXX/codeview-nested-types.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-codeview-nested-types.cpp
rename to clang/test/DebugInfo/CXX/codeview-nested-types.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-codeview-nodebug.cpp 
b/clang/test/DebugInfo/CXX/codeview-nodebug.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-codeview-nodebug.cpp
rename to clang/test/DebugInfo/CXX/codeview-nodebug.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-codeview-template-literal.cpp 
b/clang/test/DebugInfo/CXX/codeview-template-literal.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-codeview-template-literal.cpp
rename to clang/test/DebugInfo/CXX/codeview-template-literal.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-codeview-template-type.cpp 
b/clang/test/DebugInfo/CXX/codeview-template-type.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-codeview-template-type.cpp
rename to clang/test/DebugInfo/CXX/codeview-template-type.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-codeview-unnamed.cpp 
b/clang/test/DebugInfo/CXX/codeview-unnamed.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-codeview-unnamed.cpp
rename to clang/test/DebugInfo/CXX/codeview-unnamed.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-codeview-var-templates.cpp 
b/clang/test/DebugInfo/CXX/codeview-var-templates.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-codeview-var-templates.cpp
rename to clang/test/DebugInfo/CXX/codeview-var-templates.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-coff.cpp 
b/clang/test/DebugInfo/CXX/coff.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-coff.cpp
rename to clang/test/DebugInfo/CXX/coff.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-composite-cc.cpp 
b/clang/test/DebugInfo/CXX/composite-cc.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-composite-cc.cpp
rename to clang/test/DebugInfo/CXX/composite-cc.cpp

diff  --git 
a/clang/test/CodeGenCXX/debug-info-composite-triviality-fwd-decl.cpp 
b/clang/test/DebugInfo/CXX/composite-triviality-fwd-decl.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-composite-triviality-fwd-decl.cpp
rename to clang/test/DebugInfo/CXX/composite-triviality-fwd-decl.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-composite-triviality.cpp 
b/clang/test/DebugInfo/CXX/composite-triviality.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-composite-triviality.cpp
rename to clang/test/DebugInfo/CXX/composite-triviality.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-context.cpp 
b/clang/test/DebugInfo/CXX/context.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-context.cpp
rename to clang/test/DebugInfo/CXX/context.cpp

diff  --git a/clang/test/CodeGenCXX/cp-blocks-linetables.cpp 
b/clang/test/DebugInfo/CXX/cp-blocks-linetables.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/cp-blocks-linetables.cpp
rename to clang/test/DebugInfo/CXX/cp-blocks-linetables.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ctor-homing-flag.cpp 
b/clang/test/DebugInfo/CXX/ctor-homing-flag.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ctor-homing-flag.cpp
rename to clang/test/DebugInfo/CXX/ctor-homing-flag.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ctor.cpp 
b/clang/test/DebugInfo/CXX/ctor.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ctor.cpp
rename to clang/test/DebugInfo/CXX/ctor.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ctor2.cpp 
b/clang/test/DebugInfo/CXX/ctor2.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ctor2.cpp
rename to clang/test/DebugInfo/CXX/ctor2.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-cxx0x.cpp 
b/clang/test/DebugInfo/CXX/cxx0x.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-cxx0x.cpp
rename to clang/test/DebugInfo/CXX/cxx0x.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-cxx1y.cpp 
b/clang/test/DebugInfo/CXX/cxx1y.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-cxx1y.cpp
rename to clang/test/DebugInfo/CXX/cxx1y.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info.cpp 
b/clang/test/DebugInfo/CXX/debug-info.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info.cpp
rename to clang/test/DebugInfo/CXX/debug-info.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-decl-nested.cpp 
b/clang/test/DebugInfo/CXX/decl-nested.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-decl-nested.cpp
rename to clang/test/DebugInfo/CXX/decl-nested.cpp

diff  --git a/clang/test/CodeGenCXX/defaulted-template-alias.cpp 
b/clang/test/DebugInfo/CXX/defaulted-template-alias.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/defaulted-template-alias.cpp
rename to clang/test/DebugInfo/CXX/defaulted-template-alias.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-deleted.cpp 
b/clang/test/DebugInfo/CXX/deleted.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-deleted.cpp
rename to clang/test/DebugInfo/CXX/deleted.cpp

diff  --git a/clang/test/CodeGenCXX/dependent-template-alias.cpp 
b/clang/test/DebugInfo/CXX/dependent-template-alias.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/dependent-template-alias.cpp
rename to clang/test/DebugInfo/CXX/dependent-template-alias.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-destroy-helper.cpp 
b/clang/test/DebugInfo/CXX/destroy-helper.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-destroy-helper.cpp
rename to clang/test/DebugInfo/CXX/destroy-helper.cpp

diff  --git a/clang/test/CodeGenCXX/destructor-debug-info.cpp 
b/clang/test/DebugInfo/CXX/destructor.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/destructor-debug-info.cpp
rename to clang/test/DebugInfo/CXX/destructor.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-determinism.cpp 
b/clang/test/DebugInfo/CXX/determinism.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-determinism.cpp
rename to clang/test/DebugInfo/CXX/determinism.cpp

diff  --git a/clang/test/CodeGenCXX/difile_entry.cpp 
b/clang/test/DebugInfo/CXX/difile_entry.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/difile_entry.cpp
rename to clang/test/DebugInfo/CXX/difile_entry.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-dllimport-base-class.cpp 
b/clang/test/DebugInfo/CXX/dllimport-base-class.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-dllimport-base-class.cpp
rename to clang/test/DebugInfo/CXX/dllimport-base-class.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-dtor-implicit-args.cpp 
b/clang/test/DebugInfo/CXX/dtor-implicit-args.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-dtor-implicit-args.cpp
rename to clang/test/DebugInfo/CXX/dtor-implicit-args.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-dup-fwd-decl.cpp 
b/clang/test/DebugInfo/CXX/dup-fwd-decl.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-dup-fwd-decl.cpp
rename to clang/test/DebugInfo/CXX/dup-fwd-decl.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-enum-class.cpp 
b/clang/test/DebugInfo/CXX/enum-class.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-enum-class.cpp
rename to clang/test/DebugInfo/CXX/enum-class.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-enum-i128.cpp 
b/clang/test/DebugInfo/CXX/enum-i128.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-enum-i128.cpp
rename to clang/test/DebugInfo/CXX/enum-i128.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-enum-metadata-collision.cpp 
b/clang/test/DebugInfo/CXX/enum-metadata-collision.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-enum-metadata-collision.cpp
rename to clang/test/DebugInfo/CXX/enum-metadata-collision.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-enum.cpp 
b/clang/test/DebugInfo/CXX/enum.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-enum.cpp
rename to clang/test/DebugInfo/CXX/enum.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-explicit-cast.cpp 
b/clang/test/DebugInfo/CXX/explicit-cast.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-explicit-cast.cpp
rename to clang/test/DebugInfo/CXX/explicit-cast.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-explicit-this.cpp 
b/clang/test/DebugInfo/CXX/explicit-this.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-explicit-this.cpp
rename to clang/test/DebugInfo/CXX/explicit-this.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-export_symbols.cpp 
b/clang/test/DebugInfo/CXX/export_symbols.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-export_symbols.cpp
rename to clang/test/DebugInfo/CXX/export_symbols.cpp

diff  --git a/clang/test/CodeGenCXX/fdebug-info-for-profiling.cpp 
b/clang/test/DebugInfo/CXX/fdebug-info-for-profiling.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/fdebug-info-for-profiling.cpp
rename to clang/test/DebugInfo/CXX/fdebug-info-for-profiling.cpp

diff  --git a/clang/test/CodeGenCXX/field-access-debug-info.cpp 
b/clang/test/DebugInfo/CXX/field-access.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/field-access-debug-info.cpp
rename to clang/test/DebugInfo/CXX/field-access.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-fn-template.cpp 
b/clang/test/DebugInfo/CXX/fn-template.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-fn-template.cpp
rename to clang/test/DebugInfo/CXX/fn-template.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-friend.cpp 
b/clang/test/DebugInfo/CXX/friend.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-friend.cpp
rename to clang/test/DebugInfo/CXX/friend.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-function-context.cpp 
b/clang/test/DebugInfo/CXX/function-context.cpp
similarity index 95%
rename from clang/test/CodeGenCXX/debug-info-function-context.cpp
rename to clang/test/DebugInfo/CXX/function-context.cpp
index 29c87b6ec0055..da5fa5a79a723 100644
--- a/clang/test/CodeGenCXX/debug-info-function-context.cpp
+++ b/clang/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 
b/clang/test/DebugInfo/CXX/fwd-ref.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-fwd-ref.cpp
rename to clang/test/DebugInfo/CXX/fwd-ref.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-fwd-template-param.cpp 
b/clang/test/DebugInfo/CXX/fwd-template-param.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-fwd-template-param.cpp
rename to clang/test/DebugInfo/CXX/fwd-template-param.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-gline-tables-only-codeview.cpp 
b/clang/test/DebugInfo/CXX/gline-tables-only-codeview.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-gline-tables-only-codeview.cpp
rename to clang/test/DebugInfo/CXX/gline-tables-only-codeview.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-gline-tables-only.cpp 
b/clang/test/DebugInfo/CXX/gline-tables-only.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-gline-tables-only.cpp
rename to clang/test/DebugInfo/CXX/gline-tables-only.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp 
b/clang/test/DebugInfo/CXX/global-ctor-dtor.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp
rename to clang/test/DebugInfo/CXX/global-ctor-dtor.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-global.cpp 
b/clang/test/DebugInfo/CXX/global.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-global.cpp
rename to clang/test/DebugInfo/CXX/global.cpp

diff  --git a/clang/test/CodeGenCXX/globalinit-loc.cpp 
b/clang/test/DebugInfo/CXX/globalinit-loc.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/globalinit-loc.cpp
rename to clang/test/DebugInfo/CXX/globalinit-loc.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-globalinit.cpp 
b/clang/test/DebugInfo/CXX/globalinit.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-globalinit.cpp
rename to clang/test/DebugInfo/CXX/globalinit.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-hotpatch-aarch64.cpp 
b/clang/test/DebugInfo/CXX/hotpatch-aarch64.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-hotpatch-aarch64.cpp
rename to clang/test/DebugInfo/CXX/hotpatch-aarch64.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-hotpatch-arm.cpp 
b/clang/test/DebugInfo/CXX/hotpatch-arm.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-hotpatch-arm.cpp
rename to clang/test/DebugInfo/CXX/hotpatch-arm.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-hotpatch.cpp 
b/clang/test/DebugInfo/CXX/hotpatch.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-hotpatch.cpp
rename to clang/test/DebugInfo/CXX/hotpatch.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-incomplete-types.cpp 
b/clang/test/DebugInfo/CXX/incomplete-types.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-incomplete-types.cpp
rename to clang/test/DebugInfo/CXX/incomplete-types.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp 
b/clang/test/DebugInfo/CXX/indirect-field-decl.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp
rename to clang/test/DebugInfo/CXX/indirect-field-decl.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-inheriting-constructor.cpp 
b/clang/test/DebugInfo/CXX/inheriting-constructor.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-inheriting-constructor.cpp
rename to clang/test/DebugInfo/CXX/inheriting-constructor.cpp

diff  --git a/clang/test/CodeGenCXX/inline-dllexport-member.cpp 
b/clang/test/DebugInfo/CXX/inline-dllexport-member.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/inline-dllexport-member.cpp
rename to clang/test/DebugInfo/CXX/inline-dllexport-member.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-inlined.cpp 
b/clang/test/DebugInfo/CXX/inlined.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-inlined.cpp
rename to clang/test/DebugInfo/CXX/inlined.cpp

diff  --git a/clang/test/CodeGenCXX/debug-lambda-expressions.cpp 
b/clang/test/DebugInfo/CXX/lambda-expressions.cpp
similarity index 98%
rename from clang/test/CodeGenCXX/debug-lambda-expressions.cpp
rename to clang/test/DebugInfo/CXX/lambda-expressions.cpp
index 324c0926fb9f2..1604b908ab8bf 100644
--- a/clang/test/CodeGenCXX/debug-lambda-expressions.cpp
+++ b/clang/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 
b/clang/test/DebugInfo/CXX/lambda-this.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-lambda-this.cpp
rename to clang/test/DebugInfo/CXX/lambda-this.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-lambda.cpp 
b/clang/test/DebugInfo/CXX/lambda.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-lambda.cpp
rename to clang/test/DebugInfo/CXX/lambda.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-large-constant.cpp 
b/clang/test/DebugInfo/CXX/large-constant.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-large-constant.cpp
rename to clang/test/DebugInfo/CXX/large-constant.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-limited-ctor.cpp 
b/clang/test/DebugInfo/CXX/limited-ctor.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-limited-ctor.cpp
rename to clang/test/DebugInfo/CXX/limited-ctor.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-limited.cpp 
b/clang/test/DebugInfo/CXX/limited.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-limited.cpp
rename to clang/test/DebugInfo/CXX/limited.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-line-if-2.cpp 
b/clang/test/DebugInfo/CXX/line-if-2.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-line-if-2.cpp
rename to clang/test/DebugInfo/CXX/line-if-2.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-line-if.cpp 
b/clang/test/DebugInfo/CXX/line-if.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-line-if.cpp
rename to clang/test/DebugInfo/CXX/line-if.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-line.cpp 
b/clang/test/DebugInfo/CXX/line.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-line.cpp
rename to clang/test/DebugInfo/CXX/line.cpp

diff  --git a/clang/test/CodeGenCXX/linetable-cleanup.cpp 
b/clang/test/DebugInfo/CXX/linetable-cleanup.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/linetable-cleanup.cpp
rename to clang/test/DebugInfo/CXX/linetable-cleanup.cpp

diff  --git a/clang/test/CodeGenCXX/linetable-eh.cpp 
b/clang/test/DebugInfo/CXX/linetable-eh.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/linetable-eh.cpp
rename to clang/test/DebugInfo/CXX/linetable-eh.cpp

diff  --git a/clang/test/CodeGenCXX/linetable-fnbegin.cpp 
b/clang/test/DebugInfo/CXX/linetable-fnbegin.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/linetable-fnbegin.cpp
rename to clang/test/DebugInfo/CXX/linetable-fnbegin.cpp

diff  --git a/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp 
b/clang/test/DebugInfo/CXX/linetable-virtual-variadic.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/linetable-virtual-variadic.cpp
rename to clang/test/DebugInfo/CXX/linetable-virtual-variadic.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-loops.cpp 
b/clang/test/DebugInfo/CXX/loops.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-loops.cpp
rename to clang/test/DebugInfo/CXX/loops.cpp

diff  --git a/clang/test/CodeGenCXX/lpad-linetable.cpp 
b/clang/test/DebugInfo/CXX/lpad-linetable.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/lpad-linetable.cpp
rename to clang/test/DebugInfo/CXX/lpad-linetable.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-member-call.cpp 
b/clang/test/DebugInfo/CXX/member-call.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-member-call.cpp
rename to clang/test/DebugInfo/CXX/member-call.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-member.cpp 
b/clang/test/DebugInfo/CXX/member.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-member.cpp
rename to clang/test/DebugInfo/CXX/member.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-method-nodebug.cpp 
b/clang/test/DebugInfo/CXX/method-nodebug.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-method-nodebug.cpp
rename to clang/test/DebugInfo/CXX/method-nodebug.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-method-spec.cpp 
b/clang/test/DebugInfo/CXX/method-spec.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-method-spec.cpp
rename to clang/test/DebugInfo/CXX/method-spec.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-method.cpp 
b/clang/test/DebugInfo/CXX/method.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-method.cpp
rename to clang/test/DebugInfo/CXX/method.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-method2.cpp 
b/clang/test/DebugInfo/CXX/method2.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-method2.cpp
rename to clang/test/DebugInfo/CXX/method2.cpp

diff  --git 
a/clang/test/CodeGenCXX/microsoft-abi-member-pointers-debug-info.cpp 
b/clang/test/DebugInfo/CXX/microsoft-abi-member-pointers.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/microsoft-abi-member-pointers-debug-info.cpp
rename to clang/test/DebugInfo/CXX/microsoft-abi-member-pointers.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ms-abi.cpp 
b/clang/test/DebugInfo/CXX/ms-abi.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ms-abi.cpp
rename to clang/test/DebugInfo/CXX/ms-abi.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ms-anonymous-tag.cpp 
b/clang/test/DebugInfo/CXX/ms-anonymous-tag.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ms-anonymous-tag.cpp
rename to clang/test/DebugInfo/CXX/ms-anonymous-tag.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ms-bitfields.cpp 
b/clang/test/DebugInfo/CXX/ms-bitfields.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ms-bitfields.cpp
rename to clang/test/DebugInfo/CXX/ms-bitfields.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ms-dtor-thunks.cpp 
b/clang/test/DebugInfo/CXX/ms-dtor-thunks.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ms-dtor-thunks.cpp
rename to clang/test/DebugInfo/CXX/ms-dtor-thunks.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ms-novtable.cpp 
b/clang/test/DebugInfo/CXX/ms-novtable.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ms-novtable.cpp
rename to clang/test/DebugInfo/CXX/ms-novtable.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ms-ptr-to-member.cpp 
b/clang/test/DebugInfo/CXX/ms-ptr-to-member.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ms-ptr-to-member.cpp
rename to clang/test/DebugInfo/CXX/ms-ptr-to-member.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ms-vbase.cpp 
b/clang/test/DebugInfo/CXX/ms-vbase.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ms-vbase.cpp
rename to clang/test/DebugInfo/CXX/ms-vbase.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-namespace.cpp 
b/clang/test/DebugInfo/CXX/namespace.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-namespace.cpp
rename to clang/test/DebugInfo/CXX/namespace.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-nested-exprs.cpp 
b/clang/test/DebugInfo/CXX/nested-exprs.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-nested-exprs.cpp
rename to clang/test/DebugInfo/CXX/nested-exprs.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-nodebug.cpp 
b/clang/test/DebugInfo/CXX/nodebug.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-nodebug.cpp
rename to clang/test/DebugInfo/CXX/nodebug.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-noreturn.cpp 
b/clang/test/DebugInfo/CXX/noreturn.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-noreturn.cpp
rename to clang/test/DebugInfo/CXX/noreturn.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-nrvo.cpp 
b/clang/test/DebugInfo/CXX/nrvo.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-nrvo.cpp
rename to clang/test/DebugInfo/CXX/nrvo.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-nullptr.cpp 
b/clang/test/DebugInfo/CXX/nullptr.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-nullptr.cpp
rename to clang/test/DebugInfo/CXX/nullptr.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-object-pointer.cpp 
b/clang/test/DebugInfo/CXX/object-pointer.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-object-pointer.cpp
rename to clang/test/DebugInfo/CXX/object-pointer.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-objname.cpp 
b/clang/test/DebugInfo/CXX/objname.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-objname.cpp
rename to clang/test/DebugInfo/CXX/objname.cpp

diff  --git a/clang/test/CodeGenCXX/debug-prefix-map-lambda.cpp 
b/clang/test/DebugInfo/CXX/prefix-map-lambda.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-prefix-map-lambda.cpp
rename to clang/test/DebugInfo/CXX/prefix-map-lambda.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-programming-language.cpp 
b/clang/test/DebugInfo/CXX/programming-language.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-programming-language.cpp
rename to clang/test/DebugInfo/CXX/programming-language.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp 
b/clang/test/DebugInfo/CXX/ptr-to-member-function.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp
rename to clang/test/DebugInfo/CXX/ptr-to-member-function.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-ptr-to-ptr.cpp 
b/clang/test/DebugInfo/CXX/ptr-to-ptr.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-ptr-to-ptr.cpp
rename to clang/test/DebugInfo/CXX/ptr-to-ptr.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-qualifiers.cpp 
b/clang/test/DebugInfo/CXX/qualifiers.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-qualifiers.cpp
rename to clang/test/DebugInfo/CXX/qualifiers.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-range-for-var-names.cpp 
b/clang/test/DebugInfo/CXX/range-for-var-names.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-range-for-var-names.cpp
rename to clang/test/DebugInfo/CXX/range-for-var-names.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-rvalue-ref.cpp 
b/clang/test/DebugInfo/CXX/rvalue-ref.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-rvalue-ref.cpp
rename to clang/test/DebugInfo/CXX/rvalue-ref.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-scope.cpp 
b/clang/test/DebugInfo/CXX/scope.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-scope.cpp
rename to clang/test/DebugInfo/CXX/scope.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-scoped-class.cpp 
b/clang/test/DebugInfo/CXX/scoped-class.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-scoped-class.cpp
rename to clang/test/DebugInfo/CXX/scoped-class.cpp

diff  --git a/clang/test/CodeGenCXX/scoped-enums-debug-info.cpp 
b/clang/test/DebugInfo/CXX/scoped-enums.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/scoped-enums-debug-info.cpp
rename to clang/test/DebugInfo/CXX/scoped-enums.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-simple-template-names.cpp 
b/clang/test/DebugInfo/CXX/simple-template-names.cpp
similarity index 92%
rename from clang/test/CodeGenCXX/debug-info-simple-template-names.cpp
rename to clang/test/DebugInfo/CXX/simple-template-names.cpp
index 98faa0fc6f0bb..5a5d706e81972 100644
--- a/clang/test/CodeGenCXX/debug-info-simple-template-names.cpp
+++ b/clang/test/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/clang/test/CodeGenCXX/standalone-debug-attribute.cpp 
b/clang/test/DebugInfo/CXX/standalone-debug-attribute.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/standalone-debug-attribute.cpp
rename to clang/test/DebugInfo/CXX/standalone-debug-attribute.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-static-fns.cpp 
b/clang/test/DebugInfo/CXX/static-fns.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-static-fns.cpp
rename to clang/test/DebugInfo/CXX/static-fns.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-static-member.cpp 
b/clang/test/DebugInfo/CXX/static-member.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-static-member.cpp
rename to clang/test/DebugInfo/CXX/static-member.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-struct-align.cpp 
b/clang/test/DebugInfo/CXX/struct-align.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-struct-align.cpp
rename to clang/test/DebugInfo/CXX/struct-align.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-structured-binding-bitfield.cpp 
b/clang/test/DebugInfo/CXX/structured-binding-bitfield.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-structured-binding-bitfield.cpp
rename to clang/test/DebugInfo/CXX/structured-binding-bitfield.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-structured-binding.cpp 
b/clang/test/DebugInfo/CXX/structured-binding.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-structured-binding.cpp
rename to clang/test/DebugInfo/CXX/structured-binding.cpp

diff  --git a/clang/test/CodeGenCXX/template-alias.cpp 
b/clang/test/DebugInfo/CXX/template-alias.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/template-alias.cpp
rename to clang/test/DebugInfo/CXX/template-alias.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-template-align.cpp 
b/clang/test/DebugInfo/CXX/template-align.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template-align.cpp
rename to clang/test/DebugInfo/CXX/template-align.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-template-array.cpp 
b/clang/test/DebugInfo/CXX/template-array.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template-array.cpp
rename to clang/test/DebugInfo/CXX/template-array.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-template-deduction-guide.cpp 
b/clang/test/DebugInfo/CXX/template-deduction-guide.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template-deduction-guide.cpp
rename to clang/test/DebugInfo/CXX/template-deduction-guide.cpp

diff  --git 
a/clang/test/CodeGenCXX/debug-info-template-explicit-specialization.cpp 
b/clang/test/DebugInfo/CXX/template-explicit-specialization.cpp
similarity index 100%
rename from 
clang/test/CodeGenCXX/debug-info-template-explicit-specialization.cpp
rename to clang/test/DebugInfo/CXX/template-explicit-specialization.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-template-fwd.cpp 
b/clang/test/DebugInfo/CXX/template-fwd.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template-fwd.cpp
rename to clang/test/DebugInfo/CXX/template-fwd.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-template-limit.cpp 
b/clang/test/DebugInfo/CXX/template-limit.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template-limit.cpp
rename to clang/test/DebugInfo/CXX/template-limit.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-template-member.cpp 
b/clang/test/DebugInfo/CXX/template-member.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template-member.cpp
rename to clang/test/DebugInfo/CXX/template-member.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-template-parameter.cpp 
b/clang/test/DebugInfo/CXX/template-parameter.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template-parameter.cpp
rename to clang/test/DebugInfo/CXX/template-parameter.cpp

diff  --git 
a/clang/test/CodeGenCXX/debug-info-template-partial-specialization.cpp 
b/clang/test/DebugInfo/CXX/template-partial-specialization.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template-partial-specialization.cpp
rename to clang/test/DebugInfo/CXX/template-partial-specialization.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-template-quals.cpp 
b/clang/test/DebugInfo/CXX/template-quals.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template-quals.cpp
rename to clang/test/DebugInfo/CXX/template-quals.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-template-recursive.cpp 
b/clang/test/DebugInfo/CXX/template-recursive.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template-recursive.cpp
rename to clang/test/DebugInfo/CXX/template-recursive.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-template.cpp 
b/clang/test/DebugInfo/CXX/template.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-template.cpp
rename to clang/test/DebugInfo/CXX/template.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-this.cpp 
b/clang/test/DebugInfo/CXX/this.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-this.cpp
rename to clang/test/DebugInfo/CXX/this.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-thunk-msabi.cpp 
b/clang/test/DebugInfo/CXX/thunk-msabi.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-thunk-msabi.cpp
rename to clang/test/DebugInfo/CXX/thunk-msabi.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-thunk.cpp 
b/clang/test/DebugInfo/CXX/thunk.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-thunk.cpp
rename to clang/test/DebugInfo/CXX/thunk.cpp

diff  --git a/clang/test/CodeGenCXX/trivial_abi_debuginfo.cpp 
b/clang/test/DebugInfo/CXX/trivial_abi.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/trivial_abi_debuginfo.cpp
rename to clang/test/DebugInfo/CXX/trivial_abi.cpp

diff  --git a/clang/test/CodeGenCXX/ubsan-check-debuglocs.cpp 
b/clang/test/DebugInfo/CXX/ubsan-check-debuglocs.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/ubsan-check-debuglocs.cpp
rename to clang/test/DebugInfo/CXX/ubsan-check-debuglocs.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-union-template.cpp 
b/clang/test/DebugInfo/CXX/union-template.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-union-template.cpp
rename to clang/test/DebugInfo/CXX/union-template.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-union.cpp 
b/clang/test/DebugInfo/CXX/union.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-union.cpp
rename to clang/test/DebugInfo/CXX/union.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-use-after-free.cpp 
b/clang/test/DebugInfo/CXX/use-after-free.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-use-after-free.cpp
rename to clang/test/DebugInfo/CXX/use-after-free.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-uuid.cpp 
b/clang/test/DebugInfo/CXX/uuid.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-uuid.cpp
rename to clang/test/DebugInfo/CXX/uuid.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-var-template-partial-spec.cpp 
b/clang/test/DebugInfo/CXX/var-template-partial-spec.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-var-template-partial-spec.cpp
rename to clang/test/DebugInfo/CXX/var-template-partial-spec.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-var-template-partial.cpp 
b/clang/test/DebugInfo/CXX/var-template-partial.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-var-template-partial.cpp
rename to clang/test/DebugInfo/CXX/var-template-partial.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-varargs.cpp 
b/clang/test/DebugInfo/CXX/varargs.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-varargs.cpp
rename to clang/test/DebugInfo/CXX/varargs.cpp

diff  --git a/clang/test/CodeGenCXX/variadic-template-alias.cpp 
b/clang/test/DebugInfo/CXX/variadic-template-alias.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/variadic-template-alias.cpp
rename to clang/test/DebugInfo/CXX/variadic-template-alias.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-verbose-trap.cpp 
b/clang/test/DebugInfo/CXX/verbose-trap.cpp
similarity index 96%
rename from clang/test/CodeGenCXX/debug-info-verbose-trap.cpp
rename to clang/test/DebugInfo/CXX/verbose-trap.cpp
index f492698ccab83..4a88df934ff7c 100644
--- a/clang/test/CodeGenCXX/debug-info-verbose-trap.cpp
+++ b/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 
b/clang/test/DebugInfo/CXX/vla.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-vla.cpp
rename to clang/test/DebugInfo/CXX/vla.cpp

diff  --git a/clang/test/CodeGenCXX/vtable-holder-self-reference.cpp 
b/clang/test/DebugInfo/CXX/vtable-holder-self-reference.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/vtable-holder-self-reference.cpp
rename to clang/test/DebugInfo/CXX/vtable-holder-self-reference.cpp

diff  --git a/clang/test/CodeGenCXX/vtable-debug-info-inheritance-diamond.cpp 
b/clang/test/DebugInfo/CXX/vtable-inheritance-diamond.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/vtable-debug-info-inheritance-diamond.cpp
rename to clang/test/DebugInfo/CXX/vtable-inheritance-diamond.cpp

diff  --git a/clang/test/CodeGenCXX/vtable-debug-info-inheritance-multiple.cpp 
b/clang/test/DebugInfo/CXX/vtable-inheritance-multiple.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/vtable-debug-info-inheritance-multiple.cpp
rename to clang/test/DebugInfo/CXX/vtable-inheritance-multiple.cpp

diff  --git 
a/clang/test/CodeGenCXX/vtable-debug-info-inheritance-simple-main.cpp 
b/clang/test/DebugInfo/CXX/vtable-inheritance-simple-main.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/vtable-debug-info-inheritance-simple-main.cpp
rename to clang/test/DebugInfo/CXX/vtable-inheritance-simple-main.cpp

diff  --git a/clang/test/CodeGenCXX/vtable-debug-info-inheritance-simple.cpp 
b/clang/test/DebugInfo/CXX/vtable-inheritance-simple.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/vtable-debug-info-inheritance-simple.cpp
rename to clang/test/DebugInfo/CXX/vtable-inheritance-simple.cpp

diff  --git a/clang/test/CodeGenCXX/vtable-debug-info-inheritance-virtual.cpp 
b/clang/test/DebugInfo/CXX/vtable-inheritance-virtual.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/vtable-debug-info-inheritance-virtual.cpp
rename to clang/test/DebugInfo/CXX/vtable-inheritance-virtual.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-vtable-optzn.cpp 
b/clang/test/DebugInfo/CXX/vtable-optzn.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-vtable-optzn.cpp
rename to clang/test/DebugInfo/CXX/vtable-optzn.cpp

diff  --git a/clang/test/CodeGenCXX/vtable-debug-info.cpp 
b/clang/test/DebugInfo/CXX/vtable.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/vtable-debug-info.cpp
rename to clang/test/DebugInfo/CXX/vtable.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-wchar.cpp 
b/clang/test/DebugInfo/CXX/wchar.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-wchar.cpp
rename to clang/test/DebugInfo/CXX/wchar.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-windows-dtor.cpp 
b/clang/test/DebugInfo/CXX/windows-dtor.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-windows-dtor.cpp
rename to clang/test/DebugInfo/CXX/windows-dtor.cpp

diff  --git a/clang/test/CodeGenCXX/debug-info-zero-length-arrays.cpp 
b/clang/test/DebugInfo/CXX/zero-length-arrays.cpp
similarity index 100%
rename from clang/test/CodeGenCXX/debug-info-zero-length-arrays.cpp
rename to clang/test/DebugInfo/CXX/zero-length-arrays.cpp


        
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to