This section describes the forms used to represent C and C++ programs. Other
languages could pattern themselves after this (which itself is tuned to
-representing programs in the same way that DWARF 3 does), or they could choose
+representing programs in the same way that DWARF does), or they could choose
to provide completely different forms if they don't fit into the DWARF model.
As support for debugging information gets added to the various LLVM
source-language front-ends, the information used should be documented here.
-The following sections provide examples of a few C/C++ constructs and the debug
-information that would best describe those constructs. The canonical
-references are the ``DIDescriptor`` classes defined in
-``include/llvm/IR/DebugInfo.h`` and the implementations of the helper functions
-in ``lib/IR/DIBuilder.cpp``.
+The following sections provide examples of a few C/C++ constructs and
+the debug information that would best describe those constructs. The
+canonical references are the ``DINode`` classes defined in
+``include/llvm/IR/DebugInfoMetadata.h`` and the implementations of the
+helper functions in ``lib/IR/DIBuilder.cpp``.
C/C++ source file information
-----------------------------