<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 14, 2015 at 2:27 PM, Duncan P. N. Exon Smith <span dir="ltr"><<a href="mailto:dexonsmith@apple.com" target="_blank">dexonsmith@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dexonsmith<br>
Date: Wed Jan 14 16:27:36 2015<br>
New Revision: 226048<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=226048&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=226048&view=rev</a><br>
Log:<br>
IR: Move MDLocation into place<br>
<br>
This commit moves `MDLocation`, finishing off PR21433. There's an<br>
accompanying clang commit for frontend testcases. I'll attach the<br>
testcase upgrade script I used to PR21433 to help out-of-tree<br>
frontends/backends.<br>
<br>
This changes the schema for `DebugLoc` and `DILocation` from:<br>
<br>
!{i32 3, i32 7, !7, !8}<br>
<br>
to:<br>
<br>
!MDLocation(line: 3, column: 7, scope: !7, inlinedAt: !8)<br>
<br>
Note that empty fields (line/column: 0 and inlinedAt: null) don't get<br>
printed by the assembly writer.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/IR/DebugInfo.h<br>
llvm/trunk/lib/IR/DebugInfo.cpp<br>
llvm/trunk/lib/IR/DebugLoc.cpp<br>
llvm/trunk/test/Assembler/functionlocal-metadata.ll<br>
llvm/trunk/test/Assembler/metadata.ll<br>
llvm/trunk/test/Bindings/OCaml/<a href="http://core.ml" target="_blank">core.ml</a><br>
llvm/trunk/test/Bitcode/drop-debug-info.ll<br>
llvm/trunk/test/BugPoint/metadata.ll<br>
llvm/trunk/test/CodeGen/AArch64/aarch64-2014-08-11-MachineCombinerCrash.ll<br>
llvm/trunk/test/CodeGen/AArch64/arm64-2011-03-17-AsmPrinterCrash.ll<br>
llvm/trunk/test/CodeGen/ARM/2009-10-16-Scope.ll<br>
llvm/trunk/test/CodeGen/ARM/2010-04-15-ScavengerDebugValue.ll<br>
llvm/trunk/test/CodeGen/ARM/2010-06-25-Thumb2ITInvalidIterator.ll<br>
llvm/trunk/test/CodeGen/ARM/2010-08-04-StackVariable.ll<br>
llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll<br>
llvm/trunk/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll<br>
llvm/trunk/test/CodeGen/ARM/coalesce-dbgvalue.ll<br>
llvm/trunk/test/CodeGen/ARM/debug-frame-vararg.ll<br>
llvm/trunk/test/CodeGen/ARM/debug-frame.ll<br>
llvm/trunk/test/CodeGen/ARM/debug-info-arg.ll<br>
llvm/trunk/test/CodeGen/ARM/debug-info-blocks.ll<br>
llvm/trunk/test/CodeGen/ARM/debug-info-branch-folding.ll<br>
llvm/trunk/test/CodeGen/ARM/debug-info-d16-reg.ll<br>
llvm/trunk/test/CodeGen/ARM/debug-info-qreg.ll<br>
llvm/trunk/test/CodeGen/ARM/debug-info-s16-reg.ll<br>
llvm/trunk/test/CodeGen/ARM/debug-info-sreg2.ll<br>
llvm/trunk/test/CodeGen/ARM/debug-segmented-stacks.ll<br>
llvm/trunk/test/CodeGen/Hexagon/hwloop-dbg.ll<br>
llvm/trunk/test/CodeGen/Inputs/DbgValueOtherTargets.ll<br>
llvm/trunk/test/CodeGen/PowerPC/dbg.ll<br>
llvm/trunk/test/CodeGen/PowerPC/pr17168.ll<br>
llvm/trunk/test/CodeGen/PowerPC/unwind-dw2-g.ll<br>
llvm/trunk/test/CodeGen/Thumb/2010-07-15-debugOrdering.ll<br>
llvm/trunk/test/CodeGen/X86/2009-02-12-DebugInfoVLA.ll<br>
llvm/trunk/test/CodeGen/X86/2009-10-16-Scope.ll<br>
llvm/trunk/test/CodeGen/X86/2010-01-18-DbgValue.ll<br>
llvm/trunk/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll<br>
llvm/trunk/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll<br>
llvm/trunk/test/CodeGen/X86/2010-05-28-Crash.ll<br>
llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll<br>
llvm/trunk/test/CodeGen/X86/2010-07-06-DbgCrash.ll<br>
llvm/trunk/test/CodeGen/X86/2010-08-04-StackVariable.ll<br>
llvm/trunk/test/CodeGen/X86/2010-09-16-EmptyFilename.ll<br>
llvm/trunk/test/CodeGen/X86/2010-11-02-DbgParameter.ll<br>
llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll<br>
llvm/trunk/test/CodeGen/X86/MachineSink-DbgValue.ll<br>
llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll<br>
llvm/trunk/test/CodeGen/X86/misched-code-difference-with-debug.ll<br>
llvm/trunk/test/CodeGen/X86/stack-protector-dbginfo.ll<br>
llvm/trunk/test/CodeGen/X86/unknown-location.ll<br>
llvm/trunk/test/CodeGen/XCore/dwarf_debug.ll<br>
llvm/trunk/test/DebugInfo/2009-11-05-DeadGlobalVariable.ll<br>
llvm/trunk/test/DebugInfo/2009-11-10-CurrentFn.ll<br>
llvm/trunk/test/DebugInfo/2010-01-05-DbgScope.ll<br>
llvm/trunk/test/DebugInfo/2010-03-19-DbgDeclare.ll<br>
llvm/trunk/test/DebugInfo/2010-03-24-MemberFn.ll<br>
llvm/trunk/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll<br>
llvm/trunk/test/DebugInfo/2010-04-19-FramePtr.ll<br>
llvm/trunk/test/DebugInfo/2010-05-03-DisableFramePtr.ll<br>
llvm/trunk/test/DebugInfo/2010-05-03-OriginDIE.ll<br>
llvm/trunk/test/DebugInfo/2010-05-10-MultipleCU.ll<br>
llvm/trunk/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll<br>
llvm/trunk/test/DebugInfo/2010-07-19-Crash.ll<br>
llvm/trunk/test/DebugInfo/2010-10-01-crash.ll<br>
llvm/trunk/test/DebugInfo/AArch64/cfi-eof-prologue.ll<br>
llvm/trunk/test/DebugInfo/AArch64/coalescing.ll<br>
llvm/trunk/test/DebugInfo/AArch64/dwarfdump.ll<br>
llvm/trunk/test/DebugInfo/AArch64/struct_by_value.ll<br>
llvm/trunk/test/DebugInfo/ARM/PR16736.ll<br>
llvm/trunk/test/DebugInfo/ARM/cfi-eof-prologue.ll<br>
llvm/trunk/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll<br>
llvm/trunk/test/DebugInfo/ARM/s-super-register.ll<br>
llvm/trunk/test/DebugInfo/COFF/asan-module-ctor.ll<br>
llvm/trunk/test/DebugInfo/COFF/asm.ll<br>
llvm/trunk/test/DebugInfo/COFF/cpp-mangling.ll<br>
llvm/trunk/test/DebugInfo/COFF/multifile.ll<br>
llvm/trunk/test/DebugInfo/COFF/multifunction.ll<br>
llvm/trunk/test/DebugInfo/COFF/simple.ll<br>
llvm/trunk/test/DebugInfo/COFF/tail-call-without-lexical-scopes.ll<br>
llvm/trunk/test/DebugInfo/Inputs/gmlt.ll<br>
llvm/trunk/test/DebugInfo/Mips/delay-slot.ll<br>
llvm/trunk/test/DebugInfo/PR20038.ll<br>
llvm/trunk/test/DebugInfo/Sparc/gnu-window-save.ll<br>
llvm/trunk/test/DebugInfo/SystemZ/variable-loc.ll<br>
llvm/trunk/test/DebugInfo/X86/2010-04-13-PubType.ll<br>
llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll<br>
llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll<br>
llvm/trunk/test/DebugInfo/X86/2011-12-16-BadStructRef.ll<br>
llvm/trunk/test/DebugInfo/X86/DW_AT_byte_size.ll<br>
llvm/trunk/test/DebugInfo/X86/DW_AT_linkage_name.ll<br>
llvm/trunk/test/DebugInfo/X86/DW_AT_location-reference.ll<br>
llvm/trunk/test/DebugInfo/X86/DW_AT_object_pointer.ll<br>
llvm/trunk/test/DebugInfo/X86/DW_AT_specification.ll<br>
llvm/trunk/test/DebugInfo/X86/DW_AT_stmt_list_sec_offset.ll<br>
llvm/trunk/test/DebugInfo/X86/aligned_stack_var.ll<br>
llvm/trunk/test/DebugInfo/X86/arguments.ll<br>
llvm/trunk/test/DebugInfo/X86/array.ll<br>
llvm/trunk/test/DebugInfo/X86/array2.ll<br>
llvm/trunk/test/DebugInfo/X86/block-capture.ll<br>
llvm/trunk/test/DebugInfo/X86/byvalstruct.ll<br>
llvm/trunk/test/DebugInfo/X86/coff_debug_info_type.ll<br>
llvm/trunk/test/DebugInfo/X86/coff_relative_names.ll<br>
llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll<br>
llvm/trunk/test/DebugInfo/X86/constant-aggregate.ll<br>
llvm/trunk/test/DebugInfo/X86/cu-ranges-odr.ll<br>
llvm/trunk/test/DebugInfo/X86/cu-ranges.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-byval-parameter.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-const-int.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-const.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-declare.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-i128-const.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-merge-loc-entry.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-prolog-end.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-subrange.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-value-const-byref.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-value-dag-combine.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-value-inlined-parameter.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-value-isel.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-value-location.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-value-range.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg-value-terminator.ll<br>
llvm/trunk/test/DebugInfo/X86/dbg_value_direct.ll<br>
llvm/trunk/test/DebugInfo/X86/debug-dead-local-var.ll<br>
llvm/trunk/test/DebugInfo/X86/debug-info-access.ll<br>
llvm/trunk/test/DebugInfo/X86/debug-info-block-captured-self.ll<br>
llvm/trunk/test/DebugInfo/X86/debug-info-blocks.ll<br>
llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll<br>
llvm/trunk/test/DebugInfo/X86/debug-loc-asan.ll<br>
llvm/trunk/test/DebugInfo/X86/debug-loc-offset.ll<br>
llvm/trunk/test/DebugInfo/X86/debug-ranges-offset.ll<br>
llvm/trunk/test/DebugInfo/X86/decl-derived-member.ll<br>
llvm/trunk/test/DebugInfo/X86/discriminator.ll<br>
llvm/trunk/test/DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll<br>
llvm/trunk/test/DebugInfo/X86/dwarf-aranges.ll<br>
llvm/trunk/test/DebugInfo/X86/dwarf-public-names.ll<br>
llvm/trunk/test/DebugInfo/X86/dwarf-pubnames-split.ll<br>
llvm/trunk/test/DebugInfo/X86/elf-names.ll<br>
llvm/trunk/test/DebugInfo/X86/empty-and-one-elem-array.ll<br>
llvm/trunk/test/DebugInfo/X86/ending-run.ll<br>
llvm/trunk/test/DebugInfo/X86/fission-inline.ll<br>
llvm/trunk/test/DebugInfo/X86/fission-ranges.ll<br>
llvm/trunk/test/DebugInfo/X86/formal_parameter.ll<br>
llvm/trunk/test/DebugInfo/X86/generate-odr-hash.ll<br>
llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll<br>
llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll<br>
llvm/trunk/test/DebugInfo/X86/inline-member-function.ll<br>
llvm/trunk/test/DebugInfo/X86/inline-seldag-test.ll<br>
llvm/trunk/test/DebugInfo/X86/instcombine-instrinsics.ll<br>
llvm/trunk/test/DebugInfo/X86/lexical_block.ll<br>
llvm/trunk/test/DebugInfo/X86/line-info.ll<br>
llvm/trunk/test/DebugInfo/X86/linkage-name.ll<br>
llvm/trunk/test/DebugInfo/X86/low-pc-cu.ll<br>
llvm/trunk/test/DebugInfo/X86/misched-dbg-value.ll<br>
llvm/trunk/test/DebugInfo/X86/nodebug_with_debug_loc.ll<br>
llvm/trunk/test/DebugInfo/X86/objc-property-void.ll<br>
llvm/trunk/test/DebugInfo/X86/op_deref.ll<br>
llvm/trunk/test/DebugInfo/X86/parameters.ll<br>
llvm/trunk/test/DebugInfo/X86/pieces-1.ll<br>
llvm/trunk/test/DebugInfo/X86/pieces-2.ll<br>
llvm/trunk/test/DebugInfo/X86/pieces-3.ll<br>
llvm/trunk/test/DebugInfo/X86/pr11300.ll<br>
llvm/trunk/test/DebugInfo/X86/pr12831.ll<br>
llvm/trunk/test/DebugInfo/X86/pr13303.ll<br>
llvm/trunk/test/DebugInfo/X86/pr19307.ll<br>
llvm/trunk/test/DebugInfo/X86/prologue-stack.ll<br>
llvm/trunk/test/DebugInfo/X86/recursive_inlining.ll<br>
llvm/trunk/test/DebugInfo/X86/reference-argument.ll<br>
llvm/trunk/test/DebugInfo/X86/rvalue-ref.ll<br>
llvm/trunk/test/DebugInfo/X86/sret.ll<br>
llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll<br>
llvm/trunk/test/DebugInfo/X86/subrange-type.ll<br>
llvm/trunk/test/DebugInfo/X86/subreg.ll<br>
llvm/trunk/test/DebugInfo/X86/subregisters.ll<br>
llvm/trunk/test/DebugInfo/X86/template.ll<br>
llvm/trunk/test/DebugInfo/X86/tls.ll<br>
llvm/trunk/test/DebugInfo/X86/union-template.ll<br>
llvm/trunk/test/DebugInfo/X86/vla.ll<br>
llvm/trunk/test/DebugInfo/array.ll<br>
llvm/trunk/test/DebugInfo/block-asan.ll<br>
llvm/trunk/test/DebugInfo/constant-pointers.ll<br>
llvm/trunk/test/DebugInfo/cross-cu-inlining.ll<br>
llvm/trunk/test/DebugInfo/cross-cu-linkonce-distinct.ll<br>
llvm/trunk/test/DebugInfo/cross-cu-linkonce.ll<br>
llvm/trunk/test/DebugInfo/cu-range-hole.ll<br>
llvm/trunk/test/DebugInfo/cu-ranges.ll<br>
llvm/trunk/test/DebugInfo/dead-argument-order.ll<br>
llvm/trunk/test/DebugInfo/debug-info-always-inline.ll<br>
llvm/trunk/test/DebugInfo/debug-info-qualifiers.ll<br>
llvm/trunk/test/DebugInfo/debuginfofinder-multiple-cu.ll<br>
llvm/trunk/test/DebugInfo/duplicate_inline.ll<br>
llvm/trunk/test/DebugInfo/dwarf-public-names.ll<br>
llvm/trunk/test/DebugInfo/enum-types.ll<br>
llvm/trunk/test/DebugInfo/enum.ll<br>
llvm/trunk/test/DebugInfo/global.ll<br>
llvm/trunk/test/DebugInfo/incorrect-variable-debugloc.ll<br>
llvm/trunk/test/DebugInfo/incorrect-variable-debugloc1.ll<br>
llvm/trunk/test/DebugInfo/inheritance.ll<br>
llvm/trunk/test/DebugInfo/inline-debug-info-multiret.ll<br>
llvm/trunk/test/DebugInfo/inline-debug-info.ll<br>
llvm/trunk/test/DebugInfo/inline-no-debug-info.ll<br>
llvm/trunk/test/DebugInfo/inline-scopes.ll<br>
llvm/trunk/test/DebugInfo/inlined-arguments.ll<br>
llvm/trunk/test/DebugInfo/inlined-vars.ll<br>
llvm/trunk/test/DebugInfo/lto-comp-dir.ll<br>
llvm/trunk/test/DebugInfo/member-order.ll<br>
llvm/trunk/test/DebugInfo/missing-abstract-variable.ll<br>
llvm/trunk/test/DebugInfo/multiline.ll<br>
llvm/trunk/test/DebugInfo/namespace.ll<br>
llvm/trunk/test/DebugInfo/namespace_function_definition.ll<br>
llvm/trunk/test/DebugInfo/namespace_inline_function_definition.ll<br>
llvm/trunk/test/DebugInfo/nodebug.ll<br>
llvm/trunk/test/DebugInfo/restrict.ll<br>
llvm/trunk/test/DebugInfo/sugared-constants.ll<br>
llvm/trunk/test/DebugInfo/tu-composite.ll<br>
llvm/trunk/test/DebugInfo/two-cus-from-same-file.ll<br>
llvm/trunk/test/DebugInfo/unconditional-branch.ll<br>
llvm/trunk/test/DebugInfo/varargs.ll<br>
llvm/trunk/test/DebugInfo/version.ll<br>
llvm/trunk/test/Feature/md_on_instruction.ll<br>
llvm/trunk/test/Instrumentation/AddressSanitizer/debug_info.ll<br>
llvm/trunk/test/Instrumentation/DataFlowSanitizer/debug.ll<br>
llvm/trunk/test/Instrumentation/MemorySanitizer/store-origin.ll<br>
llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll<br>
llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll<br>
llvm/trunk/test/JitListener/multiple.ll<br>
llvm/trunk/test/JitListener/simple.ll<br>
llvm/trunk/test/Linker/2011-08-04-DebugLoc.ll<br>
llvm/trunk/test/Linker/2011-08-04-DebugLoc2.ll<br>
llvm/trunk/test/Linker/2011-08-04-Metadata.ll<br>
llvm/trunk/test/Linker/2011-08-04-Metadata2.ll<br>
llvm/trunk/test/Linker/2011-08-18-unique-class-type.ll<br>
llvm/trunk/test/Linker/2011-08-18-unique-class-type2.ll<br>
llvm/trunk/test/Linker/2011-08-18-unique-debug-type.ll<br>
llvm/trunk/test/Linker/2011-08-18-unique-debug-type2.ll<br>
llvm/trunk/test/Linker/DbgDeclare.ll<br>
llvm/trunk/test/Linker/DbgDeclare2.ll<br>
llvm/trunk/test/Linker/Inputs/replaced-function-matches-first-subprogram.ll<br>
llvm/trunk/test/Linker/Inputs/type-unique-inheritance-a.ll<br>
llvm/trunk/test/Linker/Inputs/type-unique-inheritance-b.ll<br>
llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll<br>
llvm/trunk/test/Linker/Inputs/type-unique-simple2-b.ll<br>
llvm/trunk/test/Linker/replaced-function-matches-first-subprogram.ll<br>
llvm/trunk/test/Linker/type-unique-odr-a.ll<br>
llvm/trunk/test/Linker/type-unique-odr-b.ll<br>
llvm/trunk/test/Linker/type-unique-simple-a.ll<br>
llvm/trunk/test/Linker/type-unique-simple-b.ll<br>
llvm/trunk/test/Linker/type-unique-simple2-a.ll<br>
llvm/trunk/test/Linker/type-unique-simple2-b.ll<br>
llvm/trunk/test/Linker/type-unique-type-array-a.ll<br>
llvm/trunk/test/Linker/type-unique-type-array-b.ll<br>
llvm/trunk/test/MC/ARM/coff-debugging-secrel.ll<br>
llvm/trunk/test/MC/ELF/cfi-version.ll<br>
llvm/trunk/test/Transforms/AddDiscriminators/basic.ll<br>
llvm/trunk/test/Transforms/AddDiscriminators/first-only.ll<br>
llvm/trunk/test/Transforms/AddDiscriminators/multiple.ll<br>
llvm/trunk/test/Transforms/AddDiscriminators/no-discriminators.ll<br>
llvm/trunk/test/Transforms/ArgumentPromotion/dbg.ll<br>
llvm/trunk/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll<br>
llvm/trunk/test/Transforms/DeadArgElim/dbginfo.ll<br>
llvm/trunk/test/Transforms/GCOVProfiling/function-numbering.ll<br>
llvm/trunk/test/Transforms/GCOVProfiling/global-ctor.ll<br>
llvm/trunk/test/Transforms/GCOVProfiling/linezero.ll<br>
llvm/trunk/test/Transforms/GCOVProfiling/linkagename.ll<br>
llvm/trunk/test/Transforms/GCOVProfiling/return-block.ll<br>
llvm/trunk/test/Transforms/GCOVProfiling/version.ll<br>
llvm/trunk/test/Transforms/GlobalOpt/2009-03-05-dbg.ll<br>
llvm/trunk/test/Transforms/Inline/debug-invoke.ll<br>
llvm/trunk/test/Transforms/Inline/inline_dbg_declare.ll<br>
llvm/trunk/test/Transforms/InstCombine/debug-line.ll<br>
llvm/trunk/test/Transforms/InstCombine/debuginfo.ll<br>
llvm/trunk/test/Transforms/LICM/debug-value.ll<br>
llvm/trunk/test/Transforms/LoopIdiom/debug-line.ll<br>
llvm/trunk/test/Transforms/LoopRotate/dbgvalue.ll<br>
llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks-missed.ll<br>
llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks.ll<br>
llvm/trunk/test/Transforms/LoopVectorize/conditional-assignment.ll<br>
llvm/trunk/test/Transforms/LoopVectorize/control-flow.ll<br>
llvm/trunk/test/Transforms/LoopVectorize/dbg.value.ll<br>
llvm/trunk/test/Transforms/LoopVectorize/debugloc.ll<br>
llvm/trunk/test/Transforms/LoopVectorize/no_array_bounds.ll<br>
llvm/trunk/test/Transforms/LoopVectorize/no_switch.ll<br>
llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo.ll<br>
llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll<br>
llvm/trunk/test/Transforms/ObjCARC/ensure-that-exception-unwind-path-is-visited.ll<br>
llvm/trunk/test/Transforms/SLPVectorizer/X86/debug_info.ll<br>
llvm/trunk/test/Transforms/SampleProfile/branch.ll<br>
llvm/trunk/test/Transforms/SampleProfile/calls.ll<br>
llvm/trunk/test/Transforms/SampleProfile/discriminator.ll<br>
llvm/trunk/test/Transforms/SampleProfile/fnptr.ll<br>
llvm/trunk/test/Transforms/SampleProfile/propagate.ll<br>
llvm/trunk/test/Transforms/ScalarRepl/debuginfo-preserved.ll<br>
llvm/trunk/test/Transforms/Scalarizer/dbginfo.ll<br>
llvm/trunk/test/Transforms/SimplifyCFG/branch-fold-dbg.ll<br>
llvm/trunk/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll<br>
llvm/trunk/test/Transforms/SimplifyCFG/trap-debugloc.ll<br>
llvm/trunk/test/Transforms/StripSymbols/2010-06-30-StripDebug.ll<br>
llvm/trunk/test/Transforms/StripSymbols/2010-08-25-crash.ll<br>
llvm/trunk/test/Transforms/StripSymbols/strip-dead-debug-info.ll<br>
<br>
Modified: llvm/trunk/include/llvm/IR/DebugInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfo.h?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfo.h?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/IR/DebugInfo.h (original)<br>
+++ llvm/trunk/include/llvm/IR/DebugInfo.h Wed Jan 14 16:27:36 2015<br>
@@ -877,10 +877,26 @@ class DILocation : public DIDescriptor {<br>
public:<br>
explicit DILocation(const MDNode *N) : DIDescriptor(N) {}<br>
<br>
- unsigned getLineNumber() const { return getUnsignedField(0); }<br>
- unsigned getColumnNumber() const { return getUnsignedField(1); }<br>
- DIScope getScope() const { return getFieldAs<DIScope>(2); }<br>
- DILocation getOrigLocation() const { return getFieldAs<DILocation>(3); }<br>
+ unsigned getLineNumber() const {<br>
+ if (auto *L = dyn_cast_or_null<MDLocation>(DbgNode))<br></blockquote><div><br>What else can this be other than an MDLocation? Should it just be cast_or_null?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ return L->getLine();<br>
+ return 0;<br>
+ }<br>
+ unsigned getColumnNumber() const {<br>
+ if (auto *L = dyn_cast_or_null<MDLocation>(DbgNode))<br>
+ return L->getColumn();<br>
+ return 0;<br>
+ }<br>
+ DIScope getScope() const {<br>
+ if (auto *L = dyn_cast_or_null<MDLocation>(DbgNode))<br>
+ return DIScope(dyn_cast_or_null<MDNode>(L->getScope()));<br>
+ return DIScope(nullptr);<br>
+ }<br>
+ DILocation getOrigLocation() const {<br>
+ if (auto *L = dyn_cast_or_null<MDLocation>(DbgNode))<br>
+ return DILocation(dyn_cast_or_null<MDNode>(L->getInlinedAt()));<br>
+ return DILocation(nullptr);<br>
+ }<br>
StringRef getFilename() const { return getScope().getFilename(); }<br>
StringRef getDirectory() const { return getScope().getDirectory(); }<br>
bool Verify() const;<br>
@@ -901,7 +917,9 @@ public:<br>
// sure this location is a lexical block before retrieving its<br>
// value.<br>
return getScope().isLexicalBlockFile()<br>
- ? getFieldAs<DILexicalBlockFile>(2).getDiscriminator()<br>
+ ? DILexicalBlockFile(<br>
+ cast<MDNode>(cast<MDLocation>(DbgNode)->getScope()))<br>
+ .getDiscriminator()<br>
: 0;<br>
}<br>
<br>
<br>
Modified: llvm/trunk/lib/IR/DebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/DebugInfo.cpp (original)<br>
+++ llvm/trunk/lib/IR/DebugInfo.cpp Wed Jan 14 16:27:36 2015<br>
@@ -592,10 +592,7 @@ bool DIExpression::Verify() const {<br>
}<br>
<br>
bool DILocation::Verify() const {<br>
- if (!DbgNode)<br>
- return false;<br>
-<br>
- return DbgNode->getNumOperands() == 4;<br>
+ return DbgNode && isa<MDLocation>(DbgNode);<br>
}<br>
<br>
bool DINameSpace::Verify() const {<br>
@@ -830,16 +827,12 @@ void DICompileUnit::replaceGlobalVariabl<br>
<br>
DILocation DILocation::copyWithNewScope(LLVMContext &Ctx,<br>
DILexicalBlockFile NewScope) {<br>
- SmallVector<Metadata *, 10> Elts;<br>
assert(Verify());<br>
- for (unsigned I = 0; I < DbgNode->getNumOperands(); ++I) {<br>
- if (I != 2)<br>
- Elts.push_back(DbgNode->getOperand(I));<br>
- else<br>
- Elts.push_back(NewScope);<br>
- }<br>
- MDNode *NewDIL = MDNode::get(Ctx, Elts);<br>
- return DILocation(NewDIL);<br>
+ assert(NewScope && "Expected valid scope");<br>
+<br>
+ const auto *Old = cast<MDLocation>(DbgNode);<br>
+ return DILocation(MDLocation::get(Ctx, Old->getLine(), Old->getColumn(),<br>
+ NewScope, Old->getInlinedAt()));<br>
}<br>
<br>
unsigned DILocation::computeNewDiscriminator(LLVMContext &Ctx) {<br>
<br>
Modified: llvm/trunk/lib/IR/DebugLoc.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugLoc.cpp?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugLoc.cpp?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/DebugLoc.cpp (original)<br>
+++ llvm/trunk/lib/IR/DebugLoc.cpp Wed Jan 14 16:27:36 2015<br>
@@ -58,12 +58,8 @@ DebugLoc DebugLoc::get(unsigned Line, un<br>
if (Col > 255) Col = 0;<br>
if (Line >= (1 << 24)) Line = 0;<br>
<br>
- LLVMContext &Context = Scope->getContext();<br>
- Type *Int32 = Type::getInt32Ty(Context);<br>
- Metadata *Elts[] = {ConstantAsMetadata::get(ConstantInt::get(Int32, Line)),<br>
- ConstantAsMetadata::get(ConstantInt::get(Int32, Col)),<br>
- Scope, InlinedAt};<br>
- return getFromDILocation(MDNode::get(Context, Elts));<br>
+ return getFromDILocation(<br>
+ MDLocation::get(Scope->getContext(), Line, Col, Scope, InlinedAt));<br>
}<br>
<br>
/// getAsMDNode - This method converts the compressed DebugLoc node into a<br>
<br>
Modified: llvm/trunk/test/Assembler/functionlocal-metadata.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/functionlocal-metadata.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/functionlocal-metadata.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/functionlocal-metadata.ll (original)<br>
+++ llvm/trunk/test/Assembler/functionlocal-metadata.ll Wed Jan 14 16:27:36 2015<br>
@@ -35,7 +35,7 @@ entry:<br>
<br>
!llvm.module.flags = !{!4}<br>
<br>
-!0 = !{i32 662302, i32 26, !1, null}<br>
+!0 = !MDLocation(line: 662302, column: 26, scope: !1)<br>
!1 = !{i32 4, !"foo"}<br>
!2 = !{!"bar"}<br>
!3 = !{!"foo"}<br>
@@ -49,7 +49,7 @@ declare void @llvm.dbg.value(metadata, i<br>
<br>
; CHECK: !foo = !{![[FOO]]}<br>
; CHECK: !bar = !{![[BAR]]}<br>
-; CHECK: ![[ID0]] = !{i32 662302, i32 26, ![[ID1]], null}<br>
+; CHECK: ![[ID0]] = !MDLocation(line: 662302, column: 26, scope: ![[ID1]])<br>
; CHECK: ![[ID1]] = !{i32 4, !"foo"}<br>
; CHECK: ![[ID2]] = !{!"bar"}<br>
; CHECK: ![[ID3]] = !{!"foo"}<br>
<br>
Modified: llvm/trunk/test/Assembler/metadata.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/metadata.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/metadata.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/metadata.ll (original)<br>
+++ llvm/trunk/test/Assembler/metadata.ll Wed Jan 14 16:27:36 2015<br>
@@ -11,7 +11,7 @@ define void @test() {<br>
ret void, !foo !0, !bar !1<br>
}<br>
<br>
-!0 = !{i32 662302, i32 26, !1, null}<br>
+!0 = !MDLocation(line: 662302, column: 26, scope: !1)<br>
!1 = !{i32 4, !"foo"}<br>
<br>
declare void @llvm.dbg.func.start(metadata) nounwind readnone<br>
<br>
Modified: llvm/trunk/test/Bindings/OCaml/<a href="http://core.ml" target="_blank">core.ml</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/OCaml/core.ml?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/OCaml/core.ml?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Bindings/OCaml/<a href="http://core.ml" target="_blank">core.ml</a> (original)<br>
+++ llvm/trunk/test/Bindings/OCaml/<a href="http://core.ml" target="_blank">core.ml</a> Wed Jan 14 16:27:36 2015<br>
@@ -1436,7 +1436,7 @@ let test_builder () =<br>
* CHECK: !llvm.module.flags = !{!0}<br>
* CHECK: !0 = !{i32 1, !"Debug Info Version", i32 2}<br>
* CHECK: !1 = !{i32 1, !"metadata test"}<br>
- * CHECK: !2 = !{i32 2, i32 3, !3, !3}<br>
+ * CHECK: !2 = !MDLocation(line: 2, column: 3, scope: !3, inlinedAt: !3)<br>
*)<br>
<br>
(*===-- Pass Managers -----------------------------------------------------===*)<br>
<br>
Modified: llvm/trunk/test/Bitcode/drop-debug-info.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/drop-debug-info.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/drop-debug-info.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Bitcode/drop-debug-info.ll (original)<br>
+++ llvm/trunk/test/Bitcode/drop-debug-info.ll Wed Jan 14 16:27:36 2015<br>
@@ -22,7 +22,7 @@ entry:<br>
!7 = !{!8}<br>
!8 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
!9 = !{i32 2, !"Dwarf Version", i32 2}<br>
-!12 = !{i32 4, i32 0, !4, null}<br>
+!12 = !MDLocation(line: 4, scope: !4)<br>
<br>
; WARN: warning: ignoring debug info with an invalid version (0)<br>
; CHECK-NOT: !dbg<br>
<br>
Modified: llvm/trunk/test/BugPoint/metadata.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/BugPoint/metadata.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/BugPoint/metadata.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/BugPoint/metadata.ll (original)<br>
+++ llvm/trunk/test/BugPoint/metadata.ll Wed Jan 14 16:27:36 2015<br>
@@ -5,7 +5,7 @@<br>
; Bugpoint should keep the call's metadata attached to the call.<br>
<br>
; CHECK: call void @foo(), !dbg ![[LOC:[0-9]+]], !attach ![[CALL:[0-9]+]]<br>
-; CHECK: ![[LOC]] = !{i32 104, i32 105, ![[SCOPE:[0-9]+]], ![[SCOPE]]}<br>
+; CHECK: ![[LOC]] = !MDLocation(line: 104, column: 105, scope: ![[SCOPE:[0-9]+]], inlinedAt: ![[SCOPE]])<br>
; CHECK: ![[SCOPE]] = !{!"0x11\000\00me\001\00\000\00\000", ![[FILE:[0-9]+]], ![[LIST:[0-9]+]], ![[LIST]], null, null, null}<br>
; CHECK: ![[FILE]] = !{!"source.c", !"/dir"}<br>
; CHECK: ![[LIST]] = !{i32 0}<br>
@@ -32,11 +32,11 @@ declare void @foo()<br>
!4 = !{!"filler"}<br>
<br>
!9 = !{!"0x11\000\00me\001\00\000\00\000", !15, !16, !16, null, null, null} ; [ DW_TAG_compile_unit ]<br>
-!10 = !{i32 100, i32 101, !9, !9}<br>
-!11 = !{i32 102, i32 103, !9, !9}<br>
-!12 = !{i32 104, i32 105, !9, !9}<br>
-!13 = !{i32 106, i32 107, !9, !9}<br>
-!14 = !{i32 108, i32 109, !9, !9}<br>
+!10 = !MDLocation(line: 100, column: 101, scope: !9, inlinedAt: !9)<br>
+!11 = !MDLocation(line: 102, column: 103, scope: !9, inlinedAt: !9)<br>
+!12 = !MDLocation(line: 104, column: 105, scope: !9, inlinedAt: !9)<br>
+!13 = !MDLocation(line: 106, column: 107, scope: !9, inlinedAt: !9)<br>
+!14 = !MDLocation(line: 108, column: 109, scope: !9, inlinedAt: !9)<br>
!15 = !{!"source.c", !"/dir"}<br>
!16 = !{i32 0}<br>
!17 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/CodeGen/AArch64/aarch64-2014-08-11-MachineCombinerCrash.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/aarch64-2014-08-11-MachineCombinerCrash.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/aarch64-2014-08-11-MachineCombinerCrash.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/AArch64/aarch64-2014-08-11-MachineCombinerCrash.ll (original)<br>
+++ llvm/trunk/test/CodeGen/AArch64/aarch64-2014-08-11-MachineCombinerCrash.ll Wed Jan 14 16:27:36 2015<br>
@@ -83,24 +83,24 @@ attributes #1 = { nounwind readnone }<br>
!36 = !{i32 2, !"Dwarf Version", i32 4}<br>
!37 = !{i32 2, !"Debug Info Version", i32 2}<br>
!38 = !{!"clang version 3.6.0 "}<br>
-!39 = !{i32 154, i32 8, !40, null}<br>
+!39 = !MDLocation(line: 154, column: 8, scope: !40)<br>
!40 = !{!"0xb\00154\008\002", !1, !41} ; [ DW_TAG_lexical_block ] [ ] []<br>
!41 = !{!"0xb\00154\008\001", !1, !42} ; [ DW_TAG_lexical_block ] [ ] []<br>
!42 = !{!"0xb\00154\003\000", !1, !4} ; [ DW_TAG_lexical_block ] [ ] []<br>
-!43 = !{i32 157, i32 5, !44, null}<br>
+!43 = !MDLocation(line: 157, column: 5, scope: !44)<br>
!44 = !{!"0xb\00154\0042\000", !1, !42} ; [ DW_TAG_lexical_block ] [ ] []<br>
-!45 = !{i32 159, i32 5, !44, null}<br>
+!45 = !MDLocation(line: 159, column: 5, scope: !44)<br>
!46 = !{!47, !47, i64 0}<br>
!47 = !{!"int", !48, i64 0}<br>
!48 = !{!"omnipotent char", !49, i64 0}<br>
!49 = !{!"Simple C/C++ TBAA"}<br>
-!50 = !{i32 160, i32 5, !44, null}<br>
-!51 = !{i32 161, i32 5, !44, null}<br>
-!52 = !{i32 188, i32 5, !44, null}<br>
-!53 = !{i32 190, i32 5, !44, null}<br>
-!54 = !{i32 198, i32 5, !44, null}<br>
-!55 = !{i32 144, i32 13, !4, null}<br>
-!56 = !{i32 200, i32 5, !44, null}<br>
-!57 = !{i32 203, i32 5, !44, null}<br>
-!58 = !{i32 207, i32 5, !44, null}<br>
-!59 = !{i32 208, i32 5, !44, null}<br>
+!50 = !MDLocation(line: 160, column: 5, scope: !44)<br>
+!51 = !MDLocation(line: 161, column: 5, scope: !44)<br>
+!52 = !MDLocation(line: 188, column: 5, scope: !44)<br>
+!53 = !MDLocation(line: 190, column: 5, scope: !44)<br>
+!54 = !MDLocation(line: 198, column: 5, scope: !44)<br>
+!55 = !MDLocation(line: 144, column: 13, scope: !4)<br>
+!56 = !MDLocation(line: 200, column: 5, scope: !44)<br>
+!57 = !MDLocation(line: 203, column: 5, scope: !44)<br>
+!58 = !MDLocation(line: 207, column: 5, scope: !44)<br>
+!59 = !MDLocation(line: 208, column: 5, scope: !44)<br>
<br>
Modified: llvm/trunk/test/CodeGen/AArch64/arm64-2011-03-17-AsmPrinterCrash.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/arm64-2011-03-17-AsmPrinterCrash.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/arm64-2011-03-17-AsmPrinterCrash.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/AArch64/arm64-2011-03-17-AsmPrinterCrash.ll (original)<br>
+++ llvm/trunk/test/CodeGen/AArch64/arm64-2011-03-17-AsmPrinterCrash.ll Wed Jan 14 16:27:36 2015<br>
@@ -34,12 +34,12 @@ declare void @llvm.dbg.declare(metadata,<br>
!10 = !{!"0x2e\00print_double\00print_double\00\00203\001\001\000\006\00256\000\000", !20, !2, !4, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!11 = !{!"0x2e\00print_number\00print_number\00\0075\001\001\000\006\00256\000\000", !20, !2, !4, i32 0, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!12 = !{!"0x2e\00get_flags\00get_flags\00\00508\001\001\000\006\00256\000\000", !20, !2, !8, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
-!13 = !{i32 653, i32 5, !14, null}<br>
+!13 = !MDLocation(line: 653, column: 5, scope: !14)<br>
!14 = !{!"0xb\00652\0035\002", !20, !15} ; [ DW_TAG_lexical_block ]<br>
!15 = !{!"0xb\00616\001\000", !20, !1} ; [ DW_TAG_lexical_block ]<br>
!16 = !{!"0x100\00do_tab_convert\00853\000", !17, !2, !6} ; [ DW_TAG_auto_variable ]<br>
!17 = !{!"0xb\00850\0012\0033", !20, !14} ; [ DW_TAG_lexical_block ]<br>
-!18 = !{i32 853, i32 11, !17, null}<br>
-!19 = !{i32 853, i32 29, !17, null}<br>
+!18 = !MDLocation(line: 853, column: 11, scope: !17)<br>
+!19 = !MDLocation(line: 853, column: 29, scope: !17)<br>
!20 = !{!"print.i", !"/Volumes/Ebi/echeng/radars/r9146594"}<br>
!21 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/2009-10-16-Scope.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-10-16-Scope.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-10-16-Scope.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/2009-10-16-Scope.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/2009-10-16-Scope.ll Wed Jan 14 16:27:36 2015<br>
@@ -22,13 +22,13 @@ declare void @llvm.dbg.declare(metadata,<br>
<br>
declare i32 @foo(i32) ssp<br>
<br>
-!0 = !{i32 5, i32 2, !1, null}<br>
+!0 = !MDLocation(line: 5, column: 2, scope: !1)<br>
!1 = !{!"0xb\001\001\000", null, !2}; [DW_TAG_lexical_block ]<br>
!2 = !{!"0x2e\00bar\00bar\00bar\004\000\001\000\006\000\000\000", i32 0, !3, null, null, null, null, null, null}; [DW_TAG_subprogram ]<br>
!3 = !{!"0x11\0012\00clang 1.1\001\00\000\00\000", !8, null, !9, null, null, null}; [DW_TAG_compile_unit ]<br>
!4 = !{!"0x100\00count_\005\000", !5, !3, !6}; [ DW_TAG_auto_variable ]<br>
!5 = !{!"0xb\001\001\000", null, !1}; [DW_TAG_lexical_block ]<br>
!6 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !3}; [DW_TAG_base_type ]<br>
-!7 = !{i32 6, i32 1, !2, null}<br>
+!7 = !MDLocation(line: 6, column: 1, scope: !2)<br>
!8 = !{!"genmodes.i", !"/Users/yash/Downloads"}<br>
!9 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/2010-04-15-ScavengerDebugValue.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2010-04-15-ScavengerDebugValue.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2010-04-15-ScavengerDebugValue.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/2010-04-15-ScavengerDebugValue.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/2010-04-15-ScavengerDebugValue.ll Wed Jan 14 16:27:36 2015<br>
@@ -24,9 +24,9 @@ declare void @llvm.dbg.value(metadata, i<br>
!6 = !{!"0x16\00SItype\00152\000\000\000\000", !12, null, !8} ; [ DW_TAG_typedef ]<br>
!7 = !{!"0x29", !"libgcc2.h", !"/Users/bwilson/local/nightly/test-2010-04-14/build/llvmgcc.roots/llvmgcc~obj/src/gcc", !3} ; [ DW_TAG_file_type ]<br>
!8 = !{!"0x24\00int\000\0032\0032\000\000\005", !12, !2} ; [ DW_TAG_base_type ]<br>
-!9 = !{i32 95, i32 0, !10, null}<br>
+!9 = !MDLocation(line: 95, scope: !10)<br>
!10 = !{!"0xb\0094\000\000", !12, !1} ; [ DW_TAG_lexical_block ]<br>
-!11 = !{i32 100, i32 0, !10, null}<br>
+!11 = !MDLocation(line: 100, scope: !10)<br>
!13 = !{i32 0}<br>
!14 = !{!1}<br>
!15 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/2010-06-25-Thumb2ITInvalidIterator.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2010-06-25-Thumb2ITInvalidIterator.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2010-06-25-Thumb2ITInvalidIterator.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/2010-06-25-Thumb2ITInvalidIterator.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/2010-06-25-Thumb2ITInvalidIterator.ll Wed Jan 14 16:27:36 2015<br>
@@ -62,15 +62,15 @@ declare void @llvm.dbg.value(metadata, i<br>
!12 = !{!"0x100\00c\007\000", !11, !2, !13} ; [ DW_TAG_auto_variable ]<br>
!13 = !{!"0x24\00int\000\0032\0032\000\000\005", !26, !2} ; [ DW_TAG_base_type ]<br>
!14 = !{!"0x34\00length\00length\00length\001\000\001", !2, !2, !13, i32* @length} ; [ DW_TAG_variable ]<br>
-!15 = !{i32 4, i32 24, !1, null}<br>
-!16 = !{i32 4, i32 43, !1, null}<br>
-!17 = !{i32 9, i32 2, !11, null}<br>
+!15 = !MDLocation(line: 4, column: 24, scope: !1)<br>
+!16 = !MDLocation(line: 4, column: 43, scope: !1)<br>
+!17 = !MDLocation(line: 9, column: 2, scope: !11)<br>
!18 = !{i32 0}<br>
-!19 = !{i32 10, i32 2, !11, null}<br>
-!20 = !{i32 11, i32 2, !11, null}<br>
-!21 = !{i32 12, i32 3, !22, null}<br>
+!19 = !MDLocation(line: 10, column: 2, scope: !11)<br>
+!20 = !MDLocation(line: 11, column: 2, scope: !11)<br>
+!21 = !MDLocation(line: 12, column: 3, scope: !22)<br>
!22 = !{!"0xb\0011\0045\000", !26, !11} ; [ DW_TAG_lexical_block ]<br>
-!23 = !{i32 13, i32 3, !22, null}<br>
-!24 = !{i32 14, i32 2, !22, null}<br>
-!25 = !{i32 15, i32 1, !11, null}<br>
+!23 = !MDLocation(line: 13, column: 3, scope: !22)<br>
+!24 = !MDLocation(line: 14, column: 2, scope: !22)<br>
+!25 = !MDLocation(line: 15, column: 1, scope: !11)<br>
!26 = !{!"t.c", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/2010-08-04-StackVariable.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2010-08-04-StackVariable.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2010-08-04-StackVariable.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/2010-08-04-StackVariable.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/2010-08-04-StackVariable.ll Wed Jan 14 16:27:36 2015<br>
@@ -101,28 +101,28 @@ declare void @llvm.dbg.value(metadata, i<br>
!21 = !{!"0x15\00\000\000\000\000\000\000", !48, null, null, !22, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!22 = !{!13}<br>
!23 = !{!"0x101\00i\0016\000", !17, !2, !13} ; [ DW_TAG_arg_variable ]<br>
-!24 = !{i32 16, i32 0, !17, null}<br>
+!24 = !MDLocation(line: 16, scope: !17)<br>
!25 = !{!"0x101\00location\0016\000", !17, !2, !26} ; [ DW_TAG_arg_variable ]<br>
!26 = !{!"0x10\00SVal\000\0064\0064\000\000", !48, !2, !1} ; [ DW_TAG_reference_type ]<br>
-!27 = !{i32 17, i32 0, !28, null}<br>
+!27 = !MDLocation(line: 17, scope: !28)<br>
!28 = !{!"0xb\0016\000\002", !2, !17} ; [ DW_TAG_lexical_block ]<br>
-!29 = !{i32 18, i32 0, !28, null}<br>
-!30 = !{i32 20, i32 0, !28, null}<br>
+!29 = !MDLocation(line: 18, scope: !28)<br>
+!30 = !MDLocation(line: 20, scope: !28)<br>
!31 = !{!"0x101\00this\0011\000", !16, !2, !32} ; [ DW_TAG_arg_variable ]<br>
!32 = !{!"0x26\00\000\0064\0064\000\0064", !48, !2, !33} ; [ DW_TAG_const_type ]<br>
!33 = !{!"0xf\00\000\0064\0064\000\000", !48, !2, !1} ; [ DW_TAG_pointer_type ]<br>
-!34 = !{i32 11, i32 0, !16, null}<br>
-!35 = !{i32 11, i32 0, !36, null}<br>
+!34 = !MDLocation(line: 11, scope: !16)<br>
+!35 = !MDLocation(line: 11, scope: !36)<br>
!36 = !{!"0xb\0011\000\001", !48, !37} ; [ DW_TAG_lexical_block ]<br>
!37 = !{!"0xb\0011\000\000", !48, !16} ; [ DW_TAG_lexical_block ]<br>
!38 = !{!"0x100\00v\0024\000", !39, !2, !1} ; [ DW_TAG_auto_variable ]<br>
!39 = !{!"0xb\0023\000\004", !48, !40} ; [ DW_TAG_lexical_block ]<br>
!40 = !{!"0xb\0023\000\003", !48, !20} ; [ DW_TAG_lexical_block ]<br>
-!41 = !{i32 24, i32 0, !39, null}<br>
-!42 = !{i32 25, i32 0, !39, null}<br>
-!43 = !{i32 26, i32 0, !39, null}<br>
+!41 = !MDLocation(line: 24, scope: !39)<br>
+!42 = !MDLocation(line: 25, scope: !39)<br>
+!43 = !MDLocation(line: 26, scope: !39)<br>
!44 = !{!"0x100\00k\0026\000", !39, !2, !13} ; [ DW_TAG_auto_variable ]<br>
-!45 = !{i32 27, i32 0, !39, null}<br>
+!45 = !MDLocation(line: 27, scope: !39)<br>
!46 = !{!16, !17, !20}<br>
!47 = !{}<br>
!48 = !{!"small.cc", !"/Users/manav/R8248330"}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll Wed Jan 14 16:27:36 2015<br>
@@ -108,16 +108,16 @@ entry:<br>
!27 = !{!"0x101\00a\0016\000", !9, !1, !5} ; [ DW_TAG_arg_variable ]<br>
!28 = !{!"0x100\00b\0016\000", !29, !1, !5} ; [ DW_TAG_auto_variable ]<br>
!29 = !{!"0xb\0016\000\004", !47, !9} ; [ DW_TAG_lexical_block ]<br>
-!30 = !{i32 4, i32 0, !0, null}<br>
-!31 = !{i32 4, i32 0, !12, null}<br>
-!32 = !{i32 7, i32 0, !6, null}<br>
-!33 = !{i32 7, i32 0, !20, null}<br>
-!34 = !{i32 10, i32 0, !7, null}<br>
-!35 = !{i32 10, i32 0, !23, null}<br>
-!36 = !{i32 13, i32 0, !8, null}<br>
-!37 = !{i32 13, i32 0, !26, null}<br>
-!38 = !{i32 16, i32 0, !9, null}<br>
-!39 = !{i32 16, i32 0, !29, null}<br>
+!30 = !MDLocation(line: 4, scope: !0)<br>
+!31 = !MDLocation(line: 4, scope: !12)<br>
+!32 = !MDLocation(line: 7, scope: !6)<br>
+!33 = !MDLocation(line: 7, scope: !20)<br>
+!34 = !MDLocation(line: 10, scope: !7)<br>
+!35 = !MDLocation(line: 10, scope: !23)<br>
+!36 = !MDLocation(line: 13, scope: !8)<br>
+!37 = !MDLocation(line: 13, scope: !26)<br>
+!38 = !MDLocation(line: 16, scope: !9)<br>
+!39 = !MDLocation(line: 16, scope: !29)<br>
!40 = !{!0, !6, !7, !8, !9}<br>
!41 = !{!13, !14, !15, !16, !17}<br>
!42 = !{!10, !11}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll Wed Jan 14 16:27:36 2015<br>
@@ -100,16 +100,16 @@ declare void @llvm.dbg.value(metadata, i<br>
!27 = !{!"0x101\00a\0016777233\000", !9, !2, !5} ; [ DW_TAG_arg_variable ]<br>
!28 = !{!"0x100\00b\0017\000", !29, !2, !5} ; [ DW_TAG_auto_variable ]<br>
!29 = !{!"0xb\0017\0019\004", !47, !9} ; [ DW_TAG_lexical_block ]<br>
-!30 = !{i32 5, i32 16, !1, null}<br>
-!31 = !{i32 5, i32 32, !12, null}<br>
-!32 = !{i32 8, i32 14, !6, null}<br>
-!33 = !{i32 8, i32 29, !15, null}<br>
-!34 = !{i32 11, i32 16, !7, null}<br>
-!35 = !{i32 11, i32 32, !18, null}<br>
-!36 = !{i32 14, i32 16, !8, null}<br>
-!37 = !{i32 14, i32 32, !21, null}<br>
-!38 = !{i32 17, i32 16, !9, null}<br>
-!39 = !{i32 17, i32 32, !29, null}<br>
+!30 = !MDLocation(line: 5, column: 16, scope: !1)<br>
+!31 = !MDLocation(line: 5, column: 32, scope: !12)<br>
+!32 = !MDLocation(line: 8, column: 14, scope: !6)<br>
+!33 = !MDLocation(line: 8, column: 29, scope: !15)<br>
+!34 = !MDLocation(line: 11, column: 16, scope: !7)<br>
+!35 = !MDLocation(line: 11, column: 32, scope: !18)<br>
+!36 = !MDLocation(line: 14, column: 16, scope: !8)<br>
+!37 = !MDLocation(line: 14, column: 32, scope: !21)<br>
+!38 = !MDLocation(line: 17, column: 16, scope: !9)<br>
+!39 = !MDLocation(line: 17, column: 32, scope: !29)<br>
!40 = !{!1, !6, !7, !8, !9}<br>
!41 = !{!25, !26}<br>
!42 = !{!10, !11}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/coalesce-dbgvalue.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/coalesce-dbgvalue.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/coalesce-dbgvalue.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/coalesce-dbgvalue.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/coalesce-dbgvalue.ll Wed Jan 14 16:27:36 2015<br>
@@ -100,12 +100,12 @@ attributes #3 = { nounwind }<br>
!18 = !{!"0x34\00b\00b\00\002\000\001", null, !5, !8, i32* @b, null} ; [ DW_TAG_variable ] [b] [line 2] [def]<br>
!19 = !{!"0x34\00c\00c\00\003\000\001", null, !5, !8, i32* @c, null} ; [ DW_TAG_variable ] [c] [line 3] [def]<br>
!20 = !{!"0x34\00d\00d\00\004\000\001", null, !5, !8, i32* @d, null} ; [ DW_TAG_variable ] [d] [line 4] [def]<br>
-!21 = !{i32 10, i32 0, !22, null}<br>
+!21 = !MDLocation(line: 10, scope: !22)<br>
!22 = !{!"0xb\0010\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/d/b/pr16110.c]<br>
-!26 = !{i32 12, i32 0, !13, null}<br>
+!26 = !MDLocation(line: 12, scope: !13)<br>
!27 = !{i32* null}<br>
-!28 = !{i32 13, i32 0, !12, null}<br>
-!29 = !{i32 14, i32 0, !12, null}<br>
-!31 = !{i32 16, i32 0, !4, null}<br>
-!32 = !{i32 18, i32 0, !4, null}<br>
+!28 = !MDLocation(line: 13, scope: !12)<br>
+!29 = !MDLocation(line: 14, scope: !12)<br>
+!31 = !MDLocation(line: 16, scope: !4)<br>
+!32 = !MDLocation(line: 18, scope: !4)<br>
!33 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/debug-frame-vararg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-frame-vararg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-frame-vararg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/debug-frame-vararg.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/debug-frame-vararg.ll Wed Jan 14 16:27:36 2015<br>
@@ -38,7 +38,7 @@<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5 "}<br>
!12 = !{!"0x101\00count\0016777221\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [count] [line 5]<br>
-!13 = !{i32 5, i32 0, !4, null}<br>
+!13 = !MDLocation(line: 5, scope: !4)<br>
!14 = !{!"0x100\00vl\006\000", !4, !5, !15} ; [ DW_TAG_auto_variable ] [vl] [line 6]<br>
!15 = !{!"0x16\00va_list\0030\000\000\000\000", !16, null, !17} ; [ DW_TAG_typedef ] [va_list] [line 30, size 0, align 0, offset 0] [from __builtin_va_list]<br>
!16 = !{!"/linux-x86_64-high/gcc_4.7.2/dbg/llvm/bin/../lib/clang/3.5/include/stdarg.h", !"/tmp"}<br>
@@ -47,18 +47,18 @@<br>
!19 = !{!20}<br>
!20 = !{!"0xd\00__ap\006\0032\0032\000\000", !1, !18, !21} ; [ DW_TAG_member ] [__ap] [line 6, size 32, align 32, offset 0] [from ]<br>
!21 = !{!"0xf\00\000\0032\0032\000\000", null, null, null} ; [ DW_TAG_pointer_type ] [line 0, size 32, align 32, offset 0] [from ]<br>
-!22 = !{i32 6, i32 0, !4, null}<br>
-!23 = !{i32 7, i32 0, !4, null}<br>
+!22 = !MDLocation(line: 6, scope: !4)<br>
+!23 = !MDLocation(line: 7, scope: !4)<br>
!24 = !{!"0x100\00sum\008\000", !4, !5, !8} ; [ DW_TAG_auto_variable ] [sum] [line 8]<br>
-!25 = !{i32 8, i32 0, !4, null}<br>
+!25 = !MDLocation(line: 8, scope: !4)<br>
!26 = !{!"0x100\00i\009\000", !27, !5, !8} ; [ DW_TAG_auto_variable ] [i] [line 9]<br>
!27 = !{!"0xb\009\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/tmp/var.c]<br>
-!28 = !{i32 9, i32 0, !27, null}<br>
-!29 = !{i32 10, i32 0, !30, null}<br>
+!28 = !MDLocation(line: 9, scope: !27)<br>
+!29 = !MDLocation(line: 10, scope: !30)<br>
!30 = !{!"0xb\009\000\001", !1, !27} ; [ DW_TAG_lexical_block ] [/tmp/var.c]<br>
-!31 = !{i32 11, i32 0, !30, null}<br>
-!32 = !{i32 12, i32 0, !4, null}<br>
-!33 = !{i32 13, i32 0, !4, null}<br>
+!31 = !MDLocation(line: 11, scope: !30)<br>
+!32 = !MDLocation(line: 12, scope: !4)<br>
+!33 = !MDLocation(line: 13, scope: !4)<br>
<br>
; CHECK-FP-LABEL: sum<br>
; CHECK-FP: .cfi_startproc<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/debug-frame.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-frame.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-frame.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/debug-frame.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/debug-frame.ll Wed Jan 14 16:27:36 2015<br>
@@ -142,27 +142,27 @@ declare void @_ZSt9terminatev()<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
!12 = !{!"clang version 3.5 "}<br>
!13 = !{!"0x101\00a\0016777220\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [a] [line 4]<br>
-!14 = !{i32 4, i32 0, !4, null}<br>
+!14 = !MDLocation(line: 4, scope: !4)<br>
!15 = !{!"0x101\00b\0033554436\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [b] [line 4]<br>
!16 = !{!"0x101\00c\0050331652\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [c] [line 4]<br>
!17 = !{!"0x101\00d\0067108868\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [d] [line 4]<br>
!18 = !{!"0x101\00e\0083886084\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [e] [line 4]<br>
!19 = !{!"0x101\00m\00100663301\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [m] [line 5]<br>
-!20 = !{i32 5, i32 0, !4, null}<br>
+!20 = !MDLocation(line: 5, scope: !4)<br>
!21 = !{!"0x101\00n\00117440517\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [n] [line 5]<br>
!22 = !{!"0x101\00p\00134217733\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [p] [line 5]<br>
!23 = !{!"0x101\00q\00150994949\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [q] [line 5]<br>
!24 = !{!"0x101\00r\00167772165\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [r] [line 5]<br>
-!25 = !{i32 7, i32 0, !26, null}<br>
+!25 = !MDLocation(line: 7, scope: !26)<br>
!26 = !{!"0xb\006\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/tmp/exp.cpp]<br>
-!27 = !{i32 8, i32 0, !26, null}<br>
-!28 = !{i32 11, i32 0, !26, null}<br>
-!29 = !{i32 9, i32 0, !30, null}<br>
+!27 = !MDLocation(line: 8, scope: !26)<br>
+!28 = !MDLocation(line: 11, scope: !26)<br>
+!29 = !MDLocation(line: 9, scope: !30)<br>
!30 = !{!"0xb\008\000\001", !1, !4} ; [ DW_TAG_lexical_block ] [/tmp/exp.cpp]<br>
-!31 = !{i32 10, i32 0, !30, null}<br>
-!32 = !{i32 10, i32 0, !4, null}<br>
-!33 = !{i32 11, i32 0, !4, null}<br>
-!34 = !{i32 11, i32 0, !30, null}<br>
+!31 = !MDLocation(line: 10, scope: !30)<br>
+!32 = !MDLocation(line: 10, scope: !4)<br>
+!33 = !MDLocation(line: 11, scope: !4)<br>
+!34 = !MDLocation(line: 11, scope: !30)<br>
<br>
; CHECK-FP-LABEL: _Z4testiiiiiddddd:<br>
; CHECK-FP: .cfi_startproc<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/debug-info-arg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-arg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-arg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/debug-info-arg.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/debug-info-arg.ll Wed Jan 14 16:27:36 2015<br>
@@ -52,16 +52,16 @@ declare void @llvm.dbg.value(metadata, i<br>
!17 = !{!"0x101\00y\0067108875\000", !1, !2, !15} ; [ DW_TAG_arg_variable ]<br>
!18 = !{!"0x101\00ptr1\0083886091\000", !1, !2, !6} ; [ DW_TAG_arg_variable ]<br>
!19 = !{!"0x101\00ptr2\00100663307\000", !1, !2, !6} ; [ DW_TAG_arg_variable ]<br>
-!20 = !{i32 11, i32 24, !1, null}<br>
-!21 = !{i32 11, i32 44, !1, null}<br>
-!22 = !{i32 11, i32 54, !1, null}<br>
-!23 = !{i32 11, i32 64, !1, null}<br>
-!24 = !{i32 11, i32 81, !1, null}<br>
-!25 = !{i32 11, i32 101, !1, null}<br>
-!26 = !{i32 12, i32 3, !27, null}<br>
+!20 = !MDLocation(line: 11, column: 24, scope: !1)<br>
+!21 = !MDLocation(line: 11, column: 44, scope: !1)<br>
+!22 = !MDLocation(line: 11, column: 54, scope: !1)<br>
+!23 = !MDLocation(line: 11, column: 64, scope: !1)<br>
+!24 = !MDLocation(line: 11, column: 81, scope: !1)<br>
+!25 = !MDLocation(line: 11, column: 101, scope: !1)<br>
+!26 = !MDLocation(line: 12, column: 3, scope: !27)<br>
!27 = !{!"0xb\0011\00107\000", !2, !1} ; [ DW_TAG_lexical_block ]<br>
-!28 = !{i32 13, i32 5, !27, null}<br>
-!29 = !{i32 14, i32 1, !27, null}<br>
+!28 = !MDLocation(line: 13, column: 5, scope: !27)<br>
+!29 = !MDLocation(line: 14, column: 1, scope: !27)<br>
!30 = !{!1}<br>
!31 = !{!5, !13, !14, !17, !18, !19}<br>
!32 = !{!"one.c", !"/Volumes/Athwagate/R10048772"}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/debug-info-blocks.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-blocks.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-blocks.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/debug-info-blocks.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/debug-info-blocks.ll Wed Jan 14 16:27:36 2015<br>
@@ -224,24 +224,24 @@ define hidden void @foobar_func_block_in<br>
!126 = !{!"0xf\00\000\0032\0032\000\000", null, !0, !127} ; [ DW_TAG_pointer_type ]<br>
!127 = !{!"0x13\00my_struct\0049\000\000\000\004\000", !159, !0, null, null, null, null, null} ; [ DW_TAG_structure_type ] [my_struct] [line 49, size 0, align 0, offset 0] [decl] [from ]<br>
!128 = !{!"0x29", !159} ; [ DW_TAG_file_type ]<br>
-!129 = !{i32 609, i32 144, !23, null}<br>
+!129 = !MDLocation(line: 609, column: 144, scope: !23)<br>
!130 = !{!"0x101\00loadedMydata\0033555041\000", !23, !24, !59} ; [ DW_TAG_arg_variable ]<br>
-!131 = !{i32 609, i32 155, !23, null}<br>
+!131 = !MDLocation(line: 609, column: 155, scope: !23)<br>
!132 = !{!"0x101\00bounds\0050332257\000", !23, !24, !108} ; [ DW_TAG_arg_variable ]<br>
-!133 = !{i32 609, i32 175, !23, null}<br>
+!133 = !MDLocation(line: 609, column: 175, scope: !23)<br>
!134 = !{!"0x101\00data\0067109473\000", !23, !24, !108} ; [ DW_TAG_arg_variable ]<br>
-!135 = !{i32 609, i32 190, !23, null}<br>
+!135 = !MDLocation(line: 609, column: 190, scope: !23)<br>
!136 = !{!"0x100\00mydata\00604\000", !23, !24, !50} ; [ DW_TAG_auto_variable ]<br>
-!137 = !{i32 604, i32 49, !23, null}<br>
+!137 = !MDLocation(line: 604, column: 49, scope: !23)<br>
!138 = !{!"0x100\00self\00604\000", !23, !40, !90} ; [ DW_TAG_auto_variable ]<br>
!139 = !{!"0x100\00semi\00607\000", !23, !24, !125} ; [ DW_TAG_auto_variable ]<br>
-!140 = !{i32 607, i32 30, !23, null}<br>
-!141 = !{i32 610, i32 17, !142, null}<br>
+!140 = !MDLocation(line: 607, column: 30, scope: !23)<br>
+!141 = !MDLocation(line: 610, column: 17, scope: !142)<br>
!142 = !{!"0xb\00609\00200\0094", !152, !23} ; [ DW_TAG_lexical_block ]<br>
-!143 = !{i32 611, i32 17, !142, null}<br>
-!144 = !{i32 612, i32 17, !142, null}<br>
-!145 = !{i32 613, i32 17, !142, null}<br>
-!146 = !{i32 615, i32 13, !142, null}<br>
+!143 = !MDLocation(line: 611, column: 17, scope: !142)<br>
+!144 = !MDLocation(line: 612, column: 17, scope: !142)<br>
+!145 = !MDLocation(line: 613, column: 17, scope: !142)<br>
+!146 = !MDLocation(line: 615, column: 13, scope: !142)<br>
!147 = !{!1, !1, !5, !5, !9, !14, !19, !19, !14, !14, !14, !19, !19, !19}<br>
!148 = !{!23}<br>
!149 = !{!"header3.h", !"/Volumes/Sandbox/llvm"}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/debug-info-branch-folding.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-branch-folding.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-branch-folding.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/debug-info-branch-folding.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/debug-info-branch-folding.ll Wed Jan 14 16:27:36 2015<br>
@@ -81,17 +81,17 @@ declare void @llvm.dbg.value(metadata, i<br>
!36 = !{!"0x16\00v4sf\003\000\000\000\000", !55, !2, !6} ; [ DW_TAG_typedef ]<br>
!37 = !{!"0xd\00A\0024\00128\0032\000\000", !55, !15, !38} ; [ DW_TAG_member ]<br>
!38 = !{!"0x1\00\000\00128\0032\000\000", null, !2, !7, !8, i32 0, i32 0} ; [ DW_TAG_array_type ]<br>
-!39 = !{i32 79, i32 7, !40, null}<br>
+!39 = !MDLocation(line: 79, column: 7, scope: !40)<br>
!40 = !{!"0xb\0075\0035\0018", !1, !41} ; [ DW_TAG_lexical_block ]<br>
!41 = !{!"0xb\0075\005\0017", !1, !42} ; [ DW_TAG_lexical_block ]<br>
!42 = !{!"0xb\0071\0032\0016", !1, !43} ; [ DW_TAG_lexical_block ]<br>
!43 = !{!"0xb\0071\003\0015", !1, !25} ; [ DW_TAG_lexical_block ]<br>
-!44 = !{i32 75, i32 5, !42, null}<br>
-!45 = !{i32 42, i32 2, !46, !48}<br>
+!44 = !MDLocation(line: 75, column: 5, scope: !42)<br>
+!45 = !MDLocation(line: 42, column: 2, scope: !46, inlinedAt: !48)<br>
!46 = !{!"0xb\0042\002\0020", !15, !47} ; [ DW_TAG_lexical_block ]<br>
!47 = !{!"0xb\0041\0028\0019", !15, !14} ; [ DW_TAG_lexical_block ]<br>
-!48 = !{i32 95, i32 3, !25, null}<br>
-!49 = !{i32 99, i32 3, !25, null}<br>
+!48 = !MDLocation(line: 95, column: 3, scope: !25)<br>
+!49 = !MDLocation(line: 99, column: 3, scope: !25)<br>
!50 = !{!0, !10, !14}<br>
!51 = !{!18}<br>
!52 = !{!19, !20, !24, !26, !27, !28, !29}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/debug-info-d16-reg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-d16-reg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-d16-reg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/debug-info-d16-reg.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/debug-info-d16-reg.ll Wed Jan 14 16:27:36 2015<br>
@@ -85,22 +85,22 @@ declare i32 @puts(i8* nocapture) nounwin<br>
!23 = !{!"0x101\00argv\0017\000", !10, !1, !13} ; [ DW_TAG_arg_variable ]<br>
!24 = !{!"0x100\00dval\0019\000", !25, !1, !7} ; [ DW_TAG_auto_variable ]<br>
!25 = !{!"0xb\0018\000\002", !46, !10} ; [ DW_TAG_lexical_block ]<br>
-!26 = !{i32 4, i32 0, !9, null}<br>
-!27 = !{i32 6, i32 0, !28, null}<br>
+!26 = !MDLocation(line: 4, scope: !9)<br>
+!27 = !MDLocation(line: 6, scope: !28)<br>
!28 = !{!"0xb\005\000\001", !46, !9} ; [ DW_TAG_lexical_block ]<br>
-!29 = !{i32 7, i32 0, !28, null}<br>
-!30 = !{i32 11, i32 0, !0, null}<br>
-!31 = !{i32 13, i32 0, !32, null}<br>
+!29 = !MDLocation(line: 7, scope: !28)<br>
+!30 = !MDLocation(line: 11, scope: !0)<br>
+!31 = !MDLocation(line: 13, scope: !32)<br>
!32 = !{!"0xb\0012\000\000", !46, !0} ; [ DW_TAG_lexical_block ]<br>
-!33 = !{i32 14, i32 0, !32, null}<br>
-!34 = !{i32 17, i32 0, !10, null}<br>
-!35 = !{i32 19, i32 0, !25, null}<br>
-!36 = !{i32 20, i32 0, !25, null}<br>
-!37 = !{i32 21, i32 0, !25, null}<br>
-!38 = !{i32 4, i32 0, !9, !37}<br>
-!39 = !{i32 6, i32 0, !28, !37}<br>
-!40 = !{i32 22, i32 0, !25, null}<br>
-!41 = !{i32 23, i32 0, !25, null}<br>
+!33 = !MDLocation(line: 14, scope: !32)<br>
+!34 = !MDLocation(line: 17, scope: !10)<br>
+!35 = !MDLocation(line: 19, scope: !25)<br>
+!36 = !MDLocation(line: 20, scope: !25)<br>
+!37 = !MDLocation(line: 21, scope: !25)<br>
+!38 = !MDLocation(line: 4, scope: !9, inlinedAt: !37)<br>
+!39 = !MDLocation(line: 6, scope: !28, inlinedAt: !37)<br>
+!40 = !MDLocation(line: 22, scope: !25)<br>
+!41 = !MDLocation(line: 23, scope: !25)<br>
!42 = !{!0, !9, !10}<br>
!43 = !{!16, !17, !18}<br>
!44 = !{!19, !20, !21}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/debug-info-qreg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-qreg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-qreg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/debug-info-qreg.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/debug-info-qreg.ll Wed Jan 14 16:27:36 2015<br>
@@ -77,17 +77,17 @@ declare void @llvm.dbg.value(metadata, i<br>
!36 = !{!"0x16\00v4sf\003\000\000\000\000", !55, !2, !6} ; [ DW_TAG_typedef ]<br>
!37 = !{!"0xd\00A\0024\00128\0032\000\000", !55, !15, !38} ; [ DW_TAG_member ]<br>
!38 = !{!"0x1\00\000\00128\0032\000\000", null, !2, !7, !8, i32 0, i32 0} ; [ DW_TAG_array_type ]<br>
-!39 = !{i32 79, i32 7, !40, null}<br>
+!39 = !MDLocation(line: 79, column: 7, scope: !40)<br>
!40 = !{!"0xb\0075\0035\0018", !54, !41} ; [ DW_TAG_lexical_block ]<br>
!41 = !{!"0xb\0075\005\0017", !54, !42} ; [ DW_TAG_lexical_block ]<br>
!42 = !{!"0xb\0071\0032\0016", !54, !43} ; [ DW_TAG_lexical_block ]<br>
!43 = !{!"0xb\0071\003\0015", !54, !25} ; [ DW_TAG_lexical_block ]<br>
-!44 = !{i32 75, i32 5, !42, null}<br>
-!45 = !{i32 42, i32 2, !46, !48}<br>
+!44 = !MDLocation(line: 75, column: 5, scope: !42)<br>
+!45 = !MDLocation(line: 42, column: 2, scope: !46, inlinedAt: !48)<br>
!46 = !{!"0xb\0042\002\0020", !55, !47} ; [ DW_TAG_lexical_block ]<br>
!47 = !{!"0xb\0041\0028\0019", !55, !14} ; [ DW_TAG_lexical_block ]<br>
-!48 = !{i32 95, i32 3, !25, null}<br>
-!49 = !{i32 99, i32 3, !25, null}<br>
+!48 = !MDLocation(line: 95, column: 3, scope: !25)<br>
+!49 = !MDLocation(line: 99, column: 3, scope: !25)<br>
!50 = !{!0, !10, !14}<br>
!51 = !{!18}<br>
!52 = !{!19, !20, !24, !26, !27, !28, !29}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/debug-info-s16-reg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-s16-reg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-s16-reg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/debug-info-s16-reg.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/debug-info-s16-reg.ll Wed Jan 14 16:27:36 2015<br>
@@ -89,29 +89,29 @@ declare void @llvm.dbg.value(metadata, i<br>
!21 = !{!"0x24\00char\000\008\008\000\000\006", null, !2} ; [ DW_TAG_base_type ]<br>
!22 = !{!"0x100\00dval\0019\000", !23, !1, !11} ; [ DW_TAG_auto_variable ]<br>
!23 = !{!"0xb\0018\001\002", !51, !7} ; [ DW_TAG_lexical_block ]<br>
-!24 = !{i32 4, i32 22, !0, null}<br>
-!25 = !{i32 4, i32 33, !0, null}<br>
-!26 = !{i32 4, i32 52, !0, null}<br>
-!27 = !{i32 6, i32 3, !28, null}<br>
+!24 = !MDLocation(line: 4, column: 22, scope: !0)<br>
+!25 = !MDLocation(line: 4, column: 33, scope: !0)<br>
+!26 = !MDLocation(line: 4, column: 52, scope: !0)<br>
+!27 = !MDLocation(line: 6, column: 3, scope: !28)<br>
!28 = !{!"0xb\005\001\000", !51, !0} ; [ DW_TAG_lexical_block ]<br>
-!29 = !{i32 7, i32 3, !28, null}<br>
-!30 = !{i32 11, i32 42, !6, null}<br>
-!31 = !{i32 11, i32 53, !6, null}<br>
-!32 = !{i32 11, i32 72, !6, null}<br>
-!33 = !{i32 13, i32 3, !34, null}<br>
+!29 = !MDLocation(line: 7, column: 3, scope: !28)<br>
+!30 = !MDLocation(line: 11, column: 42, scope: !6)<br>
+!31 = !MDLocation(line: 11, column: 53, scope: !6)<br>
+!32 = !MDLocation(line: 11, column: 72, scope: !6)<br>
+!33 = !MDLocation(line: 13, column: 3, scope: !34)<br>
!34 = !{!"0xb\0012\001\001", !51, !6} ; [ DW_TAG_lexical_block ]<br>
-!35 = !{i32 14, i32 3, !34, null}<br>
-!36 = !{i32 17, i32 15, !7, null}<br>
-!37 = !{i32 17, i32 28, !7, null}<br>
-!38 = !{i32 19, i32 31, !23, null}<br>
-!39 = !{i32 20, i32 3, !23, null}<br>
-!40 = !{i32 21, i32 3, !23, null}<br>
-!41 = !{i32 4, i32 22, !0, !40}<br>
-!42 = !{i32 4, i32 33, !0, !40}<br>
-!43 = !{i32 4, i32 52, !0, !40}<br>
-!44 = !{i32 6, i32 3, !28, !40}<br>
-!45 = !{i32 22, i32 3, !23, null}<br>
-!46 = !{i32 23, i32 1, !23, null}<br>
+!35 = !MDLocation(line: 14, column: 3, scope: !34)<br>
+!36 = !MDLocation(line: 17, column: 15, scope: !7)<br>
+!37 = !MDLocation(line: 17, column: 28, scope: !7)<br>
+!38 = !MDLocation(line: 19, column: 31, scope: !23)<br>
+!39 = !MDLocation(line: 20, column: 3, scope: !23)<br>
+!40 = !MDLocation(line: 21, column: 3, scope: !23)<br>
+!41 = !MDLocation(line: 4, column: 22, scope: !0, inlinedAt: !40)<br>
+!42 = !MDLocation(line: 4, column: 33, scope: !0, inlinedAt: !40)<br>
+!43 = !MDLocation(line: 4, column: 52, scope: !0, inlinedAt: !40)<br>
+!44 = !MDLocation(line: 6, column: 3, scope: !28, inlinedAt: !40)<br>
+!45 = !MDLocation(line: 22, column: 3, scope: !23)<br>
+!46 = !MDLocation(line: 23, column: 1, scope: !23)<br>
!47 = !{!0, !6, !7}<br>
!48 = !{!8, !10, !12}<br>
!49 = !{!14, !15, !16}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/debug-info-sreg2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-sreg2.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-info-sreg2.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/debug-info-sreg2.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/debug-info-sreg2.ll Wed Jan 14 16:27:36 2015<br>
@@ -54,11 +54,11 @@ declare void @llvm.dbg.value(metadata, i<br>
!8 = !{!"0x100\00y\008\000", !9, !2, !7} ; [ DW_TAG_auto_variable ]<br>
!9 = !{!"0xb\007\0025\002", !18, !10} ; [ DW_TAG_lexical_block ]<br>
!10 = !{!"0xb\007\003\001", !18, !6} ; [ DW_TAG_lexical_block ]<br>
-!11 = !{i32 6, i32 18, !6, null}<br>
-!12 = !{i32 7, i32 3, !6, null}<br>
-!13 = !{i32 8, i32 20, !9, null}<br>
-!14 = !{i32 7, i32 20, !10, null}<br>
-!15 = !{i32 10, i32 1, !6, null}<br>
+!11 = !MDLocation(line: 6, column: 18, scope: !6)<br>
+!12 = !MDLocation(line: 7, column: 3, scope: !6)<br>
+!13 = !MDLocation(line: 8, column: 20, scope: !9)<br>
+!14 = !MDLocation(line: 7, column: 20, scope: !10)<br>
+!15 = !MDLocation(line: 10, column: 1, scope: !6)<br>
!16 = !{!1}<br>
!17 = !{!5, !8}<br>
!18 = !{!"k.cc", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/CodeGen/ARM/debug-segmented-stacks.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-segmented-stacks.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/debug-segmented-stacks.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/ARM/debug-segmented-stacks.ll (original)<br>
+++ llvm/trunk/test/CodeGen/ARM/debug-segmented-stacks.ll Wed Jan 14 16:27:36 2015<br>
@@ -52,7 +52,7 @@ define void @test_basic() #0 {<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5 "}<br>
!12 = !{!"0x101\00count\0016777221\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [count] [line 5]<br>
-!13 = !{i32 5, i32 0, !4, null}<br>
+!13 = !MDLocation(line: 5, scope: !4)<br>
!14 = !{!"0x100\00vl\006\000", !4, !5, !15} ; [ DW_TAG_auto_variable ] [vl] [line 6]<br>
!15 = !{!"0x16\00va_list\0030\000\000\000\000", !16, null, !17} ; [ DW_TAG_typedef ] [va_list] [line 30, size 0, align 0, offset 0] [from __builtin_va_list]<br>
!16 = !{!"/linux-x86_64-high/gcc_4.7.2/dbg/llvm/bin/../lib/clang/3.5/include/stdarg.h", !"/tmp"}<br>
@@ -61,18 +61,18 @@ define void @test_basic() #0 {<br>
!19 = !{!20}<br>
!20 = !{!"0xd\00__ap\006\0032\0032\000\000", !1, !18, !21} ; [ DW_TAG_member ] [__ap] [line 6, size 32, align 32, offset 0] [from ]<br>
!21 = !{!"0xf\00\000\0032\0032\000\000", null, null, null} ; [ DW_TAG_pointer_type ] [line 0, size 32, align 32, offset 0] [from ]<br>
-!22 = !{i32 6, i32 0, !4, null}<br>
-!23 = !{i32 7, i32 0, !4, null}<br>
+!22 = !MDLocation(line: 6, scope: !4)<br>
+!23 = !MDLocation(line: 7, scope: !4)<br>
!24 = !{!"0x100\00test_basic\008\000", !4, !5, !8} ; [ DW_TAG_auto_variable ] [sum] [line 8]<br>
-!25 = !{i32 8, i32 0, !4, null}<br>
+!25 = !MDLocation(line: 8, scope: !4)<br>
!26 = !{!"0x100\00i\009\000", !27, !5, !8} ; [ DW_TAG_auto_variable ] [i] [line 9]<br>
!27 = !{!"0xb\009\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/tmp/var.c]<br>
-!28 = !{i32 9, i32 0, !27, null}<br>
-!29 = !{i32 10, i32 0, !30, null}<br>
+!28 = !MDLocation(line: 9, scope: !27)<br>
+!29 = !MDLocation(line: 10, scope: !30)<br>
!30 = !{!"0xb\009\000\001", !1, !27} ; [ DW_TAG_lexical_block ] [/tmp/var.c]<br>
-!31 = !{i32 11, i32 0, !30, null}<br>
-!32 = !{i32 12, i32 0, !4, null}<br>
-!33 = !{i32 13, i32 0, !4, null}<br>
+!31 = !MDLocation(line: 11, scope: !30)<br>
+!32 = !MDLocation(line: 12, scope: !4)<br>
+!33 = !MDLocation(line: 13, scope: !4)<br>
<br>
; Just to prevent the alloca from being optimized away<br>
declare void @dummy_use(i32*, i32)<br>
<br>
Modified: llvm/trunk/test/CodeGen/Hexagon/hwloop-dbg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Hexagon/hwloop-dbg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Hexagon/hwloop-dbg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/Hexagon/hwloop-dbg.ll (original)<br>
+++ llvm/trunk/test/CodeGen/Hexagon/hwloop-dbg.ll Wed Jan 14 16:27:36 2015<br>
@@ -51,14 +51,14 @@ declare void @llvm.dbg.value(metadata, i<br>
!14 = !{!"0x101\00b\0033554433\000", !5, !6, !9} ; [ DW_TAG_arg_variable ] [b] [line 1]<br>
!15 = !{!"0x100\00i\002\000", !16, !6, !10} ; [ DW_TAG_auto_variable ] [i] [line 2]<br>
!16 = !{!"0xb\001\0026\000", !28, !5} ; [ DW_TAG_lexical_block ] [/usr2/kparzysz/s.hex/t/hwloop-dbg.c]<br>
-!17 = !{i32 1, i32 15, !5, null}<br>
-!18 = !{i32 1, i32 23, !5, null}<br>
-!19 = !{i32 3, i32 8, !20, null}<br>
+!17 = !MDLocation(line: 1, column: 15, scope: !5)<br>
+!18 = !MDLocation(line: 1, column: 23, scope: !5)<br>
+!19 = !MDLocation(line: 3, column: 8, scope: !20)<br>
!20 = !{!"0xb\003\003\001", !28, !16} ; [ DW_TAG_lexical_block ] [/usr2/kparzysz/s.hex/t/hwloop-dbg.c]<br>
-!21 = !{i32 4, i32 5, !22, null}<br>
+!21 = !MDLocation(line: 4, column: 5, scope: !22)<br>
!22 = !{!"0xb\003\0028\002", !28, !20} ; [ DW_TAG_lexical_block ] [/usr2/kparzysz/s.hex/t/hwloop-dbg.c]<br>
-!26 = !{i32 3, i32 23, !20, null}<br>
-!27 = !{i32 6, i32 1, !16, null}<br>
+!26 = !MDLocation(line: 3, column: 23, scope: !20)<br>
+!27 = !MDLocation(line: 6, column: 1, scope: !16)<br>
!28 = !{!"hwloop-dbg.c", !"/usr2/kparzysz/s.hex/t"}<br>
!29 = !{i32 1, !"Debug Info Version", i32 2}<br>
!30 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/CodeGen/Inputs/DbgValueOtherTargets.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Inputs/DbgValueOtherTargets.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Inputs/DbgValueOtherTargets.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/Inputs/DbgValueOtherTargets.ll (original)<br>
+++ llvm/trunk/test/CodeGen/Inputs/DbgValueOtherTargets.ll Wed Jan 14 16:27:36 2015<br>
@@ -23,8 +23,8 @@ declare void @llvm.dbg.value(metadata, i<br>
!6 = !{i32 0}<br>
!7 = !{!"0x100\00i\003\000", !8, !1, !5} ; [ DW_TAG_auto_variable ]<br>
!8 = !{!"0xb\002\0012\000", !12, !0} ; [ DW_TAG_lexical_block ]<br>
-!9 = !{i32 3, i32 11, !8, null}<br>
-!10 = !{i32 4, i32 2, !8, null}<br>
+!9 = !MDLocation(line: 3, column: 11, scope: !8)<br>
+!10 = !MDLocation(line: 4, column: 2, scope: !8)<br>
!11 = !{!0}<br>
!12 = !{!"/tmp/x.c", !"/Users/manav"}<br>
!13 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/CodeGen/PowerPC/dbg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/dbg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/dbg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/PowerPC/dbg.ll (original)<br>
+++ llvm/trunk/test/CodeGen/PowerPC/dbg.ll Wed Jan 14 16:27:36 2015<br>
@@ -31,9 +31,9 @@ declare void @llvm.dbg.value(metadata, i<br>
!13 = !{!15, !16}<br>
!15 = !{!"0x101\00argc\0016777217\000", !5, !6, !9} ; [ DW_TAG_arg_variable ]<br>
!16 = !{!"0x101\00argv\0033554433\000", !5, !6, !10} ; [ DW_TAG_arg_variable ]<br>
-!17 = !{i32 1, i32 14, !5, null}<br>
-!18 = !{i32 1, i32 26, !5, null}<br>
-!19 = !{i32 2, i32 3, !20, null}<br>
+!17 = !MDLocation(line: 1, column: 14, scope: !5)<br>
+!18 = !MDLocation(line: 1, column: 26, scope: !5)<br>
+!19 = !MDLocation(line: 2, column: 3, scope: !20)<br>
!20 = !{!"0xb\001\0034\000", !21, !5} ; [ DW_TAG_lexical_block ]<br>
!21 = !{!"dbg.c", !"/src"}<br>
!22 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/CodeGen/PowerPC/pr17168.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/pr17168.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/pr17168.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/PowerPC/pr17168.ll (original)<br>
+++ llvm/trunk/test/CodeGen/PowerPC/pr17168.ll Wed Jan 14 16:27:36 2015<br>
@@ -493,26 +493,26 @@ attributes #1 = { nounwind readnone }<br>
!436 = !{!"0x34\00tmp2\00tmp2\00\0088\001\001", null, !300, !20, null, null} ; [ DW_TAG_variable ] [tmp2] [line 88] [local] [def]<br>
!437 = !{!"0x34\00tmp1\00tmp1\00\0088\001\001", null, !300, !20, null, null} ; [ DW_TAG_variable ] [tmp1] [line 88] [local] [def]<br>
!438 = !{i32 2, !"Dwarf Version", i32 4}<br>
-!439 = !{i32 1898, i32 0, !440, null}<br>
+!439 = !MDLocation(line: 1898, scope: !440)<br>
!440 = !{!"0xb\001898\000\00107", !1, !114} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
-!441 = !{i32 1913, i32 0, !442, null}<br>
+!441 = !MDLocation(line: 1913, scope: !442)<br>
!442 = !{!"0xb\001913\000\00115", !1, !114} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
-!443 = !{i32 1923, i32 0, !114, null}<br>
+!443 = !MDLocation(line: 1923, scope: !114)<br>
!444 = !{!"int", !445}<br>
!445 = !{!"omnipotent char", !446}<br>
!446 = !{!"Simple C/C++ TBAA"}<br>
!447 = !{i32 1}<br>
-!448 = !{i32 1925, i32 0, !449, null}<br>
+!448 = !MDLocation(line: 1925, scope: !449)<br>
!449 = !{!"0xb\001925\000\00121", !1, !114} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
-!450 = !{i32 1939, i32 0, !451, null}<br>
+!450 = !MDLocation(line: 1939, scope: !451)<br>
!451 = !{!"0xb\001939\000\00127", !1, !114} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
-!452 = !{i32 1940, i32 0, !453, null}<br>
+!452 = !MDLocation(line: 1940, scope: !453)<br>
!453 = !{!"0xb\001940\000\00129", !1, !454} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
!454 = !{!"0xb\001939\000\00128", !1, !451} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
-!455 = !{i32 1941, i32 0, !456, null}<br>
+!455 = !MDLocation(line: 1941, scope: !456)<br>
!456 = !{!"0xb\001941\000\00131", !1, !457} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
!457 = !{!"0xb\001940\000\00130", !1, !453} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
-!458 = !{i32 2020, i32 0, !459, null}<br>
+!458 = !MDLocation(line: 2020, scope: !459)<br>
!459 = !{!"0xb\002020\000\00149", !1, !460} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
!460 = !{!"0xb\002019\000\00148", !1, !461} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
!461 = !{!"0xb\002019\000\00147", !1, !462} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c]<br>
<br>
Modified: llvm/trunk/test/CodeGen/PowerPC/unwind-dw2-g.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/unwind-dw2-g.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/unwind-dw2-g.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/PowerPC/unwind-dw2-g.ll (original)<br>
+++ llvm/trunk/test/CodeGen/PowerPC/unwind-dw2-g.ll Wed Jan 14 16:27:36 2015<br>
@@ -30,6 +30,6 @@ attributes #0 = { nounwind }<br>
!6 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !7, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!7 = !{null}<br>
!8 = !{i32 2, !"Dwarf Version", i32 3}<br>
-!9 = !{i32 2, i32 0, !4, null}<br>
-!10 = !{i32 3, i32 0, !4, null}<br>
+!9 = !MDLocation(line: 2, scope: !4)<br>
+!10 = !MDLocation(line: 3, scope: !4)<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/CodeGen/Thumb/2010-07-15-debugOrdering.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb/2010-07-15-debugOrdering.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb/2010-07-15-debugOrdering.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/Thumb/2010-07-15-debugOrdering.ll (original)<br>
+++ llvm/trunk/test/CodeGen/Thumb/2010-07-15-debugOrdering.ll Wed Jan 14 16:27:36 2015<br>
@@ -48,7 +48,7 @@ declare void @llvm.dbg.value(metadata, i<br>
<br>
!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!5}<br>
!llvm.module.flags = !{!104}<br>
-!0 = !{i32 46, i32 0, !1, null}<br>
+!0 = !MDLocation(line: 46, scope: !1)<br>
!1 = !{!"0xb\0044\000\000", !101, !2} ; [ DW_TAG_lexical_block ]<br>
!2 = !{!"0xb\0044\000\000", !101, !3} ; [ DW_TAG_lexical_block ]<br>
!3 = !{!"0x2e\00getClosestDiagonal3\00getClosestDiagonal3\00_Z19getClosestDiagonal3ii\0044\000\001\000\006\000\000\000", !101, null, !6, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
@@ -142,13 +142,13 @@ declare void @llvm.dbg.value(metadata, i<br>
!89 = !{!"0x2e\00indexOfMaxComponent\00indexOfMaxComponent\00_ZNK9ggVector319indexOfMaxComponentEv\00146\000\000\000\006\000\000\000", !9, !8, !86, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!90 = !{!"0x2e\00indexOfMaxAbsComponent\00indexOfMaxAbsComponent\00_ZNK9ggVector322indexOfMaxAbsComponentEv\00150\000\000\000\006\000\000\000", !9, !8, !86, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!91 = !{!"0x100\00vx\0046\000", !1, !4, !13} ; [ DW_TAG_auto_variable ]<br>
-!92 = !{i32 48, i32 0, !1, null}<br>
-!93 = !{i32 218, i32 0, !94, !96}<br>
+!92 = !MDLocation(line: 48, scope: !1)<br>
+!93 = !MDLocation(line: 218, scope: !94, inlinedAt: !96)<br>
!94 = !{!"0xb\00217\000\000", !101, !95} ; [ DW_TAG_lexical_block ]<br>
!95 = !{!"0xb\00217\000\000", !101, !77} ; [ DW_TAG_lexical_block ]<br>
-!96 = !{i32 51, i32 0, !1, null}<br>
-!97 = !{i32 227, i32 0, !94, !96}<br>
-!98 = !{i32 52, i32 0, !1, null}<br>
+!96 = !MDLocation(line: 51, scope: !1)<br>
+!97 = !MDLocation(line: 227, scope: !94, inlinedAt: !96)<br>
+!98 = !MDLocation(line: 52, scope: !1)<br>
!101 = !{!"ggEdgeDiscrepancy.cc", !"/Volumes/Home/grosbaj/sources/llvm-externals/speccpu2000/benchspec/CINT2000/252.eon/src"}<br>
!102 = !{i32 0}<br>
!103 = !{!3, !77}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2009-02-12-DebugInfoVLA.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-02-12-DebugInfoVLA.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-02-12-DebugInfoVLA.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2009-02-12-DebugInfoVLA.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2009-02-12-DebugInfoVLA.ll Wed Jan 14 16:27:36 2015<br>
@@ -73,15 +73,15 @@ declare void @llvm.stackrestore(i8*) nou<br>
!4 = !{!5, !6}<br>
!5 = !{!"0x24\00char\000\008\008\000\000\006", null, !2} ; [ DW_TAG_base_type ]<br>
!6 = !{!"0xf\00\000\0064\0064\000\000", null, !2, !5} ; [ DW_TAG_pointer_type ]<br>
-!7 = !{i32 2, i32 0, !1, null}<br>
+!7 = !MDLocation(line: 2, scope: !1)<br>
!8 = !{!"0x100\00str.0\003\000", !1, !2, !9} ; [ DW_TAG_auto_variable ]<br>
!9 = !{!"0xf\00\000\0064\0064\000\0064", null, !2, !10} ; [ DW_TAG_pointer_type ]<br>
!10 = !{!"0x1\00\000\008\008\000\000", null, !2, !5, !11, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 8, align 8, offset 0] [from char]<br>
!11 = !{!12}<br>
!12 = !{!"0x21\000\001"} ; [ DW_TAG_subrange_type ]<br>
-!13 = !{i32 3, i32 0, !14, null}<br>
+!13 = !MDLocation(line: 3, scope: !14)<br>
!14 = !{!"0xb\000\000\000", !17, !1} ; [ DW_TAG_lexical_block ]<br>
-!15 = !{i32 4, i32 0, !14, null}<br>
-!16 = !{i32 5, i32 0, !14, null}<br>
+!15 = !MDLocation(line: 4, scope: !14)<br>
+!16 = !MDLocation(line: 5, scope: !14)<br>
!17 = !{!"vla.c", !"/tmp/"}<br>
!18 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2009-10-16-Scope.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-10-16-Scope.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-10-16-Scope.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2009-10-16-Scope.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2009-10-16-Scope.ll Wed Jan 14 16:27:36 2015<br>
@@ -22,13 +22,13 @@ declare void @llvm.dbg.declare(metadata,<br>
<br>
declare i32 @foo(i32) ssp<br>
<br>
-!0 = !{i32 5, i32 2, !1, null}<br>
+!0 = !MDLocation(line: 5, column: 2, scope: !1)<br>
!1 = !{!"0xb\001\001\000", null, !2}; [DW_TAG_lexical_block ]<br>
!2 = !{!"0x2e\00bar\00bar\00bar\004\000\001\000\006\000\000\000", i32 0, !3, null, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!3 = !{!"0x11\0012\00clang 1.1\001\00\000\00\000", !8, null, !9, null, null, null}; [DW_TAG_compile_unit ]<br>
!4 = !{!"0x100\00count_\005\000", !5, !3, !6}; [ DW_TAG_auto_variable ]<br>
!5 = !{!"0xb\001\001\000", null, !1}; [DW_TAG_lexical_block ]<br>
!6 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !3}; [DW_TAG_base_type ]<br>
-!7 = !{i32 6, i32 1, !2, null}<br>
+!7 = !MDLocation(line: 6, column: 1, scope: !2)<br>
!8 = !{!"genmodes.i", !"/Users/yash/Downloads"}<br>
!9 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2010-01-18-DbgValue.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-01-18-DbgValue.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-01-18-DbgValue.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2010-01-18-DbgValue.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2010-01-18-DbgValue.ll Wed Jan 14 16:27:36 2015<br>
@@ -46,8 +46,8 @@ declare void @llvm.dbg.declare(metadata,<br>
!12 = !{!"0xd\00x\002\0064\0064\000\000", !19, !10, !6} ; [ DW_TAG_member ]<br>
!13 = !{!"0xd\00y\003\0064\0064\0064\000", !19, !10, !6} ; [ DW_TAG_member ]<br>
!14 = !{!"0xd\00P2\008\00128\0064\00128\000", !19, !7, !10} ; [ DW_TAG_member ]<br>
-!15 = !{i32 11, i32 0, !1, null}<br>
-!16 = !{i32 12, i32 0, !17, null}<br>
+!15 = !MDLocation(line: 11, scope: !1)<br>
+!16 = !MDLocation(line: 12, scope: !17)<br>
!17 = !{!"0xb\0011\000\000", !19, !1} ; [ DW_TAG_lexical_block ]<br>
!18 = !{!1}<br>
!19 = !{!"b2.c", !"/tmp/"}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll Wed Jan 14 16:27:36 2015<br>
@@ -219,30 +219,30 @@ declare void @llvm.dbg.value(metadata, i<br>
!16 = !{!"0x100\00ratio\001923\000", !15, !2, !9} ; [ DW_TAG_auto_variable ]<br>
!17 = !{!"0x100\00x\001923\000", !15, !2, !9} ; [ DW_TAG_auto_variable ]<br>
!18 = !{!"0x100\00y\001923\000", !15, !2, !9} ; [ DW_TAG_auto_variable ]<br>
-!19 = !{i32 1929, i32 0, !15, null}<br>
-!20 = !{i32 1931, i32 0, !15, null}<br>
-!21 = !{i32 1932, i32 0, !15, null}<br>
-!22 = !{i32 1933, i32 0, !15, null}<br>
-!23 = !{i32 1934, i32 0, !15, null}<br>
-!24 = !{i32 1938, i32 0, !15, null}<br>
-!25 = !{i32 1939, i32 0, !15, null}<br>
-!26 = !{i32 1940, i32 0, !15, null}<br>
-!27 = !{i32 1941, i32 0, !15, null}<br>
-!28 = !{i32 1946, i32 0, !15, null}<br>
-!29 = !{i32 1948, i32 0, !15, null}<br>
-!30 = !{i32 1950, i32 0, !15, null}<br>
-!31 = !{i32 1951, i32 0, !15, null}<br>
-!32 = !{i32 1953, i32 0, !15, null}<br>
-!33 = !{i32 1955, i32 0, !15, null}<br>
-!34 = !{i32 1956, i32 0, !15, null}<br>
-!35 = !{i32 1957, i32 0, !15, null}<br>
-!36 = !{i32 1958, i32 0, !15, null}<br>
-!37 = !{i32 1960, i32 0, !15, null}<br>
-!38 = !{i32 1962, i32 0, !15, null}<br>
-!39 = !{i32 1963, i32 0, !15, null}<br>
-!40 = !{i32 1964, i32 0, !15, null}<br>
-!41 = !{i32 1965, i32 0, !15, null}<br>
-!42 = !{i32 1969, i32 0, !15, null}<br>
+!19 = !MDLocation(line: 1929, scope: !15)<br>
+!20 = !MDLocation(line: 1931, scope: !15)<br>
+!21 = !MDLocation(line: 1932, scope: !15)<br>
+!22 = !MDLocation(line: 1933, scope: !15)<br>
+!23 = !MDLocation(line: 1934, scope: !15)<br>
+!24 = !MDLocation(line: 1938, scope: !15)<br>
+!25 = !MDLocation(line: 1939, scope: !15)<br>
+!26 = !MDLocation(line: 1940, scope: !15)<br>
+!27 = !MDLocation(line: 1941, scope: !15)<br>
+!28 = !MDLocation(line: 1946, scope: !15)<br>
+!29 = !MDLocation(line: 1948, scope: !15)<br>
+!30 = !MDLocation(line: 1950, scope: !15)<br>
+!31 = !MDLocation(line: 1951, scope: !15)<br>
+!32 = !MDLocation(line: 1953, scope: !15)<br>
+!33 = !MDLocation(line: 1955, scope: !15)<br>
+!34 = !MDLocation(line: 1956, scope: !15)<br>
+!35 = !MDLocation(line: 1957, scope: !15)<br>
+!36 = !MDLocation(line: 1958, scope: !15)<br>
+!37 = !MDLocation(line: 1960, scope: !15)<br>
+!38 = !MDLocation(line: 1962, scope: !15)<br>
+!39 = !MDLocation(line: 1963, scope: !15)<br>
+!40 = !MDLocation(line: 1964, scope: !15)<br>
+!41 = !MDLocation(line: 1965, scope: !15)<br>
+!42 = !MDLocation(line: 1969, scope: !15)<br>
!43 = !{!0, !11, !12, !13, !14, !16, !17, !18}<br>
!44 = !{!1}<br>
!45 = !{!"libgcc2.c", !"/Users/yash/clean/LG.D/gcc/../../llvmgcc/gcc"}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll Wed Jan 14 16:27:36 2015<br>
@@ -52,9 +52,9 @@ declare void @llvm.dbg.value(metadata, i<br>
!25 = !{!"0x101\00argv\0022\000", !19, !1, !22} ; [ DW_TAG_arg_variable ]<br>
!26 = !{!"0x100\00e\0023\000", !27, !1, !14} ; [ DW_TAG_auto_variable ]<br>
!27 = !{!"0xb\0022\000\000", !36, !19} ; [ DW_TAG_lexical_block ]<br>
-!28 = !{i32 18, i32 0, !29, null}<br>
+!28 = !MDLocation(line: 18, scope: !29)<br>
!29 = !{!"0xb\0017\000\001", !36, !9} ; [ DW_TAG_lexical_block ]<br>
-!30 = !{i32 19, i32 0, !29, null}<br>
+!30 = !MDLocation(line: 19, scope: !29)<br>
!31 = !{!0}<br>
!32 = !{!5, !9, !19}<br>
!33 = !{!4}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2010-05-28-Crash.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-05-28-Crash.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-05-28-Crash.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2010-05-28-Crash.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2010-05-28-Crash.ll Wed Jan 14 16:27:36 2015<br>
@@ -34,11 +34,11 @@ entry:<br>
!6 = !{!"0x24\00int\000\0032\0032\000\000\005", !18, !2} ; [ DW_TAG_base_type ]<br>
!7 = !{!"0x101\00x\006\000", !8, !2, !6} ; [ DW_TAG_arg_variable ]<br>
!8 = !{!"0x2e\00bar\00bar\00bar\006\000\001\000\006\000\001\006", !18, !2, !4, null, i32 (i32)* @bar, null, null, !16} ; [ DW_TAG_subprogram ]<br>
-!9 = !{i32 3, i32 0, !10, null}<br>
+!9 = !MDLocation(line: 3, scope: !10)<br>
!10 = !{!"0xb\002\000\000", !18, !1} ; [ DW_TAG_lexical_block ]<br>
!11 = !{i32 1}<br>
-!12 = !{i32 3, i32 0, !10, !13}<br>
-!13 = !{i32 7, i32 0, !14, null}<br>
+!12 = !MDLocation(line: 3, scope: !10, inlinedAt: !13)<br>
+!13 = !MDLocation(line: 7, scope: !14)<br>
!14 = !{!"0xb\006\000\000", !18, !8} ; [ DW_TAG_lexical_block ]<br>
!15 = !{!0}<br>
!16 = !{!7}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll Wed Jan 14 16:27:36 2015<br>
@@ -52,7 +52,7 @@ declare void @llvm.dbg.value(metadata, i<br>
!26 = !{!"0xb\0019\000\000", !31, !27} ; [ DW_TAG_lexical_block ]<br>
!27 = !{!"0xb\0019\000\000", !31, !18} ; [ DW_TAG_lexical_block ]<br>
!28 = !{!"0x100\00b\0021\000", !26, !3, !7} ; [ DW_TAG_auto_variable ]<br>
-!29 = !{i32 16, i32 0, !30, null}<br>
+!29 = !MDLocation(line: 16, scope: !30)<br>
!30 = !{!"0xb\0015\000\000", !31, !8} ; [ DW_TAG_lexical_block ]<br>
!31 = !{!"foo.cp", !"/tmp/"}<br>
!32 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2010-07-06-DbgCrash.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-07-06-DbgCrash.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-07-06-DbgCrash.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2010-07-06-DbgCrash.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2010-07-06-DbgCrash.ll Wed Jan 14 16:27:36 2015<br>
@@ -17,7 +17,7 @@<br>
!104 = !{!"0x1\00\000\0085312\0064\000\000", !109, null, !46, !105, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 85312, align 64, offset 0] [from ]<br>
!105 = !{!106}<br>
!106 = !{!"0x21\000\001333"} ; [ DW_TAG_subrange_type ]<br>
-!107 = !{i32 73, i32 0, !103, null}<br>
+!107 = !MDLocation(line: 73, scope: !103)<br>
!108 = !{i32 0}<br>
!109 = !{!"pbmsrch.c", !"/Users/grawp/LLVM/test-suite/MultiSource/Benchmarks/MiBench/office-stringsearch"}<br>
<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2010-08-04-StackVariable.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-08-04-StackVariable.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-08-04-StackVariable.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2010-08-04-StackVariable.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2010-08-04-StackVariable.ll Wed Jan 14 16:27:36 2015<br>
@@ -102,28 +102,28 @@ declare void @llvm.dbg.value(metadata, i<br>
!21 = !{!"0x15\00\000\000\000\000\000\000", !47, !2, null, !22, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!22 = !{!13}<br>
!23 = !{!"0x101\00i\0016\000", !17, !2, !13} ; [ DW_TAG_arg_variable ]<br>
-!24 = !{i32 16, i32 0, !17, null}<br>
+!24 = !MDLocation(line: 16, scope: !17)<br>
!25 = !{!"0x101\00location\0016\000", !17, !2, !26} ; [ DW_TAG_arg_variable ]<br>
!26 = !{!"0x10\00SVal\000\0064\0064\000\000", !47, !2, !1} ; [ DW_TAG_reference_type ]<br>
-!27 = !{i32 17, i32 0, !28, null}<br>
+!27 = !MDLocation(line: 17, scope: !28)<br>
!28 = !{!"0xb\0016\000\002", !47, !17} ; [ DW_TAG_lexical_block ]<br>
-!29 = !{i32 18, i32 0, !28, null}<br>
-!30 = !{i32 20, i32 0, !28, null}<br>
+!29 = !MDLocation(line: 18, scope: !28)<br>
+!30 = !MDLocation(line: 20, scope: !28)<br>
!31 = !{!"0x101\00this\0011\000", !16, !2, !32} ; [ DW_TAG_arg_variable ]<br>
!32 = !{!"0x26\00\000\0064\0064\000\0064", !47, !2, !33} ; [ DW_TAG_const_type ]<br>
!33 = !{!"0xf\00\000\0064\0064\000\000", !47, !2, !1} ; [ DW_TAG_pointer_type ]<br>
-!34 = !{i32 11, i32 0, !16, null}<br>
-!35 = !{i32 11, i32 0, !36, null}<br>
+!34 = !MDLocation(line: 11, scope: !16)<br>
+!35 = !MDLocation(line: 11, scope: !36)<br>
!36 = !{!"0xb\0011\000\001", !47, !37} ; [ DW_TAG_lexical_block ]<br>
!37 = !{!"0xb\0011\000\000", !47, !16} ; [ DW_TAG_lexical_block ]<br>
!38 = !{!"0x100\00v\0024\000", !39, !2, !1} ; [ DW_TAG_auto_variable ]<br>
!39 = !{!"0xb\0023\000\004", !47, !40} ; [ DW_TAG_lexical_block ]<br>
!40 = !{!"0xb\0023\000\003", !47, !20} ; [ DW_TAG_lexical_block ]<br>
-!41 = !{i32 24, i32 0, !39, null}<br>
-!42 = !{i32 25, i32 0, !39, null}<br>
-!43 = !{i32 26, i32 0, !39, null}<br>
+!41 = !MDLocation(line: 24, scope: !39)<br>
+!42 = !MDLocation(line: 25, scope: !39)<br>
+!43 = !MDLocation(line: 26, scope: !39)<br>
!44 = !{!"0x100\00k\0026\000", !39, !2, !13} ; [ DW_TAG_auto_variable ]<br>
-!45 = !{i32 27, i32 0, !39, null}<br>
+!45 = !MDLocation(line: 27, scope: !39)<br>
!47 = !{!"small.cc", !"/Users/manav/R8248330"}<br>
!48 = !{i32 0}<br>
!49 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2010-09-16-EmptyFilename.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-09-16-EmptyFilename.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-09-16-EmptyFilename.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2010-09-16-EmptyFilename.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2010-09-16-EmptyFilename.ll Wed Jan 14 16:27:36 2015<br>
@@ -23,9 +23,9 @@ entry:<br>
!5 = !{!"0x24\00int\000\0032\0032\000\000\005", !14, !1} ; [ DW_TAG_base_type ]<br>
!6 = !{!"0x2e\00bar\00bar\00bar\004\000\001\000\006\000\000\000", !15, !7, !3, null, i32 ()* @bar, null, null, null} ; [ DW_TAG_subprogram ]<br>
!7 = !{!"0x29", !15} ; [ DW_TAG_file_type ]<br>
-!8 = !{i32 53, i32 13, !9, null}<br>
+!8 = !MDLocation(line: 53, column: 13, scope: !9)<br>
!9 = !{!"0xb\0053\0011\000", !14, !0} ; [ DW_TAG_lexical_block ]<br>
-!10 = !{i32 4, i32 13, !11, null}<br>
+!10 = !MDLocation(line: 4, column: 13, scope: !11)<br>
!11 = !{!"0xb\004\0013\002", !15, !12} ; [ DW_TAG_lexical_block ]<br>
!12 = !{!"0xb\004\0011\001", !15, !6} ; [ DW_TAG_lexical_block ]<br>
!13 = !{!0, !6}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2010-11-02-DbgParameter.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-11-02-DbgParameter.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-11-02-DbgParameter.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2010-11-02-DbgParameter.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2010-11-02-DbgParameter.ll Wed Jan 14 16:27:36 2015<br>
@@ -30,8 +30,8 @@ declare void @llvm.dbg.value(metadata, i<br>
!9 = !{!10, !11}<br>
!10 = !{!"0xd\00x\002\0032\0032\000\000", !17, !1, !5} ; [ DW_TAG_member ]<br>
!11 = !{!"0xd\00y\002\0032\0032\0032\000", !17, !1, !5} ; [ DW_TAG_member ]<br>
-!12 = !{i32 3, i32 47, !0, null}<br>
-!13 = !{i32 4, i32 2, !14, null}<br>
+!12 = !MDLocation(line: 3, column: 47, scope: !0)<br>
+!13 = !MDLocation(line: 4, column: 2, scope: !14)<br>
!14 = !{!"0xb\003\0050\000", !17, !0} ; [ DW_TAG_lexical_block ]<br>
!15 = !{!0}<br>
!16 = !{!6}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll Wed Jan 14 16:27:36 2015<br>
@@ -96,16 +96,16 @@ declare i32 @puts(i8* nocapture) nounwin<br>
!15 = !{!"0xb\0025\0012\002", !31, !6} ; [ DW_TAG_lexical_block ]<br>
!16 = !{!"0x24\00unsigned int\000\0032\0032\000\000\007", null, !2} ; [ DW_TAG_base_type ]<br>
!17 = !{!"0x100\00z_s\0027\000", !15, !1, !9} ; [ DW_TAG_auto_variable ]<br>
-!18 = !{i32 5, i32 41, !0, null}<br>
-!19 = !{i32 5, i32 49, !0, null}<br>
-!20 = !{i32 7, i32 5, !13, null}<br>
-!21 = !{i32 8, i32 9, !22, null}<br>
+!18 = !MDLocation(line: 5, column: 41, scope: !0)<br>
+!19 = !MDLocation(line: 5, column: 49, scope: !0)<br>
+!20 = !MDLocation(line: 7, column: 5, scope: !13)<br>
+!21 = !MDLocation(line: 8, column: 9, scope: !22)<br>
!22 = !{!"0xb\007\0014\001", !31, !13} ; [ DW_TAG_lexical_block ]<br>
-!23 = !{i32 9, i32 9, !22, null}<br>
-!24 = !{i32 26, i32 38, !15, null}<br>
-!25 = !{i32 27, i32 38, !15, null}<br>
-!26 = !{i32 28, i32 9, !15, null}<br>
-!27 = !{i32 30, i32 1, !15, null}<br>
+!23 = !MDLocation(line: 9, column: 9, scope: !22)<br>
+!24 = !MDLocation(line: 26, column: 38, scope: !15)<br>
+!25 = !MDLocation(line: 27, column: 38, scope: !15)<br>
+!26 = !MDLocation(line: 28, column: 9, scope: !15)<br>
+!27 = !MDLocation(line: 30, column: 1, scope: !15)<br>
!28 = !{!0, !6}<br>
!29 = !{!10, !11, !12}<br>
!30 = !{!14, !17}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/MachineSink-DbgValue.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/MachineSink-DbgValue.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/MachineSink-DbgValue.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/MachineSink-DbgValue.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/MachineSink-DbgValue.ll Wed Jan 14 16:27:36 2015<br>
@@ -40,12 +40,12 @@ declare void @llvm.dbg.value(metadata, i<br>
!9 = !{!"0x24\00char\000\008\008\000\000\006", null, !0} ; [ DW_TAG_base_type ]<br>
!10 = !{!"0x100\00a\003\000", !11, !2, !9} ; [ DW_TAG_auto_variable ]<br>
!11 = !{!"0xb\002\0025\000", !20, !1} ; [ DW_TAG_lexical_block ]<br>
-!12 = !{i32 2, i32 13, !1, null}<br>
-!13 = !{i32 2, i32 22, !1, null}<br>
-!14 = !{i32 3, i32 14, !11, null}<br>
-!15 = !{i32 4, i32 3, !11, null}<br>
-!16 = !{i32 5, i32 5, !11, null}<br>
-!17 = !{i32 7, i32 1, !11, null}<br>
+!12 = !MDLocation(line: 2, column: 13, scope: !1)<br>
+!13 = !MDLocation(line: 2, column: 22, scope: !1)<br>
+!14 = !MDLocation(line: 3, column: 14, scope: !11)<br>
+!15 = !MDLocation(line: 4, column: 3, scope: !11)<br>
+!16 = !MDLocation(line: 5, column: 5, scope: !11)<br>
+!17 = !MDLocation(line: 7, column: 1, scope: !11)<br>
!18 = !{!1}<br>
!19 = !{!6, !7, !10}<br>
!20 = !{!"a.c", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll Wed Jan 14 16:27:36 2015<br>
@@ -160,45 +160,45 @@ attributes #2 = { nounwind readnone }<br>
!44 = !{i32 2, !"Dwarf Version", i32 4}<br>
!45 = !{i32 2, !"Debug Info Version", i32 2}<br>
!46 = !{!"clang version 3.5.0 "}<br>
-!47 = !{i32 11, i32 0, !24, null}<br>
+!47 = !MDLocation(line: 11, scope: !24)<br>
!48 = !{i8* null}<br>
-!49 = !{i32 12, i32 0, !24, null}<br>
-!50 = !{i32 14, i32 0, !51, null}<br>
+!49 = !MDLocation(line: 12, scope: !24)<br>
+!50 = !MDLocation(line: 14, scope: !51)<br>
!51 = !{!"0xb\0014\000\000", !1, !24} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp]<br>
-!52 = !{i32 15, i32 0, !53, null}<br>
+!52 = !MDLocation(line: 15, scope: !53)<br>
!53 = !{!"0xb\0014\000\000", !1, !51} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp]<br>
-!54 = !{i32 16, i32 0, !53, null}<br>
-!55 = !{i32 17, i32 0, !24, null}<br>
+!54 = !MDLocation(line: 16, scope: !53)<br>
+!55 = !MDLocation(line: 17, scope: !24)<br>
!56 = !{!"0x101\00this\0016777216\001088", !40, null, !38, !55} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!57 = !{i32 0, i32 0, !40, !55}<br>
+!57 = !MDLocation(line: 0, scope: !40, inlinedAt: !55)<br>
!58 = !{i8* getelementptr inbounds ([1 x i8]* @.str, i64 0, i64 0)}<br>
!59 = !{!"0x101\00value\0033554437\000", !40, !25, !15, !55} ; [ DW_TAG_arg_variable ] [value] [line 5]<br>
-!60 = !{i32 5, i32 0, !40, !55}<br>
-!61 = !{i32 5, i32 0, !62, !55}<br>
+!60 = !MDLocation(line: 5, scope: !40, inlinedAt: !55)<br>
+!61 = !MDLocation(line: 5, scope: !62, inlinedAt: !55)<br>
!62 = !{!"0xb\005\000\000", !1, !40} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp]<br>
-!63 = !{i32 18, i32 0, !24, null}<br>
+!63 = !MDLocation(line: 18, scope: !24)<br>
!64 = !{!"0x101\00this\0016777216\001088", !40, null, !38, !63} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!65 = !{i32 0, i32 0, !40, !63}<br>
+!65 = !MDLocation(line: 0, scope: !40, inlinedAt: !63)<br>
!66 = !{!"0x101\00value\0033554437\000", !40, !25, !15, !63} ; [ DW_TAG_arg_variable ] [value] [line 5]<br>
-!67 = !{i32 5, i32 0, !40, !63}<br>
-!68 = !{i32 5, i32 0, !62, !63}<br>
-!69 = !{i32 20, i32 0, !70, null}<br>
+!67 = !MDLocation(line: 5, scope: !40, inlinedAt: !63)<br>
+!68 = !MDLocation(line: 5, scope: !62, inlinedAt: !63)<br>
+!69 = !MDLocation(line: 20, scope: !70)<br>
!70 = !{!"0xb\0020\000\000", !1, !24} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp]<br>
!71 = !{!"0x101\00this\0016777216\001088", !35, null, !38, !72} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!72 = !{i32 21, i32 0, !70, null}<br>
-!73 = !{i32 0, i32 0, !35, !72}<br>
+!72 = !MDLocation(line: 21, scope: !70)<br>
+!73 = !MDLocation(line: 0, scope: !35, inlinedAt: !72)<br>
!74 = !{i8* getelementptr inbounds ([2 x i8]* @.str1, i64 0, i64 0)}<br>
!75 = !{!"0x101\00value\0033554438\000", !35, !25, !15, !72} ; [ DW_TAG_arg_variable ] [value] [line 6]<br>
-!76 = !{i32 6, i32 0, !35, !72}<br>
+!76 = !MDLocation(line: 6, scope: !35, inlinedAt: !72)<br>
!77 = !{!"0x101\00this\0016777216\001088", !35, null, !38, !78} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!78 = !{i32 23, i32 0, !70, null}<br>
-!79 = !{i32 0, i32 0, !35, !78}<br>
+!78 = !MDLocation(line: 23, scope: !70)<br>
+!79 = !MDLocation(line: 0, scope: !35, inlinedAt: !78)<br>
!80 = !{i8* getelementptr inbounds ([2 x i8]* @.str2, i64 0, i64 0)}<br>
!81 = !{!"0x101\00value\0033554438\000", !35, !25, !15, !78} ; [ DW_TAG_arg_variable ] [value] [line 6]<br>
-!82 = !{i32 6, i32 0, !35, !78}<br>
+!82 = !MDLocation(line: 6, scope: !35, inlinedAt: !78)<br>
!83 = !{!"0x101\00this\0016777216\001088", !35, null, !38, !84} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!84 = !{i32 24, i32 0, !24, null}<br>
-!85 = !{i32 0, i32 0, !35, !84}<br>
+!84 = !MDLocation(line: 24, scope: !24)<br>
+!85 = !MDLocation(line: 0, scope: !35, inlinedAt: !84)<br>
!86 = !{!"0x101\00value\0033554438\000", !35, !25, !15, !84} ; [ DW_TAG_arg_variable ] [value] [line 6]<br>
-!87 = !{i32 6, i32 0, !35, !84}<br>
-!88 = !{i32 25, i32 0, !24, null}<br>
+!87 = !MDLocation(line: 6, scope: !35, inlinedAt: !84)<br>
+!88 = !MDLocation(line: 25, scope: !24)<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/misched-code-difference-with-debug.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/misched-code-difference-with-debug.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/misched-code-difference-with-debug.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/misched-code-difference-with-debug.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/misched-code-difference-with-debug.ll Wed Jan 14 16:27:36 2015<br>
@@ -86,5 +86,5 @@ declare void @llvm.dbg.value(metadata, i<br>
!21 = !{!"0x34\00argc\00argc\00\001\000\001", null, !14, !11, i8* @argc, null} ; [ DW_TAG_variable ] [argc] [line 1] [def]<br>
!22 = !{i32 2, !"Dwarf Version", i32 4}<br>
!23 = !{i32 2, !"Debug Info Version", i32 2}<br>
-!25 = !{i32 8, i32 3, !13, null}<br>
+!25 = !MDLocation(line: 8, column: 3, scope: !13)<br>
!29 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/stack-protector-dbginfo.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/stack-protector-dbginfo.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/stack-protector-dbginfo.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/stack-protector-dbginfo.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/stack-protector-dbginfo.ll Wed Jan 14 16:27:36 2015<br>
@@ -63,9 +63,9 @@ attributes #0 = { sspreq }<br>
!35 = !{!36, !37}<br>
!36 = !{!"0x101\00p1\0016777228\000", !24, !10, !29} ; [ DW_TAG_arg_variable ] [p1] [line 12]<br>
!37 = !{!"0x101\00p2\0033554444\000", !24, !10, !32} ; [ DW_TAG_arg_variable ] [p2] [line 12]<br>
-!38 = !{i32 33, i32 0, !9, null}<br>
-!39 = !{i32 12, i32 0, !24, !38}<br>
-!40 = !{i32 9, i32 0, !41, !59}<br>
+!38 = !MDLocation(line: 33, scope: !9)<br>
+!39 = !MDLocation(line: 12, scope: !24, inlinedAt: !38)<br>
+!40 = !MDLocation(line: 9, scope: !41, inlinedAt: !59)<br>
!41 = !{!"0x2e\00min<unsigned long long, __1::A>\00min<unsigned long long, __1::A>\00_ZN3__13minIyNS_1AEEERKT_S4_RS2_T0_\007\000\001\000\006\00256\001\008", !1, !25, !42, null, null, !53, null, !55} ; [ DW_TAG_subprogram ] [line 7] [def] [scope 8] [min<unsigned long long, __1::A>]<br>
!42 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !43, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!43 = !{!29, !29, !32, !44}<br>
@@ -84,7 +84,7 @@ attributes #0 = { sspreq }<br>
!56 = !{!"0x101\00p1\0016777223\000", !41, !10, !29} ; [ DW_TAG_arg_variable ] [p1] [line 7]<br>
!57 = !{!"0x101\00p2\0033554439\000", !41, !10, !32} ; [ DW_TAG_arg_variable ] [p2] [line 7]<br>
!58 = !{!"0x101\00p3\0050331656\000", !41, !10, !44} ; [ DW_TAG_arg_variable ] [p3] [line 8]<br>
-!59 = !{i32 13, i32 0, !24, !38}<br>
+!59 = !MDLocation(line: 13, scope: !24, inlinedAt: !38)<br>
!63 = !{i32 undef}<br>
!64 = !{!"0x101\00p1\0033554433\000", !65, !10, !50, !40} ; [ DW_TAG_arg_variable ] [p1] [line 1]<br>
!65 = !{!"0x2e\00operator()\00operator()\00_ZN3__11AclERKiS2_\001\000\001\000\006\00256\001\002", !1, !25, !47, null, null, null, !46, !66} ; [ DW_TAG_subprogram ] [line 1] [def] [scope 2] [operator()]<br>
@@ -93,5 +93,5 @@ attributes #0 = { sspreq }<br>
!68 = !{!"0xf\00\000\0064\0064\000\000", null, null, !44} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from A]<br>
!69 = !{!"0x101\00p1\0033554433\000", !65, !10, !50} ; [ DW_TAG_arg_variable ] [p1] [line 1]<br>
!70 = !{!"0x101\00\0050331650\000", !65, !10, !50} ; [ DW_TAG_arg_variable ] [line 2]<br>
-!71 = !{i32 1, i32 0, !65, !40}<br>
+!71 = !MDLocation(line: 1, scope: !65, inlinedAt: !40)<br>
!72 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/unknown-location.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/unknown-location.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/unknown-location.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/unknown-location.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/unknown-location.ll Wed Jan 14 16:27:36 2015<br>
@@ -29,7 +29,7 @@ entry:<br>
!5 = !{!6}<br>
!6 = !{!"0x24\00int\000\0032\0032\000\000\005", !10, !2} ; [ DW_TAG_base_type ]<br>
!7 = !{!"0xb\001\0030\000", !2, !1} ; [ DW_TAG_lexical_block ]<br>
-!8 = !{i32 4, i32 3, !7, null}<br>
+!8 = !MDLocation(line: 4, column: 3, scope: !7)<br>
!9 = !{!1}<br>
!10 = !{!"test.c", !"/dir"}<br>
!11 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/CodeGen/XCore/dwarf_debug.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/XCore/dwarf_debug.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/XCore/dwarf_debug.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/XCore/dwarf_debug.ll (original)<br>
+++ llvm/trunk/test/CodeGen/XCore/dwarf_debug.ll Wed Jan 14 16:27:36 2015<br>
@@ -35,5 +35,5 @@ declare void @llvm.dbg.declare(metadata,<br>
!9 = !{i32 2, !"Dwarf Version", i32 4}<br>
!10 = !{i32 2, !"Debug Info Version", i32 2}<br>
!11 = !{!"0x101\00a\0016777218\000", !4, !5, !8} ; [ DW_TAG_arg_variable ]<br>
-!12 = !{i32 2, i32 0, !4, null}<br>
+!12 = !MDLocation(line: 2, scope: !4)<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2009-11-05-DeadGlobalVariable.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2009-11-05-DeadGlobalVariable.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2009-11-05-DeadGlobalVariable.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2009-11-05-DeadGlobalVariable.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2009-11-05-DeadGlobalVariable.ll Wed Jan 14 16:27:36 2015<br>
@@ -20,7 +20,7 @@ entry:<br>
!9 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]<br>
!12 = !{!14}<br>
!14 = !{!"0x34\00bar\00bar\00\002\001\001", !5, !6, !9, null, null} ; [ DW_TAG_variable ]<br>
-!15 = !{i32 3, i32 3, !16, null}<br>
+!15 = !MDLocation(line: 3, column: 3, scope: !16)<br>
!16 = !{!"0xb\001\0011\000", !17, !5} ; [ DW_TAG_lexical_block ]<br>
!17 = !{!"fb.c", !"/private/tmp"}<br>
!18 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2009-11-10-CurrentFn.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2009-11-10-CurrentFn.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2009-11-10-CurrentFn.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2009-11-10-CurrentFn.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2009-11-10-CurrentFn.ll Wed Jan 14 16:27:36 2015<br>
@@ -23,9 +23,9 @@ declare void @llvm.dbg.value(metadata, i<br>
!9 = !{!11}<br>
!11 = !{!"0x101\00i\0016777219\000", !17, !5, !12} ; [ DW_TAG_arg_variable ]<br>
!12 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]<br>
-!13 = !{i32 3, i32 14, !5, null}<br>
-!14 = !{i32 4, i32 3, !15, null}<br>
+!13 = !MDLocation(line: 3, column: 14, scope: !5)<br>
+!14 = !MDLocation(line: 4, column: 3, scope: !15)<br>
!15 = !{!"0xb\003\0017\000", !17, !5} ; [ DW_TAG_lexical_block ]<br>
-!16 = !{i32 5, i32 1, !15, null}<br>
+!16 = !MDLocation(line: 5, column: 1, scope: !15)<br>
!17 = !{!"cf.c", !"/private/tmp"}<br>
!18 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-01-05-DbgScope.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-01-05-DbgScope.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-01-05-DbgScope.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-01-05-DbgScope.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-01-05-DbgScope.ll Wed Jan 14 16:27:36 2015<br>
@@ -11,14 +11,14 @@ entry:<br>
!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!3}<br>
!llvm.module.flags = !{!14}<br>
<br>
-!0 = !{i32 571, i32 3, !1, null}<br>
+!0 = !MDLocation(line: 571, column: 3, scope: !1)<br>
!1 = !{!"0xb\001\001\000", !11, !2}; [DW_TAG_lexical_block ]<br>
!2 = !{!"0x2e\00foo\00foo\00foo\00561\000\001\000\006\000\000\000", i32 0, !3, !4, null, null, null, null, null}; [DW_TAG_subprogram ]<br>
!3 = !{!"0x11\0012\00clang 1.1\001\00\000\00\000", !11, !12, !12, !13, null, null}; [DW_TAG_compile_unit ]<br>
!4 = !{!"0x15\00\000\000\000\000\000\000", null, !3, null, !5, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!5 = !{!6}<br>
!6 = !{!"0x24\00char\000\008\008\000\000\006", null, !3} ; [ DW_TAG_base_type ]<br>
-!10 = !{i32 588, i32 1, !2, null}<br>
+!10 = !MDLocation(line: 588, column: 1, scope: !2)<br>
!11 = !{!"hashtab.c", !"/usr/src/gnu/usr.bin/cc/cc_tools/../../../../contrib/gcclibs/libiberty"}<br>
!12 = !{i32 0}<br>
!13 = !{!2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-03-19-DbgDeclare.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-03-19-DbgDeclare.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-03-19-DbgDeclare.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-03-19-DbgDeclare.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-03-19-DbgDeclare.ll Wed Jan 14 16:27:36 2015<br>
@@ -11,7 +11,7 @@ entry:<br>
!llvm.module.flags = !{!5}<br>
!2 = !{!"0x11\0032769\00clang version 3.3 \000\00\000\00\001", !4, !3, !3, !3, !3, !3} ; [ DW_TAG_compile_unit ] [/usr/local/google/home/blaikie/dev/scratch/scratch.cpp] [lang 0x8001]<br>
!3 = !{}<br>
-!0 = !{i32 662302, i32 26, !1, null}<br>
+!0 = !MDLocation(line: 662302, column: 26, scope: !1)<br>
!1 = !{i32 4, !"foo"}<br>
!4 = !{!"scratch.cpp", !"/usr/local/google/home/blaikie/dev/scratch"}<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-03-24-MemberFn.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-03-24-MemberFn.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-03-24-MemberFn.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-03-24-MemberFn.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-03-24-MemberFn.ll Wed Jan 14 16:27:36 2015<br>
@@ -55,13 +55,13 @@ declare void @llvm.dbg.declare(metadata,<br>
!13 = !{!"0x15\00\000\000\000\000\000\000", !25, null, null, !14, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!14 = !{!8, !15}<br>
!15 = !{!"0xf\00\000\0064\0064\000\0064", !25, !4, !9} ; [ DW_TAG_pointer_type ]<br>
-!16 = !{i32 3, i32 0, !1, null}<br>
-!17 = !{i32 3, i32 0, !3, null}<br>
+!16 = !MDLocation(line: 3, scope: !1)<br>
+!17 = !MDLocation(line: 3, scope: !3)<br>
!18 = !{!"0x101\00this\003\000", !12, !10, !19} ; [ DW_TAG_arg_variable ]<br>
!19 = !{!"0x26\00\000\0064\0064\000\0064", !25, !4, !20} ; [ DW_TAG_const_type ]<br>
!20 = !{!"0xf\00\000\0064\0064\000\000", !25, !4, !9} ; [ DW_TAG_pointer_type ]<br>
-!21 = !{i32 3, i32 0, !12, null}<br>
-!22 = !{i32 3, i32 0, !23, null}<br>
+!21 = !MDLocation(line: 3, scope: !12)<br>
+!22 = !MDLocation(line: 3, scope: !23)<br>
!23 = !{!"0xb\003\000\000", !26, !12} ; [ DW_TAG_lexical_block ]<br>
!24 = !{!3, !12}<br>
!25 = !{!"one.cc", !"/tmp/"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll Wed Jan 14 16:27:36 2015<br>
@@ -84,11 +84,11 @@ entry:<br>
!11 = !{!"0x15\00\000\000\000\000\000\000", !38, !3, null, !12, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!12 = !{!7, !13}<br>
!13 = !{!"0xf\00\000\0064\0064\000\0064", !38, !3, !8} ; [ DW_TAG_pointer_type ]<br>
-!14 = !{i32 16, i32 5, !1, null}<br>
-!15 = !{i32 17, i32 3, !1, null}<br>
-!16 = !{i32 18, i32 1, !2, null}<br>
+!14 = !MDLocation(line: 16, column: 5, scope: !1)<br>
+!15 = !MDLocation(line: 17, column: 3, scope: !1)<br>
+!16 = !MDLocation(line: 18, column: 1, scope: !2)<br>
!17 = !{!"0x101\00this\004\000", !10, !3, !13} ; [ DW_TAG_arg_variable ]<br>
-!18 = !{i32 4, i32 7, !10, null}<br>
+!18 = !MDLocation(line: 4, column: 7, scope: !10)<br>
!19 = !{!"0x100\00a\009\000", !20, !3, !21} ; [ DW_TAG_auto_variable ]<br>
!20 = !{!"0xb\004\0012\000", !38, !10} ; [ DW_TAG_lexical_block ]<br>
!21 = !{!"0x2\00A\005\008\008\000\000\000", !38, !10, null, !22, null, null, null} ; [ DW_TAG_class_type ] [A] [line 5, size 8, align 8, offset 0] [def] [from ]<br>
@@ -97,15 +97,15 @@ entry:<br>
!24 = !{!"0x15\00\000\000\000\000\000\000", !38, !3, null, !25, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!25 = !{!7, !26}<br>
!26 = !{!"0xf\00\000\0064\0064\000\0064", !38, !3, !21} ; [ DW_TAG_pointer_type ]<br>
-!27 = !{i32 9, i32 7, !20, null}<br>
+!27 = !MDLocation(line: 9, column: 7, scope: !20)<br>
!28 = !{!"0x100\00i\0010\000", !20, !3, !7} ; [ DW_TAG_auto_variable ]<br>
-!29 = !{i32 10, i32 9, !20, null}<br>
-!30 = !{i32 10, i32 5, !20, null}<br>
-!31 = !{i32 11, i32 5, !20, null}<br>
-!32 = !{i32 12, i32 3, !10, null}<br>
+!29 = !MDLocation(line: 10, column: 9, scope: !20)<br>
+!30 = !MDLocation(line: 10, column: 5, scope: !20)<br>
+!31 = !MDLocation(line: 11, column: 5, scope: !20)<br>
+!32 = !MDLocation(line: 12, column: 3, scope: !10)<br>
!33 = !{!"0x101\00this\007\000", !23, !3, !26} ; [ DW_TAG_arg_variable ]<br>
-!34 = !{i32 7, i32 11, !23, null}<br>
-!35 = !{i32 7, i32 19, !36, null}<br>
+!34 = !MDLocation(line: 7, column: 11, scope: !23)<br>
+!35 = !MDLocation(line: 7, column: 19, scope: !36)<br>
!36 = !{!"0xb\007\0017\000", !38, !23} ; [ DW_TAG_lexical_block ]<br>
!38 = !{!"one.cc", !"/tmp" }<br>
!39 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-04-19-FramePtr.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-04-19-FramePtr.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-04-19-FramePtr.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-04-19-FramePtr.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-04-19-FramePtr.ll Wed Jan 14 16:27:36 2015<br>
@@ -23,14 +23,14 @@ return:<br>
!llvm.module.flags = !{!12}<br>
!9 = !{!1}<br>
<br>
-!0 = !{i32 2, i32 0, !1, null}<br>
+!0 = !MDLocation(line: 2, scope: !1)<br>
!1 = !{!"0x2e\00foo\00foo\00foo\002\000\001\000\006\000\000\002", !10, null, !4, null, i32 ()* @foo, null, null, null} ; [ DW_TAG_subprogram ]<br>
!2 = !{!"0x29", !10} ; [ DW_TAG_file_type ]<br>
!3 = !{!"0x11\001\004.2.1 (Based on Apple Inc. build 5658) (LLVM build)\000\00\000\00\000", !10, !11, !11, !9, null, null} ; [ DW_TAG_compile_unit ]<br>
!4 = !{!"0x15\00\000\000\000\000\000\000", !10, !2, null, !5, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!5 = !{!6}<br>
!6 = !{!"0x24\00int\000\0032\0032\000\000\005", !10, !2} ; [ DW_TAG_base_type ]<br>
-!7 = !{i32 2, i32 0, !8, null}<br>
+!7 = !MDLocation(line: 2, scope: !8)<br>
!8 = !{!"0xb\002\000\000", !10, !1} ; [ DW_TAG_lexical_block ]<br>
!10 = !{!"a.c", !"/tmp"}<br>
!11 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-05-03-DisableFramePtr.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-05-03-DisableFramePtr.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-05-03-DisableFramePtr.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-05-03-DisableFramePtr.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-05-03-DisableFramePtr.ll Wed Jan 14 16:27:36 2015<br>
@@ -31,8 +31,8 @@ declare void @llvm.dbg.declare(metadata,<br>
!10 = !{!"0xf\00\000\0064\0064\000\000", !16, !2, !11} ; [ DW_TAG_pointer_type ]<br>
!11 = !{!"0x16\00AppleEvent\004\000\000\000\000", !16, !2, !12} ; [ DW_TAG_typedef ]<br>
!12 = !{!"0x13\00AEDesc\001\000\000\000\004\000", !16, !2, null, null, null, null, null} ; [ DW_TAG_structure_type ] [AEDesc] [line 1, size 0, align 0, offset 0] [decl] [from ]<br>
-!13 = !{i32 7, i32 0, !1, null}<br>
-!14 = !{i32 8, i32 0, !15, null}<br>
+!13 = !MDLocation(line: 7, scope: !1)<br>
+!14 = !MDLocation(line: 8, scope: !15)<br>
!15 = !{!"0xb\007\000\000", !16, !1} ; [ DW_TAG_lexical_block ]<br>
!16 = !{!"t.c", !"/Users/echeng/LLVM/radars/r7937664/"}<br>
!17 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-05-03-OriginDIE.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-05-03-OriginDIE.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-05-03-OriginDIE.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-05-03-OriginDIE.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-05-03-OriginDIE.ll Wed Jan 14 16:27:36 2015<br>
@@ -50,21 +50,21 @@ declare void @uuid_LtoB(i8*, i8*)<br>
<br>
!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!4}<br>
!llvm.module.flags = !{!41}<br>
-!0 = !{i32 808, i32 0, !1, null}<br>
+!0 = !MDLocation(line: 808, scope: !1)<br>
!1 = !{!"0xb\00807\000\000", !39, !2} ; [ DW_TAG_lexical_block ]<br>
!2 = !{!"0x2e\00gpt2gpm\00gpt2gpm\00gpt2gpm\00807\001\001\000\006\000\000\000", !39, null, !5, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!3 = !{!"0x29", !39} ; [ DW_TAG_file_type ]<br>
!4 = !{!"0x11\001\00llvm-gcc\001\00\000\00\000", !39, !18, !18, !40, null, null} ; [ DW_TAG_compile_unit ]<br>
!5 = !{!"0x15\00\000\000\000\000\000\000", !39, !3, null, !6, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!6 = !{null}<br>
-!7 = !{i32 810, i32 0, !1, null}<br>
+!7 = !MDLocation(line: 810, scope: !1)<br>
!8 = !{!"0x101\00data\00201\000", !9, !10, !11} ; [ DW_TAG_arg_variable ]<br>
!9 = !{!"0x2e\00_OSSwapInt64\00_OSSwapInt64\00_OSSwapInt64\00202\001\001\000\006\000\000\000", !10, null, !5, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!10 = !{!"0x29", !"OSByteOrder.h", !"/usr/include/libkern/ppc", !4} ; [ DW_TAG_file_type ]<br>
!11 = !{!"0x16\00uint64_t\0059\000\000\000\000", !36, !3, !13} ; [ DW_TAG_typedef ]<br>
!12 = !{!"0x29", !"stdint.h", !"/usr/4.2.1/include", !4} ; [ DW_TAG_file_type ]<br>
!13 = !{!"0x24\00long long unsigned int\000\0064\0064\000\000\007", !39, !3} ; [ DW_TAG_base_type ]<br>
-!14 = !{i32 202, i32 0, !9, !7}<br>
+!14 = !MDLocation(line: 202, scope: !9, inlinedAt: !7)<br>
!15 = !{!"0x101\00base\0092\000", !16, !10, !17} ; [ DW_TAG_arg_variable ]<br>
!16 = !{!"0x2e\00OSReadSwapInt64\00OSReadSwapInt64\00OSReadSwapInt64\0095\001\001\000\006\000\000\000", !38, null, !5, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!17 = !{!"0xf\00\000\0032\0032\000\000", !39, !3, null} ; [ DW_TAG_pointer_type ]<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-05-10-MultipleCU.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-05-10-MultipleCU.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-05-10-MultipleCU.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-05-10-MultipleCU.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-05-10-MultipleCU.ll Wed Jan 14 16:27:36 2015<br>
@@ -22,7 +22,7 @@ return:<br>
!16 = !{!2}<br>
!17 = !{!10}<br>
<br>
-!0 = !{i32 3, i32 0, !1, null}<br>
+!0 = !MDLocation(line: 3, scope: !1)<br>
!1 = !{!"0xb\002\000\000", !18, !2} ; [ DW_TAG_lexical_block ]<br>
!2 = !{!"0x2e\00foo\00foo\00foo\002\000\001\000\006\000\000\000", !18, !3, !5, null, i32 ()* @foo, null, null, null} ; [ DW_TAG_subprogram ]<br>
!3 = !{!"0x29", !18} ; [ DW_TAG_file_type ]<br>
@@ -30,7 +30,7 @@ return:<br>
!5 = !{!"0x15\00\000\000\000\000\000\000", !18, !3, null, !6, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!6 = !{!7}<br>
!7 = !{!"0x24\00int\000\0032\0032\000\000\005", !18, !3} ; [ DW_TAG_base_type ]<br>
-!8 = !{i32 3, i32 0, !9, null}<br>
+!8 = !MDLocation(line: 3, scope: !9)<br>
!9 = !{!"0xb\002\000\000", !20, !10} ; [ DW_TAG_lexical_block ]<br>
!10 = !{!"0x2e\00bar\00bar\00bar\002\000\001\000\006\000\000\000", !20, !11, !13, null, i32 ()* @bar, null, null, null} ; [ DW_TAG_subprogram ]<br>
!11 = !{!"0x29", !20} ; [ DW_TAG_file_type ]<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll Wed Jan 14 16:27:36 2015<br>
@@ -41,13 +41,13 @@ entry:<br>
!14 = !{!"0xd\00a\0010\0032\0032\000\000", !27, !12, !5} ; [ DW_TAG_member ]<br>
!15 = !{!"0xd\00b\0010\0032\0032\0032\000", !27, !12, !5} ; [ DW_TAG_member ]<br>
!16 = !{!"0x34\00i\00i\00\005\000\001", !1, !1, !5, i32* @i, null} ; [ DW_TAG_variable ]<br>
-!17 = !{i32 15, i32 0, !18, null}<br>
+!17 = !MDLocation(line: 15, scope: !18)<br>
!18 = !{!"0xb\0014\000\001", !1, !6} ; [ DW_TAG_lexical_block ]<br>
-!19 = !{i32 9, i32 0, !0, !17}<br>
+!19 = !MDLocation(line: 9, scope: !0, inlinedAt: !17)<br>
!20 = !{}<br>
-!21 = !{i32 9, i32 0, !11, !17}<br>
-!22 = !{i32 11, i32 0, !11, !17}<br>
-!23 = !{i32 16, i32 0, !18, null}<br>
+!21 = !MDLocation(line: 9, scope: !11, inlinedAt: !17)<br>
+!22 = !MDLocation(line: 11, scope: !11, inlinedAt: !17)<br>
+!23 = !MDLocation(line: 16, scope: !18)<br>
!24 = !{!9, !10}<br>
!25 = !{!0, !6}<br>
!26 = !{!16}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-07-19-Crash.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-07-19-Crash.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-07-19-Crash.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-07-19-Crash.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-07-19-Crash.ll Wed Jan 14 16:27:36 2015<br>
@@ -21,7 +21,7 @@ entry:<br>
!6 = !{!"0x2e\00foo\00foo\00foo\007\001\001\000\006\000\001\000", !12, !1, !3, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!7 = !{!"0x100\00one\008\000", !8, !1, !5} ; [ DW_TAG_auto_variable ]<br>
!8 = !{!"0xb\007\0018\000", !12, !6} ; [ DW_TAG_lexical_block ]<br>
-!9 = !{i32 4, i32 3, !10, null}<br>
+!9 = !MDLocation(line: 4, column: 3, scope: !10)<br>
!10 = !{!"0xb\003\0011\000", !12, !0} ; [ DW_TAG_lexical_block ]<br>
!11 = !{!"0x2e\00foo\00foo\00foo\007\001\000\000\006\000\001\000", !12, !1, !3, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!12 = !{!"one.c", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/2010-10-01-crash.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-10-01-crash.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-10-01-crash.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/2010-10-01-crash.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/2010-10-01-crash.ll Wed Jan 14 16:27:36 2015<br>
@@ -20,7 +20,7 @@ declare void @llvm.memcpy.p0i8.p0i8.i32(<br>
!2 = !{!"0x11\0016\00clang version 2.9 (trunk 115292)\001\00\001\00\000", !25, !26, !26, null, null, null} ; [ DW_TAG_compile_unit ]<br>
!5 = !{!"0x16\00CGRect\0049\000\000\000\000", !25, null, null} ; [ DW_TAG_typedef ]<br>
!23 = !{!"0x101\00rect\0053\000", !0, !1, !5} ; [ DW_TAG_arg_variable ]<br>
-!24 = !{i32 53, i32 33, !0, null}<br>
+!24 = !MDLocation(line: 53, column: 33, scope: !0)<br>
!25 = !{!"GSFusedSilica.m", !"/Volumes/Data/Users/sabre/Desktop"}<br>
!26 = !{i32 0}<br>
!27 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/AArch64/cfi-eof-prologue.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/cfi-eof-prologue.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/cfi-eof-prologue.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/AArch64/cfi-eof-prologue.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/AArch64/cfi-eof-prologue.ll Wed Jan 14 16:27:36 2015<br>
@@ -100,13 +100,13 @@ attributes #3 = { nounwind }<br>
!36 = !{i32 2, !"Debug Info Version", i32 2}<br>
!37 = !{!"clang version 3.6.0 (trunk 224279) (llvm/trunk 224283)"}<br>
!38 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!39 = !{i32 0, i32 0, !28, null}<br>
-!40 = !{i32 9, i32 0, !28, null}<br>
+!39 = !MDLocation(line: 0, scope: !28)<br>
+!40 = !MDLocation(line: 9, scope: !28)<br>
!41 = !{!42, !42, i64 0}<br>
!42 = !{!"vtable pointer", !43, i64 0}<br>
!43 = !{!"Simple C/C++ TBAA"}<br>
-!44 = !{i32 0, i32 0, !32, null}<br>
+!44 = !MDLocation(line: 0, scope: !32)<br>
!45 = !{!"0x101\00this\0016777216\001088", !28, null, !31, !46} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!46 = !{i32 9, i32 0, !32, null}<br>
-!47 = !{i32 0, i32 0, !28, !46}<br>
-!48 = !{i32 9, i32 0, !28, !46}<br>
+!46 = !MDLocation(line: 9, scope: !32)<br>
+!47 = !MDLocation(line: 0, scope: !28, inlinedAt: !46)<br>
+!48 = !MDLocation(line: 9, scope: !28, inlinedAt: !46)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/AArch64/coalescing.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/coalescing.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/coalescing.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/AArch64/coalescing.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/AArch64/coalescing.ll Wed Jan 14 16:27:36 2015<br>
@@ -59,7 +59,7 @@ attributes #3 = { nounwind optsize }<br>
!12 = !{i32 2, !"Dwarf Version", i32 2}<br>
!13 = !{i32 2, !"Debug Info Version", i32 2}<br>
!14 = !{!"clang version 3.6.0 (trunk 223149) (llvm/trunk 223115)"}<br>
-!15 = !{i32 5, i32 3, !4, null}<br>
+!15 = !MDLocation(line: 5, column: 3, scope: !4)<br>
!16 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!17 = !{i32 4, i32 12, !4, null}<br>
-!18 = !{i32 8, i32 1, !4, null}<br>
+!17 = !MDLocation(line: 4, column: 12, scope: !4)<br>
+!18 = !MDLocation(line: 8, column: 1, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/AArch64/dwarfdump.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/dwarfdump.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/dwarfdump.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/AArch64/dwarfdump.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/AArch64/dwarfdump.ll Wed Jan 14 16:27:36 2015<br>
@@ -35,6 +35,6 @@ attributes #0 = { nounwind }<br>
!5 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !6, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!6 = !{!7}<br>
!7 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
-!8 = !{i32 2, i32 0, !3, null}<br>
+!8 = !MDLocation(line: 2, scope: !3)<br>
!9 = !{!"tmp.c", !"/home/tim/llvm/build"}<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/AArch64/struct_by_value.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/struct_by_value.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/struct_by_value.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/AArch64/struct_by_value.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/AArch64/struct_by_value.ll Wed Jan 14 16:27:36 2015<br>
@@ -65,6 +65,6 @@ attributes #1 = { nounwind readnone }<br>
!15 = !{!"0xd\00e\007\0032\0032\00128\000", !1, !9, !8} ; [ DW_TAG_member ] [e] [line 7, size 32, align 32, offset 128] [from int]<br>
!16 = !{i32 2, !"Dwarf Version", i32 2}<br>
!17 = !{!"0x101\00f\0016777229\008192", !4, !5, !9} ; [ DW_TAG_arg_variable ] [f] [line 13]<br>
-!18 = !{i32 13, i32 0, !4, null}<br>
-!19 = !{i32 16, i32 0, !4, null}<br>
+!18 = !MDLocation(line: 13, scope: !4)<br>
+!19 = !MDLocation(line: 16, scope: !4)<br>
!20 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/ARM/PR16736.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/PR16736.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/PR16736.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/ARM/PR16736.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/ARM/PR16736.ll Wed Jan 14 16:27:36 2015<br>
@@ -59,7 +59,7 @@ attributes #3 = { nounwind }<br>
!15 = !{!"0x101\00\0067108867\000", !4, !6, !9} ; [ DW_TAG_arg_variable ] [line 3]<br>
!16 = !{!"0x101\00x\0083886083\000", !4, !6, !10} ; [ DW_TAG_arg_variable ] [x] [line 3]<br>
!17 = !{i32 2, !"Dwarf Version", i32 4}<br>
-!18 = !{i32 3, i32 0, !4, null}<br>
-!19 = !{i32 4, i32 0, !4, null}<br>
-!20 = !{i32 5, i32 0, !4, null}<br>
+!18 = !MDLocation(line: 3, scope: !4)<br>
+!19 = !MDLocation(line: 4, scope: !4)<br>
+!20 = !MDLocation(line: 5, scope: !4)<br>
!21 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/ARM/cfi-eof-prologue.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/cfi-eof-prologue.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/cfi-eof-prologue.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/ARM/cfi-eof-prologue.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/ARM/cfi-eof-prologue.ll Wed Jan 14 16:27:36 2015<br>
@@ -103,13 +103,13 @@ attributes #3 = { nounwind }<br>
!38 = !{i32 1, !"min_enum_size", i32 4}<br>
!39 = !{!"clang version 3.6.0 (trunk 224279) (llvm/trunk 224283)"}<br>
!40 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!41 = !{i32 0, i32 0, !28, null}<br>
-!42 = !{i32 9, i32 0, !28, null}<br>
+!41 = !MDLocation(line: 0, scope: !28)<br>
+!42 = !MDLocation(line: 9, scope: !28)<br>
!43 = !{!44, !44, i64 0}<br>
!44 = !{!"vtable pointer", !45, i64 0}<br>
!45 = !{!"Simple C/C++ TBAA"}<br>
-!46 = !{i32 0, i32 0, !32, null}<br>
+!46 = !MDLocation(line: 0, scope: !32)<br>
!47 = !{!"0x101\00this\0016777216\001088", !28, null, !31, !48} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!48 = !{i32 9, i32 0, !32, null}<br>
-!49 = !{i32 0, i32 0, !28, !48}<br>
-!50 = !{i32 9, i32 0, !28, !48}<br>
+!48 = !MDLocation(line: 9, scope: !32)<br>
+!49 = !MDLocation(line: 0, scope: !28, inlinedAt: !48)<br>
+!50 = !MDLocation(line: 9, scope: !28, inlinedAt: !48)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll Wed Jan 14 16:27:36 2015<br>
@@ -89,15 +89,15 @@ attributes #1 = { nounwind readnone }<br>
!19 = !{!"0xb\006\000\000", !5, !4} ; [ DW_TAG_lexical_block ] [/Volumes/Data/radar/15464571/test.c]<br>
!20 = !{i32 2, !"Dwarf Version", i32 2}<br>
!21 = !{!"clang version 3.4 "}<br>
-!22 = !{i32 1, i32 0, !4, null}<br>
-!23 = !{i32 3, i32 0, !4, null}<br>
-!24 = !{i32 4, i32 0, !4, null}<br>
-!25 = !{i32 5, i32 0, !4, null}<br>
+!22 = !MDLocation(line: 1, scope: !4)<br>
+!23 = !MDLocation(line: 3, scope: !4)<br>
+!24 = !MDLocation(line: 4, scope: !4)<br>
+!25 = !MDLocation(line: 5, scope: !4)<br>
!26 = !{!27, !27, i64 0}<br>
!27 = !{!"float", !28, i64 0}<br>
!28 = !{!"omnipotent char", !29, i64 0}<br>
!29 = !{!"Simple C/C++ TBAA"}<br>
-!30 = !{i32 6, i32 0, !19, null}<br>
-!31 = !{i32 7, i32 0, !19, null}<br>
-!32 = !{i32 8, i32 0, !4, null}<br>
+!30 = !MDLocation(line: 6, scope: !19)<br>
+!31 = !MDLocation(line: 7, scope: !19)<br>
+!32 = !MDLocation(line: 8, scope: !4)<br>
!33 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/ARM/s-super-register.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/s-super-register.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/s-super-register.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/ARM/s-super-register.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/ARM/s-super-register.ll Wed Jan 14 16:27:36 2015<br>
@@ -51,11 +51,11 @@ declare void @llvm.dbg.value(metadata, i<br>
!8 = !{!"0x100\00y\008\000", !9, !2, !7} ; [ DW_TAG_auto_variable ]<br>
!9 = !{!"0xb\007\0025\002", !18, !10} ; [ DW_TAG_lexical_block ]<br>
!10 = !{!"0xb\007\003\001", !18, !6} ; [ DW_TAG_lexical_block ]<br>
-!11 = !{i32 6, i32 18, !6, null}<br>
-!12 = !{i32 7, i32 3, !6, null}<br>
-!13 = !{i32 8, i32 20, !9, null}<br>
-!14 = !{i32 7, i32 20, !10, null}<br>
-!15 = !{i32 10, i32 1, !6, null}<br>
+!11 = !MDLocation(line: 6, column: 18, scope: !6)<br>
+!12 = !MDLocation(line: 7, column: 3, scope: !6)<br>
+!13 = !MDLocation(line: 8, column: 20, scope: !9)<br>
+!14 = !MDLocation(line: 7, column: 20, scope: !10)<br>
+!15 = !MDLocation(line: 10, column: 1, scope: !6)<br>
!16 = !{!1}<br>
!17 = !{!5, !8}<br>
!18 = !{!"k.cc", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/COFF/asan-module-ctor.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/asan-module-ctor.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/asan-module-ctor.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/COFF/asan-module-ctor.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/COFF/asan-module-ctor.ll Wed Jan 14 16:27:36 2015<br>
@@ -91,4 +91,4 @@ attributes #0 = { nounwind sanitize_addr<br>
!7 = !{i32 2, !"Dwarf Version", i32 4}<br>
!8 = !{i32 1, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.5.0 "}<br>
-!10 = !{i32 2, i32 0, !4, null}<br>
+!10 = !MDLocation(line: 2, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/COFF/asm.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/asm.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/asm.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/COFF/asm.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/COFF/asm.ll Wed Jan 14 16:27:36 2015<br>
@@ -251,6 +251,6 @@ attributes #2 = { nounwind }<br>
!9 = !{i32 2, !"Dwarf Version", i32 4}<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5 "}<br>
-!12 = !{i32 4, i32 0, !4, null}<br>
-!13 = !{i32 5, i32 0, !4, null}<br>
-!14 = !{i32 6, i32 0, !4, null}<br>
+!12 = !MDLocation(line: 4, scope: !4)<br>
+!13 = !MDLocation(line: 5, scope: !4)<br>
+!14 = !MDLocation(line: 6, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/COFF/cpp-mangling.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/cpp-mangling.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/cpp-mangling.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/COFF/cpp-mangling.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/COFF/cpp-mangling.ll Wed Jan 14 16:27:36 2015<br>
@@ -40,4 +40,4 @@ attributes #0 = { nounwind "less-precise<br>
!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
!9 = !{i32 2, !"Debug Info Version", i32 2}<br>
!10 = !{!"clang version 3.6.0 "}<br>
-!11 = !{i32 3, i32 0, !4, null}<br>
+!11 = !MDLocation(line: 3, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/COFF/multifile.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/multifile.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/multifile.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/COFF/multifile.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/COFF/multifile.ll Wed Jan 14 16:27:36 2015<br>
@@ -319,11 +319,11 @@ attributes #1 = { "less-precise-fpmad"="<br>
!9 = !{i32 2, !"Dwarf Version", i32 4}<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5 "}<br>
-!12 = !{i32 1, i32 0, !13, null}<br>
+!12 = !MDLocation(line: 1, scope: !13)<br>
!13 = !{!"0xb\000", !14, !4} ; [ DW_TAG_lexical_block ] [D:\/one.c]<br>
!14 = !{!"one.c", !"D:\5C"}<br>
-!15 = !{i32 2, i32 0, !16, null}<br>
+!15 = !MDLocation(line: 2, scope: !16)<br>
!16 = !{!"0xb\000", !17, !4} ; [ DW_TAG_lexical_block ] [D:\/two.c]<br>
!17 = !{!"two.c", !"D:\5C"}<br>
-!18 = !{i32 7, i32 0, !13, null}<br>
-!19 = !{i32 8, i32 0, !13, null}<br>
+!18 = !MDLocation(line: 7, scope: !13)<br>
+!19 = !MDLocation(line: 8, scope: !13)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/COFF/multifunction.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/multifunction.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/multifunction.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/COFF/multifunction.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/COFF/multifunction.ll Wed Jan 14 16:27:36 2015<br>
@@ -596,11 +596,11 @@ attributes #1 = { "less-precise-fpmad"="<br>
!11 = !{i32 2, !"Dwarf Version", i32 4}<br>
!12 = !{i32 1, !"Debug Info Version", i32 2}<br>
!13 = !{!"clang version 3.5 "}<br>
-!14 = !{i32 4, i32 0, !4, null}<br>
-!15 = !{i32 5, i32 0, !4, null}<br>
-!16 = !{i32 8, i32 0, !9, null}<br>
-!17 = !{i32 9, i32 0, !9, null}<br>
-!18 = !{i32 12, i32 0, !10, null}<br>
-!19 = !{i32 13, i32 0, !10, null}<br>
-!20 = !{i32 14, i32 0, !10, null}<br>
-!21 = !{i32 15, i32 0, !10, null}<br>
+!14 = !MDLocation(line: 4, scope: !4)<br>
+!15 = !MDLocation(line: 5, scope: !4)<br>
+!16 = !MDLocation(line: 8, scope: !9)<br>
+!17 = !MDLocation(line: 9, scope: !9)<br>
+!18 = !MDLocation(line: 12, scope: !10)<br>
+!19 = !MDLocation(line: 13, scope: !10)<br>
+!20 = !MDLocation(line: 14, scope: !10)<br>
+!21 = !MDLocation(line: 15, scope: !10)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/COFF/simple.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/simple.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/simple.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/COFF/simple.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/COFF/simple.ll Wed Jan 14 16:27:36 2015<br>
@@ -235,5 +235,5 @@ attributes #1 = { "less-precise-fpmad"="<br>
!9 = !{i32 2, !"Dwarf Version", i32 4}<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5 "}<br>
-!12 = !{i32 4, i32 0, !4, null}<br>
-!13 = !{i32 5, i32 0, !4, null}<br>
+!12 = !MDLocation(line: 4, scope: !4)<br>
+!13 = !MDLocation(line: 5, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/COFF/tail-call-without-lexical-scopes.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/tail-call-without-lexical-scopes.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/tail-call-without-lexical-scopes.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/COFF/tail-call-without-lexical-scopes.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/COFF/tail-call-without-lexical-scopes.ll Wed Jan 14 16:27:36 2015<br>
@@ -72,7 +72,7 @@ attributes #2 = { nounwind }<br>
!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
!9 = !{i32 1, !"Debug Info Version", i32 2}<br>
!10 = !{!"clang version 3.5.0 "}<br>
-!11 = !{i32 8, i32 0, !4, null}<br>
-!12 = !{i32 9, i32 0, !4, null}<br>
-!13 = !{i32 4, i32 0, !7, null}<br>
-!14 = !{i32 5, i32 0, !7, null}<br>
+!11 = !MDLocation(line: 8, scope: !4)<br>
+!12 = !MDLocation(line: 9, scope: !4)<br>
+!13 = !MDLocation(line: 4, scope: !7)<br>
+!14 = !MDLocation(line: 5, scope: !7)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/Inputs/gmlt.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/gmlt.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/gmlt.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/Inputs/gmlt.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/Inputs/gmlt.ll Wed Jan 14 16:27:36 2015<br>
@@ -144,10 +144,10 @@ attributes #2 = { nounwind }<br>
!10 = !{i32 2, !"Dwarf Version", i32 4}<br>
!11 = !{i32 2, !"Debug Info Version", i32 2}<br>
!12 = !{!"clang version 3.6.0 "}<br>
-!13 = !{i32 1, i32 12, !4, null}<br>
-!14 = !{i32 2, i32 53, !7, null}<br>
-!15 = !{i32 3, i32 44, !8, null}<br>
-!16 = !{i32 3, i32 50, !8, null}<br>
-!17 = !{i32 3, i32 44, !8, !18}<br>
-!18 = !{i32 4, i32 13, !9, null}<br>
-!19 = !{i32 4, i32 19, !9, null}<br>
+!13 = !MDLocation(line: 1, column: 12, scope: !4)<br>
+!14 = !MDLocation(line: 2, column: 53, scope: !7)<br>
+!15 = !MDLocation(line: 3, column: 44, scope: !8)<br>
+!16 = !MDLocation(line: 3, column: 50, scope: !8)<br>
+!17 = !MDLocation(line: 3, column: 44, scope: !8, inlinedAt: !18)<br>
+!18 = !MDLocation(line: 4, column: 13, scope: !9)<br>
+!19 = !MDLocation(line: 4, column: 19, scope: !9)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/Mips/delay-slot.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Mips/delay-slot.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Mips/delay-slot.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/Mips/delay-slot.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/Mips/delay-slot.ll Wed Jan 14 16:27:36 2015<br>
@@ -67,9 +67,9 @@ attributes #1 = { nounwind readnone }<br>
!10 = !{i32 2, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5.0"}<br>
!12 = !{!"0x101\00x\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [x] [line 1]<br>
-!13 = !{i32 1, i32 0, !4, null}<br>
-!14 = !{i32 2, i32 0, !15, null}<br>
+!13 = !MDLocation(line: 1, scope: !4)<br>
+!14 = !MDLocation(line: 2, scope: !15)<br>
!15 = !{!"0xb\002\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/tmp/test.c]<br>
-!16 = !{i32 3, i32 0, !15, null}<br>
-!17 = !{i32 4, i32 0, !4, null}<br>
-!18 = !{i32 5, i32 0, !4, null}<br>
+!16 = !MDLocation(line: 3, scope: !15)<br>
+!17 = !MDLocation(line: 4, scope: !4)<br>
+!18 = !MDLocation(line: 5, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/PR20038.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PR20038.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PR20038.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/PR20038.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/PR20038.ll Wed Jan 14 16:27:36 2015<br>
@@ -141,24 +141,24 @@ attributes #2 = { nounwind readnone }<br>
!18 = !{i32 2, !"Dwarf Version", i32 4}<br>
!19 = !{i32 2, !"Debug Info Version", i32 2}<br>
!20 = !{!"clang version 3.5.0 "}<br>
-!21 = !{i32 6, i32 0, !17, !22}<br>
-!22 = !{i32 5, i32 0, !23, null}<br>
+!21 = !MDLocation(line: 6, scope: !17, inlinedAt: !22)<br>
+!22 = !MDLocation(line: 5, scope: !23)<br>
!23 = !{!"0xb\005\000\003", !5, !12} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/PR20038.cpp]<br>
-!24 = !{i32 5, i32 0, !12, null}<br>
-!25 = !{i32 5, i32 0, !26, null}<br>
+!24 = !MDLocation(line: 5, scope: !12)<br>
+!25 = !MDLocation(line: 5, scope: !26)<br>
!26 = !{!"0xb\005\000\001", !5, !12} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/PR20038.cpp]<br>
-!27 = !{i32 5, i32 0, !28, null}<br>
+!27 = !MDLocation(line: 5, scope: !28)<br>
!28 = !{!"0xb\005\000\002", !5, !12} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/PR20038.cpp]<br>
!29 = !{!"0x101\00this\0016777216\001088", !17, null, !30} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!30 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1C"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1C]<br>
-!31 = !{i32 0, i32 0, !17, !22}<br>
+!31 = !MDLocation(line: 0, scope: !17, inlinedAt: !22)<br>
!32 = !{!"0x101\00this\0016777216\001088", !16, null, !30} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!33 = !{i32 0, i32 0, !16, !21}<br>
-!34 = !{i32 5, i32 0, !35, null}<br>
+!33 = !MDLocation(line: 0, scope: !16, inlinedAt: !21)<br>
+!34 = !MDLocation(line: 5, scope: !35)<br>
!35 = !{!"0xb\005\000\005", !5, !36} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/PR20038.cpp]<br>
!36 = !{!"0xb\005\000\004", !5, !12} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/PR20038.cpp]<br>
-!37 = !{i32 6, i32 0, !17, null}<br>
-!38 = !{i32 0, i32 0, !17, null}<br>
-!39 = !{i32 0, i32 0, !16, !37}<br>
-!40 = !{i32 0, i32 0, !16, null}<br>
-!41 = !{i32 6, i32 0, !16, null}<br>
+!37 = !MDLocation(line: 6, scope: !17)<br>
+!38 = !MDLocation(line: 0, scope: !17)<br>
+!39 = !MDLocation(line: 0, scope: !16, inlinedAt: !37)<br>
+!40 = !MDLocation(line: 0, scope: !16)<br>
+!41 = !MDLocation(line: 6, scope: !16)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/Sparc/gnu-window-save.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Sparc/gnu-window-save.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Sparc/gnu-window-save.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/Sparc/gnu-window-save.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/Sparc/gnu-window-save.ll Wed Jan 14 16:27:36 2015<br>
@@ -67,5 +67,5 @@ attributes #1 = { "less-precise-fpmad"="<br>
!9 = !{i32 2, !"Dwarf Version", i32 4}<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5 (<a href="http://llvm.org/git/clang.git" target="_blank">http://llvm.org/git/clang.git</a> 6a0714fee07fb7c4e32d3972b4fe2ce2f5678cf4) (llvm/ 672e88e934757f76d5c5e5258be41e7615094844)"}<br>
-!12 = !{i32 5, i32 0, !4, null}<br>
-!13 = !{i32 6, i32 0, !4, null}<br>
+!12 = !MDLocation(line: 5, scope: !4)<br>
+!13 = !MDLocation(line: 6, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/SystemZ/variable-loc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/SystemZ/variable-loc.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/SystemZ/variable-loc.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/SystemZ/variable-loc.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/SystemZ/variable-loc.ll Wed Jan 14 16:27:36 2015<br>
@@ -71,12 +71,12 @@ declare i32 @printf(i8*, ...)<br>
!18 = !{!"0xb\0018\0016\004", !29, !14} ; [ DW_TAG_lexical_block ] [/home/timnor01/a64-trunk/build/simple.c]<br>
!19 = !{!"0x1\00\000\003200\0032\000\000", null, null, !10, !20, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 3200, align 32, offset 0] [from int]<br>
!20 = !{!"0x21\000\0099"} ; [ DW_TAG_subrange_type ] [0, 99]<br>
-!22 = !{i32 19, i32 7, !18, null}<br>
+!22 = !MDLocation(line: 19, column: 7, scope: !18)<br>
!23 = !{!"0x100\00val\0020\000", !18, !6, !10} ; [ DW_TAG_auto_variable ] [val] [line 20]<br>
-!24 = !{i32 20, i32 7, !18, null}<br>
-!25 = !{i32 22, i32 3, !18, null}<br>
-!26 = !{i32 23, i32 9, !18, null}<br>
-!27 = !{i32 24, i32 3, !18, null}<br>
-!28 = !{i32 26, i32 3, !18, null}<br>
+!24 = !MDLocation(line: 20, column: 7, scope: !18)<br>
+!25 = !MDLocation(line: 22, column: 3, scope: !18)<br>
+!26 = !MDLocation(line: 23, column: 9, scope: !18)<br>
+!27 = !MDLocation(line: 24, column: 3, scope: !18)<br>
+!28 = !MDLocation(line: 26, column: 3, scope: !18)<br>
!29 = !{!"simple.c", !"/home/timnor01/a64-trunk/build"}<br>
!30 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/2010-04-13-PubType.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2010-04-13-PubType.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2010-04-13-PubType.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/2010-04-13-PubType.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/2010-04-13-PubType.ll Wed Jan 14 16:27:36 2015<br>
@@ -44,9 +44,9 @@ declare void @llvm.dbg.declare(metadata,<br>
!10 = !{!"0x13\00Y\004\0032\0032\000\000\000", !18, !2, null, !11, null, null, null} ; [ DW_TAG_structure_type ] [Y] [line 4, size 32, align 32, offset 0] [def] [from ]<br>
!11 = !{!12}<br>
!12 = !{!"0xd\00x\005\0032\0032\000\000", !18, !10, !6} ; [ DW_TAG_member ]<br>
-!13 = !{i32 7, i32 0, !1, null}<br>
+!13 = !MDLocation(line: 7, scope: !1)<br>
!14 = !{!"0x101\00y\007\000", !1, !2, !9} ; [ DW_TAG_arg_variable ]<br>
-!15 = !{i32 7, i32 0, !16, null}<br>
+!15 = !MDLocation(line: 7, scope: !16)<br>
!16 = !{!"0xb\007\000\000", !18, !1} ; [ DW_TAG_lexical_block ]<br>
!17 = !{!1}<br>
!18 = !{!"a.c", !"/tmp/"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll Wed Jan 14 16:27:36 2015<br>
@@ -22,7 +22,7 @@ declare void @bar(i32)<br>
!5 = !{!"0x27\00ro\00ro\00ro\001\001\001", !1, !1, !6, i32 201, null} ; [ DW_TAG_constant ]<br>
!6 = !{!"0x26\00\000\000\000\000\000", !12, !1, !7} ; [ DW_TAG_const_type ]<br>
!7 = !{!"0x24\00unsigned int\000\0032\0032\000\000\007", !12, !1} ; [ DW_TAG_base_type ]<br>
-!8 = !{i32 3, i32 14, !9, null}<br>
+!8 = !MDLocation(line: 3, column: 14, scope: !9)<br>
!9 = !{!"0xb\003\0012\000", !12, !0} ; [ DW_TAG_lexical_block ]<br>
!10 = !{!0}<br>
!11 = !{!5}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll Wed Jan 14 16:27:36 2015<br>
@@ -31,9 +31,9 @@ declare void @llvm.dbg.declare(metadata,<br>
!14 = !{!"0x34\00GLB\00GLB\00\001\000\001", null, !6, !9, i32* @GLB, null} ; [ DW_TAG_variable ]<br>
!15 = !{!"0x100\00LOC\004\000", !16, !6, !9} ; [ DW_TAG_auto_variable ]<br>
!16 = !{!"0xb\003\009\000", !20, !5} ; [ DW_TAG_lexical_block ]<br>
-!17 = !{i32 4, i32 9, !16, null}<br>
-!18 = !{i32 4, i32 23, !16, null}<br>
-!19 = !{i32 5, i32 5, !16, null}<br>
+!17 = !MDLocation(line: 4, column: 9, scope: !16)<br>
+!18 = !MDLocation(line: 4, column: 23, scope: !16)<br>
+!19 = !MDLocation(line: 5, column: 5, scope: !16)<br>
!20 = !{!"test.c", !"/work/llvm/vanilla/test/DebugInfo"}<br>
<br>
; CHECK: DW_TAG_variable<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/2011-12-16-BadStructRef.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2011-12-16-BadStructRef.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2011-12-16-BadStructRef.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/2011-12-16-BadStructRef.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/2011-12-16-BadStructRef.ll Wed Jan 14 16:27:36 2015<br>
@@ -130,37 +130,37 @@ entry:<br>
!45 = !{!"0x24"} ; [ DW_TAG_base_type ]<br>
!46 = !{!"0x2e\00baz\00baz\00_ZN3bazC2Ei\006\000\001\000\006\00256\000\000", !82, null, !14, null, void (%struct.baz*, i32)* @_ZN3bazC2Ei, null, !13, null} ; [ DW_TAG_subprogram ] [line 6] [def] [scope 0] [baz]<br>
!49 = !{!"0x101\00argc\0016777232\000", !29, !6, !12} ; [ DW_TAG_arg_variable ]<br>
-!50 = !{i32 16, i32 14, !29, null}<br>
+!50 = !MDLocation(line: 16, column: 14, scope: !29)<br>
!51 = !{!"0x101\00argv\0033554448\000", !29, !6, !32} ; [ DW_TAG_arg_variable ]<br>
-!52 = !{i32 16, i32 27, !29, null}<br>
+!52 = !MDLocation(line: 16, column: 27, scope: !29)<br>
!53 = !{!"0x100\00myBar\0018\000", !54, !6, !5} ; [ DW_TAG_auto_variable ]<br>
!54 = !{!"0xb\0017\001\000", !82, !29} ; [ DW_TAG_lexical_block ]<br>
-!55 = !{i32 18, i32 9, !54, null}<br>
-!56 = !{i32 18, i32 17, !54, null}<br>
-!57 = !{i32 19, i32 5, !54, null}<br>
+!55 = !MDLocation(line: 18, column: 9, scope: !54)<br>
+!56 = !MDLocation(line: 18, column: 17, scope: !54)<br>
+!57 = !MDLocation(line: 19, column: 5, scope: !54)<br>
!58 = !{!"0x101\00this\0016777229\0064", !37, !6, !24} ; [ DW_TAG_arg_variable ]<br>
-!59 = !{i32 13, i32 5, !37, null}<br>
+!59 = !MDLocation(line: 13, column: 5, scope: !37)<br>
!60 = !{!"0x101\00x\0033554445\000", !37, !6, !12} ; [ DW_TAG_arg_variable ]<br>
-!61 = !{i32 13, i32 13, !37, null}<br>
-!62 = !{i32 13, i32 34, !37, null}<br>
+!61 = !MDLocation(line: 13, column: 13, scope: !37)<br>
+!62 = !MDLocation(line: 13, column: 34, scope: !37)<br>
!63 = !{!"0x101\00this\0016777229\0064", !40, !6, !24} ; [ DW_TAG_arg_variable ]<br>
-!64 = !{i32 13, i32 5, !40, null}<br>
+!64 = !MDLocation(line: 13, column: 5, scope: !40)<br>
!65 = !{!"0x101\00x\0033554445\000", !40, !6, !12} ; [ DW_TAG_arg_variable ]<br>
-!66 = !{i32 13, i32 13, !40, null}<br>
-!67 = !{i32 13, i32 33, !40, null}<br>
-!68 = !{i32 13, i32 34, !69, null}<br>
+!66 = !MDLocation(line: 13, column: 13, scope: !40)<br>
+!67 = !MDLocation(line: 13, column: 33, scope: !40)<br>
+!68 = !MDLocation(line: 13, column: 34, scope: !69)<br>
!69 = !{!"0xb\0013\0033\001", !82, !40} ; [ DW_TAG_lexical_block ]<br>
!70 = !{!"0x101\00this\0016777222\0064", !43, !6, !16} ; [ DW_TAG_arg_variable ]<br>
-!71 = !{i32 6, i32 5, !43, null}<br>
+!71 = !MDLocation(line: 6, column: 5, scope: !43)<br>
!72 = !{!"0x101\00a\0033554438\000", !43, !6, !12} ; [ DW_TAG_arg_variable ]<br>
-!73 = !{i32 6, i32 13, !43, null}<br>
-!74 = !{i32 6, i32 24, !43, null}<br>
+!73 = !MDLocation(line: 6, column: 13, scope: !43)<br>
+!74 = !MDLocation(line: 6, column: 24, scope: !43)<br>
!75 = !{!"0x101\00this\0016777222\0064", !46, !6, !16} ; [ DW_TAG_arg_variable ]<br>
-!76 = !{i32 6, i32 5, !46, null}<br>
+!76 = !MDLocation(line: 6, column: 5, scope: !46)<br>
!77 = !{!"0x101\00a\0033554438\000", !46, !6, !12} ; [ DW_TAG_arg_variable ]<br>
-!78 = !{i32 6, i32 13, !46, null}<br>
-!79 = !{i32 6, i32 23, !46, null}<br>
-!80 = !{i32 6, i32 24, !81, null}<br>
+!78 = !MDLocation(line: 6, column: 13, scope: !46)<br>
+!79 = !MDLocation(line: 6, column: 23, scope: !46)<br>
+!80 = !MDLocation(line: 6, column: 24, scope: !81)<br>
!81 = !{!"0xb\006\0023\002", !82, !46} ; [ DW_TAG_lexical_block ]<br>
!82 = !{!"main.cpp", !"/Users/echristo/tmp/bad-struct-ref"}<br>
!83 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/DW_AT_byte_size.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_byte_size.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_byte_size.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/DW_AT_byte_size.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/DW_AT_byte_size.ll Wed Jan 14 16:27:36 2015<br>
@@ -39,8 +39,8 @@ declare void @llvm.dbg.declare(metadata,<br>
!12 = !{!13}<br>
!13 = !{!"0xd\00b\001\0032\0032\000\000", !20, !11, !9} ; [ DW_TAG_member ]<br>
!16 = !{!"0x101\00a\0016777219\000", !5, !6, !10} ; [ DW_TAG_arg_variable ]<br>
-!17 = !{i32 3, i32 13, !5, null}<br>
-!18 = !{i32 4, i32 3, !19, null}<br>
+!17 = !MDLocation(line: 3, column: 13, scope: !5)<br>
+!18 = !MDLocation(line: 4, column: 3, scope: !19)<br>
!19 = !{!"0xb\003\0016\000", !20, !5} ; [ DW_TAG_lexical_block ]<br>
!20 = !{!"foo.cpp", !"/Users/echristo"}<br>
!21 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/DW_AT_linkage_name.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_linkage_name.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_linkage_name.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/DW_AT_linkage_name.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/DW_AT_linkage_name.ll Wed Jan 14 16:27:36 2015<br>
@@ -105,12 +105,12 @@ attributes #2 = { ssp uwtable }<br>
!25 = !{!"clang version 3.5.0 "}<br>
!26 = !{!"0x101\00this\0016777216\001088", !17, null, !27} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!27 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1A]<br>
-!28 = !{i32 0, i32 0, !17, null}<br>
-!29 = !{i32 8, i32 0, !17, null}<br>
+!28 = !MDLocation(line: 0, scope: !17)<br>
+!29 = !MDLocation(line: 8, scope: !17)<br>
!30 = !{!"0x101\00this\0016777216\001088", !18, null, !27} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!31 = !{i32 0, i32 0, !18, null}<br>
-!32 = !{i32 6, i32 0, !18, null}<br>
-!33 = !{i32 8, i32 0, !18, null}<br>
+!31 = !MDLocation(line: 0, scope: !18)<br>
+!32 = !MDLocation(line: 6, scope: !18)<br>
+!33 = !MDLocation(line: 8, scope: !18)<br>
!34 = !{!"0x100\00a\0011\000", !19, !20, !"_ZTS1A"} ; [ DW_TAG_auto_variable ] [a] [line 11]<br>
-!35 = !{i32 11, i32 0, !19, null}<br>
-!36 = !{i32 12, i32 0, !19, null}<br>
+!35 = !MDLocation(line: 11, scope: !19)<br>
+!36 = !MDLocation(line: 12, scope: !19)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/DW_AT_location-reference.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_location-reference.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_location-reference.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/DW_AT_location-reference.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/DW_AT_location-reference.ll Wed Jan 14 16:27:36 2015<br>
@@ -110,16 +110,16 @@ declare void @llvm.dbg.value(metadata, i<br>
!5 = !{!"0x100\00x\005\000", !6, !1, !7} ; [ DW_TAG_auto_variable ]<br>
!6 = !{!"0xb\004\0014\000", !23, !0} ; [ DW_TAG_lexical_block ]<br>
!7 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !2} ; [ DW_TAG_base_type ]<br>
-!8 = !{i32 6, i32 3, !6, null}<br>
+!8 = !MDLocation(line: 6, column: 3, scope: !6)<br>
!12 = !{i32 1}<br>
-!13 = !{i32 7, i32 3, !6, null}<br>
-!14 = !{i32 8, i32 3, !6, null}<br>
-!15 = !{i32 9, i32 3, !6, null}<br>
+!13 = !MDLocation(line: 7, column: 3, scope: !6)<br>
+!14 = !MDLocation(line: 8, column: 3, scope: !6)<br>
+!15 = !MDLocation(line: 9, column: 3, scope: !6)<br>
!16 = !{i32 2}<br>
-!17 = !{i32 10, i32 3, !6, null}<br>
-!18 = !{i32 11, i32 3, !6, null}<br>
-!19 = !{i32 12, i32 3, !6, null}<br>
-!20 = !{i32 13, i32 1, !6, null}<br>
+!17 = !MDLocation(line: 10, column: 3, scope: !6)<br>
+!18 = !MDLocation(line: 11, column: 3, scope: !6)<br>
+!19 = !MDLocation(line: 12, column: 3, scope: !6)<br>
+!20 = !MDLocation(line: 13, column: 1, scope: !6)<br>
!21 = !{!0}<br>
!22 = !{!5}<br>
!23 = !{!"simple.c", !"/home/rengol01/temp/tests/dwarf/relocation"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/DW_AT_object_pointer.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_object_pointer.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_object_pointer.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/DW_AT_object_pointer.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/DW_AT_object_pointer.ll Wed Jan 14 16:27:36 2015<br>
@@ -72,19 +72,19 @@ entry:<br>
!20 = !{!"0x2e\00A\00A\00_ZN1AC2Ev\003\000\001\000\006\00256\000\003", !6, null, !11, null, void (%class.A*)* @_ZN1AC2Ev, null, !17, !1} ; [ DW_TAG_subprogram ] [line 3] [def] [A]<br>
!21 = !{!"0x100\00a\008\000", !22, !6, !14} ; [ DW_TAG_auto_variable ] [a] [line 8]<br>
!22 = !{!"0xb\007\0011\000", !6, !5} ; [ DW_TAG_lexical_block ] [/Users/echristo/debug-tests/bar.cpp]<br>
-!23 = !{i32 8, i32 5, !22, null}<br>
-!24 = !{i32 8, i32 6, !22, null}<br>
-!25 = !{i32 9, i32 3, !22, null}<br>
+!23 = !MDLocation(line: 8, column: 5, scope: !22)<br>
+!24 = !MDLocation(line: 8, column: 6, scope: !22)<br>
+!25 = !MDLocation(line: 9, column: 3, scope: !22)<br>
!26 = !{!"0x101\00this\0016777219\001088", !10, !6, !27} ; [ DW_TAG_arg_variable ] [this] [line 3]<br>
!27 = !{!"0xf\00\000\0064\0064\000\000", null, null, !14} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from A]<br>
-!28 = !{i32 3, i32 3, !10, null}<br>
-!29 = !{i32 3, i32 18, !10, null}<br>
+!28 = !MDLocation(line: 3, column: 3, scope: !10)<br>
+!29 = !MDLocation(line: 3, column: 18, scope: !10)<br>
!30 = !{!"0x101\00this\0016777219\001088", !20, !6, !27} ; [ DW_TAG_arg_variable ] [this] [line 3]<br>
-!31 = !{i32 3, i32 3, !20, null}<br>
-!32 = !{i32 3, i32 9, !33, null}<br>
+!31 = !MDLocation(line: 3, column: 3, scope: !20)<br>
+!32 = !MDLocation(line: 3, column: 9, scope: !33)<br>
!33 = !{!"0xb\003\007\001", !6, !20} ; [ DW_TAG_lexical_block ] [/Users/echristo/debug-tests/bar.cpp]<br>
-!34 = !{i32 3, i32 18, !33, null}<br>
-!35 = !{i32 7, i32 0, !5, null}<br>
+!34 = !MDLocation(line: 3, column: 18, scope: !33)<br>
+!35 = !MDLocation(line: 7, scope: !5)<br>
!36 = !{!"0x101\00\0016777223\000", !5, !6, !9} ; [ DW_TAG_arg_variable ] [line 7]<br>
!37 = !{!"bar.cpp", !"/Users/echristo/debug-tests"}<br>
!38 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/DW_AT_specification.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_specification.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_specification.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/DW_AT_specification.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/DW_AT_specification.ll Wed Jan 14 16:27:36 2015<br>
@@ -36,7 +36,7 @@ entry:<br>
!20 = !{!"0x34\00x\00x\00\005\001\001", !5, !6, !21, i32* @_ZZN3foo3barEvE1x, null} ; [ DW_TAG_variable ]<br>
!21 = !{!"0x26\00\000\000\000\000\000", null, null, !22} ; [ DW_TAG_const_type ]<br>
!22 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]<br>
-!25 = !{i32 6, i32 1, !26, null}<br>
+!25 = !MDLocation(line: 6, column: 1, scope: !26)<br>
!26 = !{!"0xb\004\0017\000", !6, !5} ; [ DW_TAG_lexical_block ]<br>
!27 = !{!"nsNativeAppSupportBase.ii", !"/Users/espindola/mozilla-central/obj-x86_64-apple-darwin11.2.0/toolkit/library"}<br>
!28 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/DW_AT_stmt_list_sec_offset.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_stmt_list_sec_offset.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_AT_stmt_list_sec_offset.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/DW_AT_stmt_list_sec_offset.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/DW_AT_stmt_list_sec_offset.ll Wed Jan 14 16:27:36 2015<br>
@@ -40,5 +40,5 @@ attributes #0 = { nounwind "less-precise<br>
!7 = !{!8}<br>
!8 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
!9 = !{i32 2, !"Dwarf Version", i32 4}<br>
-!10 = !{i32 3, i32 0, !4, null}<br>
+!10 = !MDLocation(line: 3, scope: !4)<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/aligned_stack_var.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/aligned_stack_var.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/aligned_stack_var.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/aligned_stack_var.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/aligned_stack_var.ll Wed Jan 14 16:27:36 2015<br>
@@ -37,7 +37,7 @@ declare void @llvm.dbg.declare(metadata,<br>
!9 = !{!"0x100\00x\002\000", !10, !6, !11} ; [ DW_TAG_auto_variable ]<br>
!10 = !{!"0xb\001\0012\000", !14, !5} ; [ DW_TAG_lexical_block ]<br>
!11 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]<br>
-!12 = !{i32 2, i32 7, !10, null}<br>
-!13 = !{i32 3, i32 1, !10, null}<br>
+!12 = !MDLocation(line: 2, column: 7, scope: !10)<br>
+!13 = !MDLocation(line: 3, column: 1, scope: !10)<br>
!14 = !{!"test.cc", !"/home/samsonov/debuginfo"}<br>
!15 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/arguments.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/arguments.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/arguments.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/arguments.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/arguments.ll Wed Jan 14 16:27:36 2015<br>
@@ -69,8 +69,8 @@ attributes #1 = { nounwind readnone }<br>
!17 = !{!"0x26\00\000\000\000\000\000", null, null, !8} ; [ DW_TAG_const_type ] [line 0, size 0, align 0, offset 0] [from foo]<br>
!18 = !{i32 786468}<br>
!19 = !{!"0x101\00f\0016777222\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [f] [line 6]<br>
-!20 = !{i32 6, i32 0, !4, null}<br>
+!20 = !MDLocation(line: 6, scope: !4)<br>
!21 = !{!"0x101\00g\0033554438\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [g] [line 6]<br>
-!22 = !{i32 7, i32 0, !4, null}<br>
-!23 = !{i32 8, i32 0, !4, null}<br>
+!22 = !MDLocation(line: 7, scope: !4)<br>
+!23 = !MDLocation(line: 8, scope: !4)<br>
!24 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/array.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/array.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/array.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/array.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/array.ll Wed Jan 14 16:27:36 2015<br>
@@ -88,14 +88,14 @@ attributes #2 = { nounwind readnone }<br>
!25 = !{i32 2, !"Dwarf Version", i32 2}<br>
!26 = !{i32 1, !"Debug Info Version", i32 2}<br>
!27 = !{!"clang version 3.5.0 "}<br>
-!28 = !{i32 1, i32 0, !4, null}<br>
-!29 = !{i32 2, i32 0, !4, null}<br>
+!28 = !MDLocation(line: 1, scope: !4)<br>
+!29 = !MDLocation(line: 2, scope: !4)<br>
!30 = !{!31, !31, i64 0}<br>
!31 = !{!"int", !32, i64 0}<br>
!32 = !{!"omnipotent char", !33, i64 0}<br>
!33 = !{!"Simple C/C++ TBAA"}<br>
-!34 = !{i32 3, i32 0, !4, null}<br>
-!35 = !{i32 5, i32 0, !12, null}<br>
-!36 = !{i32 6, i32 0, !12, null}<br>
-!37 = !{i32 7, i32 0, !12, null}<br>
-!38 = !{i32 8, i32 0, !12, null}<br>
+!34 = !MDLocation(line: 3, scope: !4)<br>
+!35 = !MDLocation(line: 5, scope: !12)<br>
+!36 = !MDLocation(line: 6, scope: !12)<br>
+!37 = !MDLocation(line: 7, scope: !12)<br>
+!38 = !MDLocation(line: 8, scope: !12)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/array2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/array2.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/array2.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/array2.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/array2.ll Wed Jan 14 16:27:36 2015<br>
@@ -92,16 +92,16 @@ attributes #2 = { nounwind }<br>
!17 = !{i32 1, !"Debug Info Version", i32 2}<br>
!18 = !{!"clang version 3.5.0 "}<br>
!19 = !{!"0x101\00p\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [p] [line 1]<br>
-!20 = !{i32 1, i32 0, !4, null}<br>
-!21 = !{i32 2, i32 0, !4, null}<br>
-!22 = !{i32 3, i32 0, !4, null}<br>
+!20 = !MDLocation(line: 1, scope: !4)<br>
+!21 = !MDLocation(line: 2, scope: !4)<br>
+!22 = !MDLocation(line: 3, scope: !4)<br>
!23 = !{!"0x101\00argc\0016777221\000", !10, !5, !9} ; [ DW_TAG_arg_variable ] [argc] [line 5]<br>
-!24 = !{i32 5, i32 0, !10, null}<br>
+!24 = !MDLocation(line: 5, scope: !10)<br>
!25 = !{!"0x101\00argv\0033554437\000", !10, !5, !13} ; [ DW_TAG_arg_variable ] [argv] [line 5]<br>
!26 = !{!"0x100\00array\006\000", !10, !5, !27} ; [ DW_TAG_auto_variable ] [array] [line 6]<br>
!27 = !{!"0x1\00\000\00128\0032\000\000", null, null, !9, !28, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 128, align 32, offset 0] [from int]<br>
!28 = !{!29}<br>
!29 = !{!"0x21\000\004"} ; [ DW_TAG_subrange_type ] [0, 3]<br>
-!30 = !{i32 6, i32 0, !10, null}<br>
-!31 = !{i32 7, i32 0, !10, null}<br>
-!32 = !{i32 8, i32 0, !10, null}<br>
+!30 = !MDLocation(line: 6, scope: !10)<br>
+!31 = !MDLocation(line: 7, scope: !10)<br>
+!32 = !MDLocation(line: 8, scope: !10)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/block-capture.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/block-capture.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/block-capture.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/block-capture.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/block-capture.ll Wed Jan 14 16:27:36 2015<br>
@@ -121,11 +121,11 @@ attributes #3 = { nounwind }<br>
!63 = !{!"0xf\00\000\0064\0064\000\000", null, null, !11} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from ]<br>
!64 = !{!"0xd\00DestroyFuncPtr\002\0064\0064\00192\000", !1, !58, !63} ; [ DW_TAG_member ] [DestroyFuncPtr] [line 2, size 64, align 64, offset 192] [from ]<br>
!65 = !{!"0xd\00block\002\0064\0064\00256\003", !1, !5, !25} ; [ DW_TAG_member ] [block] [line 2, size 64, align 64, offset 256] [public] [from ]<br>
-!66 = !{i32 2, i32 20, !8, null}<br>
-!67 = !{i32 2, i32 21, !8, null}<br>
+!66 = !MDLocation(line: 2, column: 20, scope: !8)<br>
+!67 = !MDLocation(line: 2, column: 21, scope: !8)<br>
!68 = !{!"0x100\00block\002\000", !8, !5, !25} ; [ DW_TAG_auto_variable ] [block] [line 2]<br>
!69 = !{!"0x102\006\0034\0032"} ; [ DW_TAG_expression ] [DW_OP_deref]<br>
-!70 = !{i32 2, i32 9, !8, null}<br>
-!71 = !{i32 2, i32 23, !72, null}<br>
+!70 = !MDLocation(line: 2, column: 9, scope: !8)<br>
+!71 = !MDLocation(line: 2, column: 23, scope: !72)<br>
!72 = !{!"0xb\002\0021\000", !1, !8} ; [ DW_TAG_lexical_block ] [/foo.m]<br>
-!73 = !{i32 2, i32 32, !8, null}<br>
+!73 = !MDLocation(line: 2, column: 32, scope: !8)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/byvalstruct.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/byvalstruct.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/byvalstruct.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/byvalstruct.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/byvalstruct.ll Wed Jan 14 16:27:36 2015<br>
@@ -116,13 +116,13 @@ attributes #1 = { nounwind readnone }<br>
!26 = !{i32 1, !"Objective-C Image Info Section", !"__DATA, __objc_imageinfo, regular, no_dead_strip"}<br>
!27 = !{i32 4, !"Objective-C Garbage Collection", i32 0}<br>
!28 = !{!"0x101\00self\0016777225\001088", !7, !5, !14} ; [ DW_TAG_arg_variable ] [self] [line 9]<br>
-!29 = !{i32 9, i32 0, !7, null}<br>
+!29 = !MDLocation(line: 9, scope: !7)<br>
!30 = !{!"0x101\00_cmd\0033554441\0064", !7, !5, !31} ; [ DW_TAG_arg_variable ] [_cmd] [line 9]<br>
!31 = !{!"0x16\00SEL\009\000\000\000\000", !1, null, !12} ; [ DW_TAG_typedef ] [SEL] [line 9, size 0, align 0, offset 0] [from ]<br>
!32 = !{!"0x101\00otherBitmap\0050331657\000", !7, !5, !14} ; [ DW_TAG_arg_variable ] [otherBitmap] [line 9]<br>
!33 = !{!"0x101\00info\0067108874\000", !7, !5, !15} ; [ DW_TAG_arg_variable ] [info] [line 10]<br>
-!34 = !{i32 10, i32 0, !7, null}<br>
+!34 = !MDLocation(line: 10, scope: !7)<br>
!35 = !{!"0x101\00length\0083886091\000", !7, !5, !19} ; [ DW_TAG_arg_variable ] [length] [line 11]<br>
-!36 = !{i32 11, i32 0, !7, null}<br>
-!37 = !{i32 13, i32 0, !7, null}<br>
+!36 = !MDLocation(line: 11, scope: !7)<br>
+!37 = !MDLocation(line: 13, scope: !7)<br>
!38 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/coff_debug_info_type.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/coff_debug_info_type.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/coff_debug_info_type.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/coff_debug_info_type.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/coff_debug_info_type.ll Wed Jan 14 16:27:36 2015<br>
@@ -39,5 +39,5 @@ attributes #0 = { nounwind "less-precise<br>
!7 = !{!8}<br>
!8 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
!9 = !{i32 2, !"Dwarf Version", i32 3}<br>
-!10 = !{i32 3, i32 0, !4, null}<br>
+!10 = !MDLocation(line: 3, scope: !4)<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/coff_relative_names.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/coff_relative_names.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/coff_relative_names.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/coff_relative_names.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/coff_relative_names.ll Wed Jan 14 16:27:36 2015<br>
@@ -33,5 +33,5 @@ attributes #0 = { nounwind "less-precise<br>
!7 = !{!8}<br>
!8 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
!9 = !{i32 2, !"Dwarf Version", i32 3}<br>
-!10 = !{i32 3, i32 0, !4, null}<br>
+!10 = !MDLocation(line: 3, scope: !4)<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll Wed Jan 14 16:27:36 2015<br>
@@ -118,14 +118,14 @@ declare void @_Z8moz_freePv(i8*)<br>
!46 = !{!"0x101\00aValue\0033554436\000", !31, !6, !9} ; [ DW_TAG_arg_variable ]<br>
!47 = !{!49}<br>
!49 = !{!"0x34\00mRefCnt\00mRefCnt\00\009\000\001", null, !6, !37, i32* null, null} ; [ DW_TAG_variable ]<br>
-!50 = !{i32 5, i32 5, !51, !52}<br>
+!50 = !MDLocation(line: 5, column: 5, scope: !51, inlinedAt: !52)<br>
!51 = !{!"0xb\004\0029\002", !6, !31} ; [ DW_TAG_lexical_block ]<br>
-!52 = !{i32 15, i32 0, !53, null}<br>
+!52 = !MDLocation(line: 15, scope: !53)<br>
!53 = !{!"0xb\0014\0034\000", !6, !5} ; [ DW_TAG_lexical_block ]<br>
-!54 = !{i32 19, i32 3, !55, !56}<br>
+!54 = !MDLocation(line: 19, column: 3, scope: !55, inlinedAt: !56)<br>
!55 = !{!"0xb\0018\0041\001", !6, !27} ; [ DW_TAG_lexical_block ]<br>
-!56 = !{i32 18, i32 41, !23, !52}<br>
-!57 = !{i32 19, i32 3, !55, !58}<br>
-!58 = !{i32 18, i32 41, !23, null}<br>
+!56 = !MDLocation(line: 18, column: 41, scope: !23, inlinedAt: !52)<br>
+!57 = !MDLocation(line: 19, column: 3, scope: !55, inlinedAt: !58)<br>
+!58 = !MDLocation(line: 18, column: 41, scope: !23)<br>
!59 = !{!"nsAutoRefCnt.ii", !"/Users/espindola/mozilla-central/obj-x86_64-apple-darwin11.2.0/netwerk/base/src"}<br>
!60 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/constant-aggregate.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/constant-aggregate.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/constant-aggregate.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/constant-aggregate.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/constant-aggregate.ll Wed Jan 14 16:27:36 2015<br>
@@ -110,9 +110,9 @@ attributes #1 = { nounwind readnone }<br>
!35 = !{i32 1, !"PIC Level", i32 2}<br>
!36 = !{!"clang version 3.6.0 (trunk 225364) (llvm/trunk 225366)"}<br>
!37 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!38 = !{i32 3, i32 16, !12, null}<br>
-!39 = !{i32 5, i32 3, !12, null}<br>
-!40 = !{i32 10, i32 16, !19, null}<br>
-!41 = !{i32 12, i32 3, !19, null}<br>
-!42 = !{i32 16, i32 6, !24, null}<br>
-!43 = !{i32 17, i32 3, !24, null}<br>
+!38 = !MDLocation(line: 3, column: 16, scope: !12)<br>
+!39 = !MDLocation(line: 5, column: 3, scope: !12)<br>
+!40 = !MDLocation(line: 10, column: 16, scope: !19)<br>
+!41 = !MDLocation(line: 12, column: 3, scope: !19)<br>
+!42 = !MDLocation(line: 16, column: 6, scope: !24)<br>
+!43 = !MDLocation(line: 17, column: 3, scope: !24)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/cu-ranges-odr.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/cu-ranges-odr.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/cu-ranges-odr.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/cu-ranges-odr.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/cu-ranges-odr.ll Wed Jan 14 16:27:36 2015<br>
@@ -87,10 +87,10 @@ attributes #1 = { nounwind readnone }<br>
!23 = !{i32 2, !"Dwarf Version", i32 4}<br>
!24 = !{i32 1, !"Debug Info Version", i32 2}<br>
!25 = !{!"clang version 3.5 (trunk 199923) (llvm/trunk 199940)"}<br>
-!26 = !{i32 8, i32 0, !14, null}<br>
+!26 = !MDLocation(line: 8, scope: !14)<br>
!27 = !{!"0x101\00this\0016777216\001088", !18, null, !28} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!28 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1A]<br>
-!29 = !{i32 0, i32 0, !18, null}<br>
+!29 = !MDLocation(line: 0, scope: !18)<br>
!30 = !{!"0x101\00i\0033554435\000", !18, !15, !7} ; [ DW_TAG_arg_variable ] [i] [line 3]<br>
-!31 = !{i32 3, i32 0, !18, null}<br>
-!32 = !{i32 3, i32 0, !19, null}<br>
+!31 = !MDLocation(line: 3, scope: !18)<br>
+!32 = !MDLocation(line: 3, scope: !19)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/cu-ranges.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/cu-ranges.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/cu-ranges.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/cu-ranges.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/cu-ranges.ll Wed Jan 14 16:27:36 2015<br>
@@ -70,6 +70,6 @@ attributes #1 = { nounwind readnone }<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
!12 = !{!"clang version 3.5.0 (trunk 204164) (llvm/trunk 204183)"}<br>
!13 = !{!"0x101\00a\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [a] [line 1]<br>
-!14 = !{i32 1, i32 0, !4, null}<br>
+!14 = !MDLocation(line: 1, scope: !4)<br>
!15 = !{!"0x101\00b\0016777218\000", !9, !5, !8} ; [ DW_TAG_arg_variable ] [b] [line 2]<br>
-!16 = !{i32 2, i32 0, !9, null}<br>
+!16 = !MDLocation(line: 2, scope: !9)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-byval-parameter.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-byval-parameter.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-byval-parameter.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-byval-parameter.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-byval-parameter.ll Wed Jan 14 16:27:36 2015<br>
@@ -43,8 +43,8 @@ declare void @llvm.dbg.declare(metadata,<br>
!12 = !{!"0xd\00x\002\0064\0064\000\000", !19, !10, !6} ; [ DW_TAG_member ]<br>
!13 = !{!"0xd\00y\003\0064\0064\0064\000", !19, !10, !6} ; [ DW_TAG_member ]<br>
!14 = !{!"0xd\00P2\008\00128\0064\00128\000", !19, !7, !10} ; [ DW_TAG_member ]<br>
-!15 = !{i32 11, i32 0, !1, null}<br>
-!16 = !{i32 12, i32 0, !17, null}<br>
+!15 = !MDLocation(line: 11, scope: !1)<br>
+!16 = !MDLocation(line: 12, scope: !17)<br>
!17 = !{!"0xb\0011\000\000", !19, !1} ; [ DW_TAG_lexical_block ]<br>
!18 = !{!1}<br>
!19 = !{!"b2.c", !"/tmp/"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-const-int.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-const-int.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-const-int.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-const-int.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-const-int.ll Wed Jan 14 16:27:36 2015<br>
@@ -30,8 +30,8 @@ declare void @llvm.dbg.value(metadata, i<br>
!6 = !{!"0x100\00i\002\000", !7, !2, !5} ; [ DW_TAG_auto_variable ]<br>
!7 = !{!"0xb\001\0011\000", !13, !1} ; [ DW_TAG_lexical_block ]<br>
!8 = !{i32 42}<br>
-!9 = !{i32 2, i32 12, !7, null}<br>
-!10 = !{i32 3, i32 2, !7, null}<br>
+!9 = !MDLocation(line: 2, column: 12, scope: !7)<br>
+!10 = !MDLocation(line: 3, column: 2, scope: !7)<br>
!11 = !{!1}<br>
!12 = !{!6}<br>
!13 = !{!"a.c", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-const.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-const.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-const.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-const.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-const.ll Wed Jan 14 16:27:36 2015<br>
@@ -40,10 +40,10 @@ declare i32 @bar() nounwind readnone<br>
!6 = !{!"0x100\00j\0015\000", !7, !1, !5} ; [ DW_TAG_auto_variable ]<br>
!7 = !{!"0xb\0012\0052\000", !15, !0} ; [ DW_TAG_lexical_block ]<br>
!8 = !{i32 42}<br>
-!9 = !{i32 15, i32 12, !7, null}<br>
-!10 = !{i32 23, i32 3, !7, null}<br>
-!11 = !{i32 17, i32 3, !7, null}<br>
-!12 = !{i32 18, i32 3, !7, null}<br>
+!9 = !MDLocation(line: 15, column: 12, scope: !7)<br>
+!10 = !MDLocation(line: 23, column: 3, scope: !7)<br>
+!11 = !MDLocation(line: 17, column: 3, scope: !7)<br>
+!12 = !MDLocation(line: 18, column: 3, scope: !7)<br>
!13 = !{!0}<br>
!14 = !{!6}<br>
!15 = !{!"mu.c", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll Wed Jan 14 16:27:36 2015<br>
@@ -99,28 +99,28 @@ entry:<br>
!24 = !{null}<br>
!25 = !{!"0x2e\00~A\00~A\00_ZN1AD2Ev\002\000\001\000\006\00256\000\000", !51, !3, !23, null, void (%class.A*)* @_ZN1AD2Ev, null, null, null} ; [ DW_TAG_subprogram ] [line 2] [def] [scope 0] [~A]<br>
!26 = !{!"0x101\00i\0016777220\000", !19, !3, !6} ; [ DW_TAG_arg_variable ]<br>
-!27 = !{i32 4, i32 11, !19, null}<br>
+!27 = !MDLocation(line: 4, column: 11, scope: !19)<br>
!28 = !{!"0x100\00j\005\000", !29, !3, !6} ; [ DW_TAG_auto_variable ]<br>
!29 = !{!"0xb\004\0014\000", !51, !19} ; [ DW_TAG_lexical_block ]<br>
-!30 = !{i32 5, i32 7, !29, null}<br>
-!31 = !{i32 5, i32 12, !29, null}<br>
-!32 = !{i32 6, i32 3, !29, null}<br>
-!33 = !{i32 7, i32 5, !34, null}<br>
+!30 = !MDLocation(line: 5, column: 7, scope: !29)<br>
+!31 = !MDLocation(line: 5, column: 12, scope: !29)<br>
+!32 = !MDLocation(line: 6, column: 3, scope: !29)<br>
+!33 = !MDLocation(line: 7, column: 5, scope: !34)<br>
!34 = !{!"0xb\006\0016\001", !51, !29} ; [ DW_TAG_lexical_block ]<br>
-!35 = !{i32 8, i32 3, !34, null}<br>
-!36 = !{i32 9, i32 9, !29, null}<br>
+!35 = !MDLocation(line: 8, column: 3, scope: !34)<br>
+!36 = !MDLocation(line: 9, column: 9, scope: !29)<br>
!37 = !{!"0x100\00my_a\009\000", !29, !3, !38} ; [ DW_TAG_auto_variable ]<br>
!38 = !{!"0x10\00\000\000\000\000\000", !2, null, !1} ; [ DW_TAG_reference_type ]<br>
-!39 = !{i32 9, i32 5, !29, null}<br>
-!40 = !{i32 10, i32 3, !29, null}<br>
-!41 = !{i32 11, i32 3, !29, null}<br>
-!42 = !{i32 12, i32 1, !29, null}<br>
+!39 = !MDLocation(line: 9, column: 5, scope: !29)<br>
+!40 = !MDLocation(line: 10, column: 3, scope: !29)<br>
+!41 = !MDLocation(line: 11, column: 3, scope: !29)<br>
+!42 = !MDLocation(line: 12, column: 1, scope: !29)<br>
!43 = !{!"0x101\00this\0016777218\0064", !22, !3, !13} ; [ DW_TAG_arg_variable ]<br>
-!44 = !{i32 2, i32 47, !22, null}<br>
-!45 = !{i32 2, i32 61, !22, null}<br>
+!44 = !MDLocation(line: 2, column: 47, scope: !22)<br>
+!45 = !MDLocation(line: 2, column: 61, scope: !22)<br>
!46 = !{!"0x101\00this\0016777218\0064", !25, !3, !13} ; [ DW_TAG_arg_variable ]<br>
-!47 = !{i32 2, i32 47, !25, null}<br>
-!48 = !{i32 2, i32 54, !49, null}<br>
+!47 = !MDLocation(line: 2, column: 47, scope: !25)<br>
+!48 = !MDLocation(line: 2, column: 54, scope: !49)<br>
!49 = !{!"0xb\002\0052\002", !51, !25} ; [ DW_TAG_lexical_block ]<br>
!50 = !{!19, !22, !25}<br>
!51 = !{!"a.cc", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-declare.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-declare.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-declare.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-declare.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-declare.ll Wed Jan 14 16:27:36 2015<br>
@@ -41,16 +41,16 @@ declare void @llvm.stackrestore(i8*) nou<br>
!10 = !{!"0xf\00\000\0064\0064\000\000", null, null, !11} ; [ DW_TAG_pointer_type ]<br>
!11 = !{!"0x26\00\000\000\000\000\000", null, null, !9} ; [ DW_TAG_const_type ]<br>
!14 = !{!"0x101\00x\0016777221\000", !5, !6, !10} ; [ DW_TAG_arg_variable ]<br>
-!15 = !{i32 5, i32 21, !5, null}<br>
-!16 = !{i32 7, i32 13, !17, null}<br>
+!15 = !MDLocation(line: 5, column: 21, scope: !5)<br>
+!16 = !MDLocation(line: 7, column: 13, scope: !17)<br>
!17 = !{!"0xb\006\001\000", !26, !5} ; [ DW_TAG_lexical_block ]<br>
!18 = !{!"0x100\00a\007\000", !17, !6, !19} ; [ DW_TAG_auto_variable ]<br>
!19 = !{!"0x1\00\000\000\008\000\000", null, null, !20, !21, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 0, align 8, offset 0] [from char]<br>
!20 = !{!"0x24\00char\000\008\008\000\000\006", null, null} ; [ DW_TAG_base_type ]<br>
!21 = !{!22}<br>
!22 = !{!"0x21\000\00-1"} ; [ DW_TAG_subrange_type ]<br>
-!23 = !{i32 7, i32 8, !17, null}<br>
-!24 = !{i32 9, i32 1, !17, null}<br>
-!25 = !{i32 8, i32 3, !17, null}<br>
+!23 = !MDLocation(line: 7, column: 8, scope: !17)<br>
+!24 = !MDLocation(line: 9, column: 1, scope: !17)<br>
+!25 = !MDLocation(line: 8, column: 3, scope: !17)<br>
!26 = !{!"20020104-2.c", !"/Volumes/Sandbox/llvm"}<br>
!27 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-i128-const.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-i128-const.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-i128-const.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-i128-const.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-i128-const.ll Wed Jan 14 16:27:36 2015<br>
@@ -26,7 +26,7 @@ declare void @llvm.dbg.value(metadata, i<br>
!8 = !{!"0x16\00ti_int\0078\000\000\000\000", !14, !4, !10} ; [ DW_TAG_typedef ]<br>
!9 = !{!"0x29", !14} ; [ DW_TAG_file_type ]<br>
!10 = !{!"0x24\00\000\00128\00128\000\000\005", !13, !4} ; [ DW_TAG_base_type ]<br>
-!11 = !{i32 29, i32 0, !2, null}<br>
+!11 = !MDLocation(line: 29, scope: !2)<br>
!12 = !{!3}<br>
!13 = !{!"foo.c", !"/tmp"}<br>
!14 = !{!"myint.h", !"/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-merge-loc-entry.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-merge-loc-entry.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-merge-loc-entry.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-merge-loc-entry.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-merge-loc-entry.ll Wed Jan 14 16:27:36 2015<br>
@@ -55,19 +55,19 @@ declare %0 @llvm.uadd.with.overflow.i64(<br>
!12 = !{!"0x16\00TItype\00160\000\000\000\000", !30, !6, !13} ; [ DW_TAG_typedef ]<br>
!13 = !{!"0x24\00\000\00128\00128\000\000\005", !29, !1} ; [ DW_TAG_base_type ]<br>
!14 = !{!"0x101\00u\001093\000", !9, !1, !12} ; [ DW_TAG_arg_variable ]<br>
-!15 = !{i32 1093, i32 0, !9, null}<br>
+!15 = !MDLocation(line: 1093, scope: !9)<br>
!16 = !{i64 0}<br>
!17 = !{!"0x100\00c\001095\000", !18, !1, !19} ; [ DW_TAG_auto_variable ]<br>
!18 = !{!"0xb\001094\000\0013", !29, !9} ; [ DW_TAG_lexical_block ]<br>
!19 = !{!"0x16\00word_type\00424\000\000\000\000", !30, !6, !20} ; [ DW_TAG_typedef ]<br>
!20 = !{!"0x24\00long int\000\0064\0064\000\000\005", !29, !1} ; [ DW_TAG_base_type ]<br>
-!21 = !{i32 1095, i32 0, !18, null}<br>
-!22 = !{i32 1103, i32 0, !18, null}<br>
-!23 = !{i32 1104, i32 0, !18, null}<br>
-!24 = !{i32 1003, i32 0, !25, !26}<br>
+!21 = !MDLocation(line: 1095, scope: !18)<br>
+!22 = !MDLocation(line: 1103, scope: !18)<br>
+!23 = !MDLocation(line: 1104, scope: !18)<br>
+!24 = !MDLocation(line: 1003, scope: !25, inlinedAt: !26)<br>
!25 = !{!"0xb\00879\000\000", !29, !0} ; [ DW_TAG_lexical_block ]<br>
-!26 = !{i32 1107, i32 0, !18, null}<br>
-!27 = !{i32 1111, i32 0, !18, null}<br>
+!26 = !MDLocation(line: 1107, scope: !18)<br>
+!27 = !MDLocation(line: 1111, scope: !18)<br>
!28 = !{!0, !9}<br>
!29 = !{!"foobar.c", !"/tmp"}<br>
!30 = !{!"foobar.h", !"/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-prolog-end.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-prolog-end.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-prolog-end.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-prolog-end.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-prolog-end.ll Wed Jan 14 16:27:36 2015<br>
@@ -44,15 +44,15 @@ entry:<br>
!5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ]<br>
!6 = !{!"0x2e\00main\00main\00\007\000\001\000\006\000\000\007", !19, !2, !3, null, i32 ()* @main, null, null, null} ; [ DW_TAG_subprogram ] [line 7] [def] [main]<br>
!7 = !{!"0x101\00i\0016777217\000", !1, !2, !5} ; [ DW_TAG_arg_variable ]<br>
-!8 = !{i32 1, i32 13, !1, null}<br>
+!8 = !MDLocation(line: 1, column: 13, scope: !1)<br>
!9 = !{!"0x100\00j\002\000", !10, !2, !5} ; [ DW_TAG_auto_variable ]<br>
!10 = !{!"0xb\001\0016\000", !19, !1} ; [ DW_TAG_lexical_block ]<br>
-!11 = !{i32 2, i32 6, !10, null}<br>
-!12 = !{i32 2, i32 11, !10, null}<br>
-!13 = !{i32 3, i32 2, !10, null}<br>
-!14 = !{i32 4, i32 2, !10, null}<br>
-!15 = !{i32 5, i32 2, !10, null}<br>
-!16 = !{i32 8, i32 2, !17, null}<br>
+!11 = !MDLocation(line: 2, column: 6, scope: !10)<br>
+!12 = !MDLocation(line: 2, column: 11, scope: !10)<br>
+!13 = !MDLocation(line: 3, column: 2, scope: !10)<br>
+!14 = !MDLocation(line: 4, column: 2, scope: !10)<br>
+!15 = !MDLocation(line: 5, column: 2, scope: !10)<br>
+!16 = !MDLocation(line: 8, column: 2, scope: !17)<br>
!17 = !{!"0xb\007\0012\001", !19, !6} ; [ DW_TAG_lexical_block ]<br>
!19 = !{!"/tmp/a.c", !"/private/tmp"}<br>
!20 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-subrange.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-subrange.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-subrange.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-subrange.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-subrange.ll Wed Jan 14 16:27:36 2015<br>
@@ -28,8 +28,8 @@ entry:<br>
!15 = !{!"0x24\00char\000\008\008\000\000\006", null, null} ; [ DW_TAG_base_type ]<br>
!16 = !{!17}<br>
!17 = !{!"0x21\000\004294967296"} ; [ DW_TAG_subrange_type ]<br>
-!18 = !{i32 5, i32 3, !19, null}<br>
+!18 = !MDLocation(line: 5, column: 3, scope: !19)<br>
!19 = !{!"0xb\004\001\000", !21, !5} ; [ DW_TAG_lexical_block ]<br>
-!20 = !{i32 6, i32 1, !19, null}<br>
+!20 = !MDLocation(line: 6, column: 1, scope: !19)<br>
!21 = !{!"small.c", !"/private/tmp"}<br>
!22 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-value-const-byref.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-const-byref.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-const-byref.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-value-const-byref.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-value-const-byref.ll Wed Jan 14 16:27:36 2015<br>
@@ -93,14 +93,14 @@ attributes #3 = { nounwind }<br>
!12 = !{i32 1, !"Debug Info Version", i32 2}<br>
!13 = !{!"clang version 3.5.0 "}<br>
!14 = !{i32 3}<br>
-!15 = !{i32 6, i32 0, !4, null}<br>
-!16 = !{i32 7, i32 0, !4, null}<br>
+!15 = !MDLocation(line: 6, scope: !4)<br>
+!16 = !MDLocation(line: 7, scope: !4)<br>
!17 = !{i32 7}<br>
-!18 = !{i32 8, i32 0, !4, null}<br>
-!19 = !{i32 9, i32 0, !4, null}<br>
+!18 = !MDLocation(line: 8, scope: !4)<br>
+!19 = !MDLocation(line: 9, scope: !4)<br>
!20 = !{!21, !21, i64 0}<br>
!21 = !{!"int", !22, i64 0}<br>
!22 = !{!"omnipotent char", !23, i64 0}<br>
!23 = !{!"Simple C/C++ TBAA"}<br>
-!24 = !{i32 10, i32 0, !4, null}<br>
-!25 = !{i32 11, i32 0, !4, null}<br>
+!24 = !MDLocation(line: 10, scope: !4)<br>
+!25 = !MDLocation(line: 11, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-value-dag-combine.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-dag-combine.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-dag-combine.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-value-dag-combine.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-value-dag-combine.ll Wed Jan 14 16:27:36 2015<br>
@@ -32,16 +32,16 @@ entry:<br>
!5 = !{!"0xf\00\000\0032\0032\000\000", null, !2, !6} ; [ DW_TAG_pointer_type ]<br>
!6 = !{!"0x24\00unsigned int\000\0032\0032\000\000\007", null, !2} ; [ DW_TAG_base_type ]<br>
!7 = !{!"0x101\00ip\001\000", !0, !1, !5} ; [ DW_TAG_arg_variable ]<br>
-!8 = !{i32 1, i32 42, !0, null}<br>
+!8 = !MDLocation(line: 1, column: 42, scope: !0)<br>
!9 = !{!"0x100\00gid\003\000", !10, !1, !6} ; [ DW_TAG_auto_variable ]<br>
!10 = !{!"0xb\002\001\000", !19, !0} ; [ DW_TAG_lexical_block ]<br>
-!11 = !{i32 3, i32 41, !10, null}<br>
+!11 = !MDLocation(line: 3, column: 41, scope: !10)<br>
!12 = !{i32 0}<br>
!13 = !{!"0x100\00idx\004\000", !10, !1, !6} ; [ DW_TAG_auto_variable ]<br>
-!14 = !{i32 4, i32 20, !10, null}<br>
-!15 = !{i32 5, i32 15, !10, null}<br>
-!16 = !{i32 6, i32 18, !10, null}<br>
-!17 = !{i32 7, i32 1, !0, null}<br>
+!14 = !MDLocation(line: 4, column: 20, scope: !10)<br>
+!15 = !MDLocation(line: 5, column: 15, scope: !10)<br>
+!16 = !MDLocation(line: 6, column: 18, scope: !10)<br>
+!17 = !MDLocation(line: 7, column: 1, scope: !0)<br>
!18 = !{!0}<br>
!19 = !{!"<a href="http://OCL6368.tmp.cl" target="_blank">OCL6368.tmp.cl</a>", !"E:\5CUsers\5Cmvillmow.AMD\5CAppData\5CLocal\5CTemp"}<br>
!20 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-value-inlined-parameter.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-inlined-parameter.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-inlined-parameter.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-value-inlined-parameter.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-value-inlined-parameter.ll Wed Jan 14 16:27:36 2015<br>
@@ -94,21 +94,21 @@ declare void @llvm.dbg.value(metadata, i<br>
!17 = !{!"0xd\00nums\003\0032\0032\0064\000", !42, !1, !5} ; [ DW_TAG_member ]<br>
!18 = !{!"0x101\00nums\0033554439\000", !0, !1, !5, !32} ; [ DW_TAG_arg_variable ]<br>
!19 = !{!"0x34\00p\00p\00\0014\000\001", !2, !1, !11, %struct.S1* @p, null} ; [ DW_TAG_variable ]<br>
-!20 = !{i32 7, i32 13, !0, null}<br>
-!21 = !{i32 7, i32 21, !0, null}<br>
-!22 = !{i32 9, i32 3, !23, null}<br>
+!20 = !MDLocation(line: 7, column: 13, scope: !0)<br>
+!21 = !MDLocation(line: 7, column: 21, scope: !0)<br>
+!22 = !MDLocation(line: 9, column: 3, scope: !23)<br>
!23 = !{!"0xb\008\001\000", !1, !0} ; [ DW_TAG_lexical_block ]<br>
-!27 = !{i32 10, i32 3, !23, null}<br>
-!29 = !{i32 11, i32 3, !23, null}<br>
+!27 = !MDLocation(line: 10, column: 3, scope: !23)<br>
+!29 = !MDLocation(line: 11, column: 3, scope: !23)<br>
!30 = !{%struct.S1* @p}<br>
-!31 = !{i32 7, i32 13, !0, !32}<br>
-!32 = !{i32 16, i32 3, !33, null}<br>
+!31 = !MDLocation(line: 7, column: 13, scope: !0, inlinedAt: !32)<br>
+!32 = !MDLocation(line: 16, column: 3, scope: !33)<br>
!33 = !{!"0xb\0015\0015\001", !1, !6} ; [ DW_TAG_lexical_block ]<br>
!34 = !{i32 1}<br>
-!35 = !{i32 7, i32 21, !0, !32}<br>
-!36 = !{i32 9, i32 3, !23, !32}<br>
-!37 = !{i32 10, i32 3, !23, !32}<br>
-!38 = !{i32 17, i32 1, !33, null}<br>
+!35 = !MDLocation(line: 7, column: 21, scope: !0, inlinedAt: !32)<br>
+!36 = !MDLocation(line: 9, column: 3, scope: !23, inlinedAt: !32)<br>
+!37 = !MDLocation(line: 10, column: 3, scope: !23, inlinedAt: !32)<br>
+!38 = !MDLocation(line: 17, column: 1, scope: !33)<br>
!39 = !{!0, !6}<br>
!40 = !{!19}<br>
!41 = !{!9, !18}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-value-isel.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-isel.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-isel.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-value-isel.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-value-isel.ll Wed Jan 14 16:27:36 2015<br>
@@ -90,16 +90,16 @@ declare void @llvm.dbg.value(metadata, i<br>
!6 = !{!"0x16\00uint\000\000\000\000\000", !20, !2, !7} ; [ DW_TAG_typedef ]<br>
!7 = !{!"0x24\00unsigned int\000\0032\0032\000\000\007", null, !2} ; [ DW_TAG_base_type ]<br>
!8 = !{!"0x101\00ip\001\000", !0, !1, !5} ; [ DW_TAG_arg_variable ]<br>
-!9 = !{i32 1, i32 32, !0, null}<br>
+!9 = !MDLocation(line: 1, column: 32, scope: !0)<br>
!10 = !{!"0x100\00tid\003\000", !11, !1, !6} ; [ DW_TAG_auto_variable ]<br>
!11 = !{!"0xb\002\001\001", !1, !0} ; [ DW_TAG_lexical_block ]<br>
-!12 = !{i32 5, i32 24, !11, null}<br>
+!12 = !MDLocation(line: 5, column: 24, scope: !11)<br>
!13 = !{!"0x100\00gid\003\000", !11, !1, !6} ; [ DW_TAG_auto_variable ]<br>
-!14 = !{i32 6, i32 25, !11, null}<br>
+!14 = !MDLocation(line: 6, column: 25, scope: !11)<br>
!15 = !{!"0x100\00lsz\003\000", !11, !1, !6} ; [ DW_TAG_auto_variable ]<br>
-!16 = !{i32 7, i32 26, !11, null}<br>
-!17 = !{i32 9, i32 24, !11, null}<br>
-!18 = !{i32 10, i32 1, !0, null}<br>
+!16 = !MDLocation(line: 7, column: 26, scope: !11)<br>
+!17 = !MDLocation(line: 9, column: 24, scope: !11)<br>
+!18 = !MDLocation(line: 10, column: 1, scope: !0)<br>
!19 = !{!0}<br>
!20 = !{!"OCLlLwTXZ.cl", !"/tmp"}<br>
!21 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-value-location.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-location.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-location.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-value-location.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-value-location.ll Wed Jan 14 16:27:36 2015<br>
@@ -63,14 +63,14 @@ declare void @llvm.dbg.value(metadata, i<br>
!10 = !{!11}<br>
!11 = !{!"0x24\00unsigned char\000\008\008\000\000\008", null, !2} ; [ DW_TAG_base_type ]<br>
!12 = !{!"0x101\00var\0019509\000", !0, !1, !5} ; [ DW_TAG_arg_variable ]<br>
-!13 = !{i32 19509, i32 20, !0, null}<br>
-!14 = !{i32 18091, i32 2, !15, !17}<br>
+!13 = !MDLocation(line: 19509, column: 20, scope: !0)<br>
+!14 = !MDLocation(line: 18091, column: 2, scope: !15, inlinedAt: !17)<br>
!15 = !{!"0xb\0018086\001\00748", !26, !16} ; [ DW_TAG_lexical_block ]<br>
!16 = !{!"0x2e\00foo_bar\00foo_bar\00\0018086\001\001\000\006\00256\001\000", !26, !1, !3, null, null, null, null, null} ; [ DW_TAG_subprogram ] [line 18086] [local] [def] [scope 0] [foo_bar]<br>
-!17 = !{i32 19514, i32 2, !18, null}<br>
+!17 = !MDLocation(line: 19514, column: 2, scope: !18)<br>
!18 = !{!"0xb\0019510\001\0099", !26, !0} ; [ DW_TAG_lexical_block ]<br>
-!22 = !{i32 18094, i32 2, !15, !17}<br>
-!23 = !{i32 19524, i32 1, !18, null}<br>
+!22 = !MDLocation(line: 18094, column: 2, scope: !15, inlinedAt: !17)<br>
+!23 = !MDLocation(line: 19524, column: 1, scope: !18)<br>
!24 = !{!0, !6, !7, !8, !16}<br>
!25 = !{!"0x29", !27} ; [ DW_TAG_file_type ]<br>
!26 = !{!"/tmp/f.c", !"/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-value-range.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-range.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-range.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-value-range.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-value-range.ll Wed Jan 14 16:27:36 2015<br>
@@ -33,10 +33,10 @@ declare void @llvm.dbg.value(metadata, i<br>
!10 = !{!"0xd\00c\002\0032\0032\000\000", !22, !1, !5} ; [ DW_TAG_member ]<br>
!11 = !{!"0x100\00x\006\000", !12, !1, !5} ; [ DW_TAG_auto_variable ]<br>
!12 = !{!"0xb\005\0022\000", !22, !0} ; [ DW_TAG_lexical_block ]<br>
-!13 = !{i32 5, i32 19, !0, null}<br>
-!14 = !{i32 6, i32 14, !12, null}<br>
-!18 = !{i32 7, i32 2, !12, null}<br>
-!19 = !{i32 8, i32 2, !12, null}<br>
+!13 = !MDLocation(line: 5, column: 19, scope: !0)<br>
+!14 = !MDLocation(line: 6, column: 14, scope: !12)<br>
+!18 = !MDLocation(line: 7, column: 2, scope: !12)<br>
+!19 = !MDLocation(line: 8, column: 2, scope: !12)<br>
!20 = !{!0}<br>
!21 = !{!6, !11}<br>
!22 = !{!"bar.c", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg-value-terminator.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-terminator.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-value-terminator.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg-value-terminator.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg-value-terminator.ll Wed Jan 14 16:27:36 2015<br>
@@ -125,7 +125,7 @@ declare void @llvm.dbg.value(metadata, i<br>
!9 = !{!"0x24\00char\000\008\008\000\000\006", null, !0} ; [ DW_TAG_base_type ]<br>
!10 = !{!"0x100\00a\003\000", !11, !2, !9} ; [ DW_TAG_auto_variable ]<br>
!11 = !{!"0xb\002\0025\000", !20, !1} ; [ DW_TAG_lexical_block ]<br>
-!12 = !{i32 2, i32 13, !1, null}<br>
+!12 = !MDLocation(line: 2, column: 13, scope: !1)<br>
!18 = !{!1}<br>
!19 = !{!6, !7, !10}<br>
!20 = !{!"a.c", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dbg_value_direct.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg_value_direct.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg_value_direct.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dbg_value_direct.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dbg_value_direct.ll Wed Jan 14 16:27:36 2015<br>
@@ -172,7 +172,7 @@ attributes #2 = { "less-precise-fpmad"="<br>
!22 = !{i32 2, !"Dwarf Version", i32 3}<br>
!23 = !{!"0x101\00\0016777222\000", !4, !5, !21} ; [ DW_TAG_arg_variable ] [line 6]<br>
!24 = !{!"0x100\00a\007\008192", !4, !5, !8} ; [ DW_TAG_auto_variable ] [a] [line 7]<br>
-!25 = !{i32 7, i32 0, !4, null}<br>
-!26 = !{i32 8, i32 0, !4, null}<br>
+!25 = !MDLocation(line: 7, scope: !4)<br>
+!26 = !MDLocation(line: 8, scope: !4)<br>
!27 = !{i32 1, !"Debug Info Version", i32 2}<br>
!28 = !{!"0x102\006"} ; [ DW_TAG_expression ] [DW_OP_deref]<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/debug-dead-local-var.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-dead-local-var.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-dead-local-var.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/debug-dead-local-var.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/debug-dead-local-var.ll Wed Jan 14 16:27:36 2015<br>
@@ -48,4 +48,4 @@ attributes #0 = { nounwind readnone uwta<br>
!18 = !{i32 2, !"Dwarf Version", i32 4}<br>
!19 = !{i32 2, !"Debug Info Version", i32 2}<br>
!20 = !{!"clang version 3.5.0 (trunk 209255) (llvm/trunk 209253)"}<br>
-!21 = !{i32 13, i32 0, !4, null}<br>
+!21 = !MDLocation(line: 13, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/debug-info-access.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-info-access.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-info-access.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/debug-info-access.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/debug-info-access.ll Wed Jan 14 16:27:36 2015<br>
@@ -147,4 +147,4 @@ attributes #0 = { nounwind ssp uwtable }<br>
!38 = !{i32 2, !"Dwarf Version", i32 2}<br>
!39 = !{i32 2, !"Debug Info Version", i32 2}<br>
!40 = !{!"clang version 3.6.0 "}<br>
-!41 = !{i32 35, i32 14, !30, null}<br>
+!41 = !MDLocation(line: 35, column: 14, scope: !30)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/debug-info-block-captured-self.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-info-block-captured-self.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-info-block-captured-self.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/debug-info-block-captured-self.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/debug-info-block-captured-self.ll Wed Jan 14 16:27:36 2015<br>
@@ -100,12 +100,12 @@ define internal void @"__24-[Main initWi<br>
!40 = !{null, !41, !27}<br>
!41 = !{!"0xf\00\000\0064\0064\000\000", null, null, null} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from ]<br>
!42 = !{!"0x2e\00__24-[Main initWithContext:]_block_invoke_2\00__24-[Main initWithContext:]_block_invoke_2\00\0035\001\001\000\006\00256\000\0035", !1, !1, !39, null, void (i8*, i8*)* @"__24-[Main initWithContext:]_block_invoke_2", null, null, !15} ; [ DW_TAG_subprogram ] [line 35] [local] [def] [__24-[Main initWithContext:]_block_invoke_2]<br>
-!84 = !{i32 33, i32 0, !38, null}<br>
+!84 = !MDLocation(line: 33, scope: !38)<br>
!86 = !{!"0x100\00self\0041\000", !38, !1, !34} ; [ DW_TAG_auto_variable ] [self] [line 41]<br>
-!87 = !{i32 41, i32 0, !38, null}<br>
-!103 = !{i32 35, i32 0, !42, null}<br>
+!87 = !MDLocation(line: 41, scope: !38)<br>
+!103 = !MDLocation(line: 35, scope: !42)<br>
!105 = !{!"0x100\00self\0040\000", !42, !1, !34} ; [ DW_TAG_auto_variable ] [self] [line 40]<br>
-!106 = !{i32 40, i32 0, !42, null}<br>
+!106 = !MDLocation(line: 40, scope: !42)<br>
!107 = !{!"llvm/tools/clang/test/CodeGenObjC/debug-info-block-captured-self.m", !""}<br>
!108 = !{i32 1, !"Debug Info Version", i32 2}<br>
!109 = !{!"0x102\0034\0032"} ; [ DW_TAG_expression ] [DW_OP_plus 32]<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/debug-info-blocks.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-info-blocks.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-info-blocks.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/debug-info-blocks.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/debug-info-blocks.ll Wed Jan 14 16:27:36 2015<br>
@@ -332,20 +332,20 @@ attributes #3 = { nounwind }<br>
!59 = !{i32 4, !"Objective-C Garbage Collection", i32 0}<br>
!60 = !{!"0x101\00self\0016777262\001088", !13, !32, !61} ; [ DW_TAG_arg_variable ] [self] [line 46]<br>
!61 = !{!"0xf\00\000\0064\0064\000\000", null, null, !4} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from A]<br>
-!62 = !{i32 46, i32 0, !13, null}<br>
+!62 = !MDLocation(line: 46, scope: !13)<br>
!63 = !{!"0x101\00_cmd\0033554478\0064", !13, !32, !64} ; [ DW_TAG_arg_variable ] [_cmd] [line 46]<br>
!64 = !{!"0x16\00SEL\0046\000\000\000\000", !5, null, !25} ; [ DW_TAG_typedef ] [SEL] [line 46, size 0, align 0, offset 0] [from ]<br>
-!65 = !{i32 48, i32 0, !66, null}<br>
+!65 = !MDLocation(line: 48, scope: !66)<br>
!66 = !{!"0xb\0047\000\000", !5, !13} ; [ DW_TAG_lexical_block ] [llvm/tools/clang/test/CodeGenObjC/debug-info-blocks.m]<br>
!67 = !{}<br>
-!68 = !{i32 49, i32 0, !69, null}<br>
+!68 = !MDLocation(line: 49, scope: !69)<br>
!69 = !{!"0xb\0048\000\001", !5, !66} ; [ DW_TAG_lexical_block ] [llvm/tools/clang/test/CodeGenObjC/debug-info-blocks.m]<br>
-!70 = !{i32 53, i32 0, !69, null}<br>
-!71 = !{i32 54, i32 0, !66, null}<br>
+!70 = !MDLocation(line: 53, scope: !69)<br>
+!71 = !MDLocation(line: 54, scope: !66)<br>
!72 = !{!"0x101\00block\0016777255\000", !39, !6, !42} ; [ DW_TAG_arg_variable ] [block] [line 39]<br>
-!73 = !{i32 39, i32 0, !39, null}<br>
-!74 = !{i32 41, i32 0, !39, null}<br>
-!75 = !{i32 42, i32 0, !39, null}<br>
+!73 = !MDLocation(line: 39, scope: !39)<br>
+!74 = !MDLocation(line: 41, scope: !39)<br>
+!75 = !MDLocation(line: 42, scope: !39)<br>
!76 = !{!"0x101\00.block_descriptor\0016777265\0064", !27, !6, !77} ; [ DW_TAG_arg_variable ] [.block_descriptor] [line 49]<br>
!77 = !{!"0xf\00\000\0064\000\000\000", null, null, !78} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 0, offset 0] [from __block_literal_1]<br>
!78 = !{!"0x13\00__block_literal_1\0049\00320\0064\000\000\000", !5, !6, null, !79, null, null, null} ; [ DW_TAG_structure_type ] [__block_literal_1] [line 49, size 320, align 64, offset 0] [def] [from ]<br>
@@ -358,9 +358,9 @@ attributes #3 = { nounwind }<br>
!85 = !{!"0xf\00\000\0064\0064\000\000", null, null, !86} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from __block_descriptor_withcopydispose]<br>
!86 = !{!"0x13\00__block_descriptor_withcopydispose\0049\000\000\000\004\000", !1, null, null, null, null, null, null} ; [ DW_TAG_structure_type ] [__block_descriptor_withcopydispose] [line 49, size 0, align 0, offset 0] [decl] [from ]<br>
!87 = !{!"0xd\00self\0049\0064\0064\00256\000", !5, !6, !61} ; [ DW_TAG_member ] [self] [line 49, size 64, align 64, offset 256] [from ]<br>
-!88 = !{i32 49, i32 0, !27, null}<br>
+!88 = !MDLocation(line: 49, scope: !27)<br>
!89 = !{!"0x100\00self\0052\000", !27, !32, !23} ; [ DW_TAG_auto_variable ] [self] [line 52]<br>
-!90 = !{i32 52, i32 0, !27, null}<br>
+!90 = !MDLocation(line: 52, scope: !27)<br>
!91 = !{!"0x100\00d\0050\000", !92, !6, !93} ; [ DW_TAG_auto_variable ] [d] [line 50]<br>
!92 = !{!"0xb\0049\000\002", !5, !27} ; [ DW_TAG_lexical_block ] [llvm/tools/clang/test/CodeGenObjC/debug-info-blocks.m]<br>
!93 = !{!"0xf\00\000\0064\0064\000\000", null, null, !94} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from NSMutableDictionary]<br>
@@ -370,15 +370,15 @@ attributes #3 = { nounwind }<br>
!97 = !{!"0x13\00NSDictionary\0026\000\008\000\000\0016", !5, !6, null, !98, null, null, null} ; [ DW_TAG_structure_type ] [NSDictionary] [line 26, size 0, align 8, offset 0] [def] [from ]<br>
!98 = !{!99}<br>
!99 = !{!"0x1c\00\000\000\000\000\000", null, !97, !9} ; [ DW_TAG_inheritance ] [line 0, size 0, align 0, offset 0] [from NSObject]<br>
-!100 = !{i32 50, i32 0, !92, null}<br>
-!101 = !{i32 51, i32 0, !92, null}<br>
+!100 = !MDLocation(line: 50, scope: !92)<br>
+!101 = !MDLocation(line: 51, scope: !92)<br>
!102 = !{!"0x101\00\0016777268\001088", !31, !32, !30} ; [ DW_TAG_arg_variable ] [line 52]<br>
-!103 = !{i32 52, i32 0, !31, null}<br>
+!103 = !MDLocation(line: 52, scope: !31)<br>
!104 = !{!"0x101\00\0033554484\0064", !31, !32, !30} ; [ DW_TAG_arg_variable ] [line 52]<br>
!105 = !{!"0x101\00\0016777268\001088", !35, !32, !30} ; [ DW_TAG_arg_variable ] [line 52]<br>
-!106 = !{i32 52, i32 0, !35, null}<br>
+!106 = !MDLocation(line: 52, scope: !35)<br>
!107 = !{!"0x100\00a\0061\000", !36, !6, !61} ; [ DW_TAG_auto_variable ] [a] [line 61]<br>
-!108 = !{i32 61, i32 0, !36, null}<br>
-!109 = !{i32 62, i32 0, !36, null}<br>
+!108 = !MDLocation(line: 61, scope: !36)<br>
+!109 = !MDLocation(line: 62, scope: !36)<br>
!110 = !{i32 1, !"Debug Info Version", i32 2}<br>
!111 = !{!"0x102\006\0034\0032"} ; [ DW_TAG_expression ] [DW_OP_deref DW_OP_plus 32]<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll Wed Jan 14 16:27:36 2015<br>
@@ -86,9 +86,9 @@ declare void @llvm.dbg.declare(metadata,<br>
!27 = !{!"0x34\00b\00b\00_ZN1C1bE\0015\000\001", null, !6, !9, i32* @_ZN1C1bE, !19} ; [ DW_TAG_variable ] [b] [line 15] [def]<br>
!28 = !{!"0x34\00c\00c\00_ZN1C1cE\0016\000\001", null, !6, !9, i32* @_ZN1C1cE, !23} ; [ DW_TAG_variable ] [c] [line 16] [def]<br>
!29 = !{!"0x100\00instance_C\0020\000", !5, !6, !13} ; [ DW_TAG_auto_variable ] [instance_C] [line 20]<br>
-!30 = !{i32 20, i32 0, !5, null}<br>
-!31 = !{i32 21, i32 0, !5, null}<br>
-!32 = !{i32 22, i32 0, !5, null}<br>
+!30 = !MDLocation(line: 20, scope: !5)<br>
+!31 = !MDLocation(line: 21, scope: !5)<br>
+!32 = !MDLocation(line: 22, scope: !5)<br>
!33 = !{!"/usr/local/google/home/blaikie/Development/llvm/src/tools/clang/test/CodeGenCXX/debug-info-static-member.cpp", !"/home/blaikie/local/Development/llvm/build/clang/x86-64/Debug/llvm"}<br>
; PRESENT verifies that static member declarations have these attributes:<br>
; external, declaration, accessibility, and either DW_AT_MIPS_linkage_name<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/debug-loc-asan.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-loc-asan.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-loc-asan.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/debug-loc-asan.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/debug-loc-asan.ll Wed Jan 14 16:27:36 2015<br>
@@ -178,5 +178,5 @@ attributes #1 = { nounwind readnone }<br>
!10 = !{i32 2, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5.0 (209308)"}<br>
!12 = !{!"0x101\00y\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [y] [line 1]<br>
-!13 = !{i32 2, i32 0, !4, null}<br>
+!13 = !MDLocation(line: 2, scope: !4)<br>
!14 = !{!"0x102\006"} ; [ DW_TAG_expression ] [DW_OP_deref]<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/debug-loc-offset.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-loc-offset.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-loc-offset.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/debug-loc-offset.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/debug-loc-offset.ll Wed Jan 14 16:27:36 2015<br>
@@ -138,16 +138,16 @@ attributes #2 = { "less-precise-fpmad"="<br>
!19 = !{i32 2, !"Debug Info Version", i32 2}<br>
!20 = !{!"clang version 3.5.0 (210479)"}<br>
!21 = !{!"0x101\00b\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [b] [line 1]<br>
-!22 = !{i32 1, i32 0, !4, null}<br>
-!23 = !{i32 2, i32 0, !4, null}<br>
+!22 = !MDLocation(line: 1, scope: !4)<br>
+!23 = !MDLocation(line: 2, scope: !4)<br>
!24 = !{!"0x101\00a\0016777222\008192", !14, !15, !"_ZTS1A"} ; [ DW_TAG_arg_variable ] [a] [line 6]<br>
-!25 = !{i32 6, i32 0, !14, null}<br>
+!25 = !MDLocation(line: 6, scope: !14)<br>
!26 = !{!"0x100\00z\007\000", !14, !15, !8} ; [ DW_TAG_auto_variable ] [z] [line 7]<br>
-!27 = !{i32 7, i32 0, !14, null}<br>
-!28 = !{i32 8, i32 0, !29, null}<br>
+!27 = !MDLocation(line: 7, scope: !14)<br>
+!28 = !MDLocation(line: 8, scope: !29)<br>
!29 = !{!"0xb\008\000\000", !10, !14} ; [ DW_TAG_lexical_block ] [/llvm_cmake_gcc/debug-loc-offset2.cc]<br>
-!30 = !{i32 9, i32 0, !29, null}<br>
-!31 = !{i32 10, i32 0, !32, null}<br>
+!30 = !MDLocation(line: 9, scope: !29)<br>
+!31 = !MDLocation(line: 10, scope: !32)<br>
!32 = !{!"0xb\0010\000\000", !10, !14} ; [ DW_TAG_lexical_block ] [/llvm_cmake_gcc/debug-loc-offset2.cc]<br>
-!33 = !{i32 11, i32 0, !32, null}<br>
-!34 = !{i32 12, i32 0, !14, null}<br>
+!33 = !MDLocation(line: 11, scope: !32)<br>
+!34 = !MDLocation(line: 12, scope: !14)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/debug-ranges-offset.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-ranges-offset.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-ranges-offset.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/debug-ranges-offset.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/debug-ranges-offset.ll Wed Jan 14 16:27:36 2015<br>
@@ -221,8 +221,8 @@ attributes #4 = { builtin }<br>
!16 = !{i32 2, !"Dwarf Version", i32 4}<br>
!17 = !{i32 1, !"Debug Info Version", i32 2}<br>
!18 = !{!"clang version 3.5.0 (trunk 207243) (llvm/trunk 207259)"}<br>
-!19 = !{i32 4, i32 0, !4, null}<br>
-!20 = !{i32 5, i32 0, !21, null}<br>
+!19 = !MDLocation(line: 4, scope: !4)<br>
+!20 = !MDLocation(line: 5, scope: !21)<br>
!21 = !{!"0xb\005\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/foo.cpp]<br>
!22 = !{!"branch_weights", i32 1000, i32 1}<br>
!23 = !{!24, !24, i64 0}<br>
@@ -230,12 +230,12 @@ attributes #4 = { builtin }<br>
!25 = !{!"omnipotent char", !26, i64 0}<br>
!26 = !{!"Simple C/C++ TBAA"}<br>
!27 = !{!"branch_weights", i32 1, i32 1000}<br>
-!28 = !{i32 6, i32 0, !21, null}<br>
-!29 = !{i32 7, i32 0, !4, null}<br>
-!30 = !{i32 4, i32 0, !4, !31}<br>
-!31 = !{i32 10, i32 0, !13, null}<br>
+!28 = !MDLocation(line: 6, scope: !21)<br>
+!29 = !MDLocation(line: 7, scope: !4)<br>
+!30 = !MDLocation(line: 4, scope: !4, inlinedAt: !31)<br>
+!31 = !MDLocation(line: 10, scope: !13)<br>
!32 = !{!"0x100\00p\004\000", !4, !5, !10, !31} ; [ DW_TAG_auto_variable ] [p] [line 4]<br>
-!33 = !{i32 5, i32 0, !21, !31}<br>
-!34 = !{i32 6, i32 0, !21, !31}<br>
-!35 = !{i32 7, i32 0, !4, !31}<br>
-!36 = !{i32 11, i32 0, !13, null}<br>
+!33 = !MDLocation(line: 5, scope: !21, inlinedAt: !31)<br>
+!34 = !MDLocation(line: 6, scope: !21, inlinedAt: !31)<br>
+!35 = !MDLocation(line: 7, scope: !4, inlinedAt: !31)<br>
+!36 = !MDLocation(line: 11, scope: !13)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/decl-derived-member.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/decl-derived-member.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/decl-derived-member.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/decl-derived-member.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/decl-derived-member.ll Wed Jan 14 16:27:36 2015<br>
@@ -127,18 +127,18 @@ attributes #4 = { "less-precise-fpmad"="<br>
!32 = !{i32 2, !"Dwarf Version", i32 4}<br>
!33 = !{i32 1, !"Debug Info Version", i32 2}<br>
!34 = !{!"clang version 3.5.0 (trunk 203673) (llvm/trunk 203681)"}<br>
-!35 = !{i32 9, i32 0, !9, null}<br>
+!35 = !MDLocation(line: 9, scope: !9)<br>
!36 = !{!"0x101\00this\0016777216\001088", !19, null, !37} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!37 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS3foo"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS3foo]<br>
-!38 = !{i32 0, i32 0, !19, null}<br>
-!39 = !{i32 5, i32 0, !19, null}<br>
+!38 = !MDLocation(line: 0, scope: !19)<br>
+!39 = !MDLocation(line: 5, scope: !19)<br>
!40 = !{!"0x101\00this\0016777216\001088", !13, null, !37} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!41 = !{i32 0, i32 0, !13, null}<br>
-!42 = !{i32 5, i32 0, !43, null}<br>
+!41 = !MDLocation(line: 0, scope: !13)<br>
+!42 = !MDLocation(line: 5, scope: !43)<br>
!43 = !{!"0xb\005\000\000", !1, !13} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/foo.cc]<br>
-!44 = !{i32 5, i32 0, !13, null}<br>
+!44 = !MDLocation(line: 5, scope: !13)<br>
!45 = !{!"0x101\00this\0016777216\001088", !22, null, !46} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!46 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS4base"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS4base]<br>
-!47 = !{i32 0, i32 0, !22, null}<br>
-!48 = !{i32 1, i32 0, !22, null}<br>
-!49 = !{i32 1, i32 0, !28, null}<br>
+!47 = !MDLocation(line: 0, scope: !22)<br>
+!48 = !MDLocation(line: 1, scope: !22)<br>
+!49 = !MDLocation(line: 1, scope: !28)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/discriminator.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/discriminator.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/discriminator.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/discriminator.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/discriminator.ll Wed Jan 14 16:27:36 2015<br>
@@ -51,11 +51,11 @@ attributes #0 = { nounwind uwtable "less<br>
!7 = !{i32 2, !"Dwarf Version", i32 4}<br>
!8 = !{i32 1, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.5 "}<br>
-!10 = !{i32 2, i32 0, !11, null}<br>
+!10 = !MDLocation(line: 2, scope: !11)<br>
!11 = !{!"0xb\002\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [./discriminator.c]<br>
-!12 = !{i32 3, i32 0, !4, null}<br>
-!13 = !{i32 4, i32 0, !4, null}<br>
-!14 = !{i32 2, i32 0, !15, null}<br>
+!12 = !MDLocation(line: 3, scope: !4)<br>
+!13 = !MDLocation(line: 4, scope: !4)<br>
+!14 = !MDLocation(line: 2, scope: !15)<br>
!15 = !{!"0xb\0042", !1, !4} ; [ DW_TAG_lexical_block ] [./discriminator.c]<br>
<br>
; CHECK: Address Line Column File ISA Discriminator Flags<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll Wed Jan 14 16:27:36 2015<br>
@@ -80,9 +80,9 @@ attributes #2 = { nounwind readnone }<br>
!17 = !{!18}<br>
!18 = !{!"0x34\00global\00global\00\001\000\001", null, !5, !8, i32* @global, null} ; [ DW_TAG_variable ] [global] [line 1] [def]<br>
!19 = !{i32 2, !"Dwarf Version", i32 4}<br>
-!20 = !{i32 2, i32 0, !4, null}<br>
-!21 = !{i32 3, i32 0, !11, null}<br>
-!22 = !{i32 6, i32 0, !14, null}<br>
+!20 = !MDLocation(line: 2, scope: !4)<br>
+!21 = !MDLocation(line: 3, scope: !11)<br>
+!22 = !MDLocation(line: 6, scope: !14)<br>
!23 = !{!"int", !24}<br>
!24 = !{!"omnipotent char", !25}<br>
!25 = !{!"Simple C/C++ TBAA"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dwarf-aranges.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarf-aranges.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarf-aranges.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dwarf-aranges.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dwarf-aranges.ll Wed Jan 14 16:27:36 2015<br>
@@ -76,6 +76,6 @@ entry:<br>
!11 = !{!"0x34\00some_other\00some_other\00\003\000\001", null, !5, !10, i32* @some_other, null} ; [ DW_TAG_variable ] [some_other] [line 3] [def]<br>
!12 = !{!"0x34\00some_bss\00some_bss\00\002\000\001", null, !5, !10, i32* @some_bss, null} ; [ DW_TAG_variable ] [some_bss] [line 2] [def]<br>
!13 = !{i32 2, !"Dwarf Version", i32 4}<br>
-!14 = !{i32 7, i32 0, !4, null}<br>
-!15 = !{i32 8, i32 0, !4, null}<br>
+!14 = !MDLocation(line: 7, scope: !4)<br>
+!15 = !MDLocation(line: 8, scope: !4)<br>
!16 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dwarf-public-names.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarf-public-names.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarf-public-names.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dwarf-public-names.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dwarf-public-names.ll Wed Jan 14 16:27:36 2015<br>
@@ -124,12 +124,12 @@ attributes #1 = { nounwind readnone }<br>
!27 = !{!"0x34\00global_namespace_variable\00global_namespace_variable\00_ZN2ns25global_namespace_variableE\0027\000\001", !21, !4, !11, i32* @_ZN2ns25global_namespace_variableE, null} ; [ DW_TAG_variable ] [global_namespace_variable] [line 27] [def]<br>
!28 = !{!"0x101\00this\0016777225\001088", !3, !4, !29} ; [ DW_TAG_arg_variable ] [this] [line 9]<br>
!29 = !{!"0xf\00\000\0064\0064\000\000", null, null, !8} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from C]<br>
-!30 = !{i32 9, i32 0, !3, null}<br>
-!31 = !{i32 10, i32 0, !3, null}<br>
-!32 = !{i32 11, i32 0, !3, null}<br>
-!33 = !{i32 14, i32 0, !18, null}<br>
-!34 = !{i32 20, i32 0, !19, null}<br>
-!35 = !{i32 25, i32 0, !20, null}<br>
-!36 = !{i32 26, i32 0, !20, null}<br>
+!30 = !MDLocation(line: 9, scope: !3)<br>
+!31 = !MDLocation(line: 10, scope: !3)<br>
+!32 = !MDLocation(line: 11, scope: !3)<br>
+!33 = !MDLocation(line: 14, scope: !18)<br>
+!34 = !MDLocation(line: 20, scope: !19)<br>
+!35 = !MDLocation(line: 25, scope: !20)<br>
+!36 = !MDLocation(line: 26, scope: !20)<br>
!37 = !{!"dwarf-public-names.cpp", !"/usr2/kparzysz/s.hex/t"}<br>
!38 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/dwarf-pubnames-split.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarf-pubnames-split.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarf-pubnames-split.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/dwarf-pubnames-split.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/dwarf-pubnames-split.ll Wed Jan 14 16:27:36 2015<br>
@@ -34,5 +34,5 @@ attributes #0 = { nounwind uwtable "less<br>
!7 = !{!8}<br>
!8 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
!9 = !{i32 2, !"Dwarf Version", i32 3}<br>
-!10 = !{i32 2, i32 0, !4, null}<br>
+!10 = !MDLocation(line: 2, scope: !4)<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/elf-names.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/elf-names.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/elf-names.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/elf-names.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/elf-names.ll Wed Jan 14 16:27:36 2015<br>
@@ -94,19 +94,19 @@ declare void @llvm.dbg.value(metadata, i<br>
!32 = !{!34, !35}<br>
!34 = !{!"0x101\00this\0016777235\001088", !31, !6, !30} ; [ DW_TAG_arg_variable ] [this] [line 19]<br>
!35 = !{!"0x101\00d\0033554451\000", !31, !6, !23} ; [ DW_TAG_arg_variable ] [d] [line 19]<br>
-!36 = !{i32 12, i32 0, !5, null}<br>
-!37 = !{i32 13, i32 0, !38, null}<br>
+!36 = !MDLocation(line: 12, scope: !5)<br>
+!37 = !MDLocation(line: 13, scope: !38)<br>
!38 = !{!"0xb\0012\000\000", !6, !5} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/foo.cpp]<br>
-!42 = !{i32 14, i32 0, !38, null}<br>
-!43 = !{i32 15, i32 0, !38, null}<br>
-!44 = !{i32 16, i32 0, !38, null}<br>
-!45 = !{i32 17, i32 0, !38, null}<br>
-!46 = !{i32 19, i32 0, !31, null}<br>
-!47 = !{i32 20, i32 0, !48, null}<br>
+!42 = !MDLocation(line: 14, scope: !38)<br>
+!43 = !MDLocation(line: 15, scope: !38)<br>
+!44 = !MDLocation(line: 16, scope: !38)<br>
+!45 = !MDLocation(line: 17, scope: !38)<br>
+!46 = !MDLocation(line: 19, scope: !31)<br>
+!47 = !MDLocation(line: 20, scope: !48)<br>
!48 = !{!"0xb\0019\000\001", !6, !31} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/foo.cpp]<br>
-!49 = !{i32 21, i32 0, !48, null}<br>
-!50 = !{i32 22, i32 0, !48, null}<br>
-!51 = !{i32 23, i32 0, !48, null}<br>
-!52 = !{i32 24, i32 0, !48, null}<br>
+!49 = !MDLocation(line: 21, scope: !48)<br>
+!50 = !MDLocation(line: 22, scope: !48)<br>
+!51 = !MDLocation(line: 23, scope: !48)<br>
+!52 = !MDLocation(line: 24, scope: !48)<br>
!53 = !{!"foo.cpp", !"/usr/local/google/home/echristo"}<br>
!54 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/empty-and-one-elem-array.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/empty-and-one-elem-array.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/empty-and-one-elem-array.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/empty-and-one-elem-array.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/empty-and-one-elem-array.ll Wed Jan 14 16:27:36 2015<br>
@@ -80,7 +80,7 @@ declare void @llvm.dbg.declare(metadata,<br>
!16 = !{!"0x1\00\000\0032\0032\000\000", null, null, !9, !17, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 32, align 32, offset 0] [from int]<br>
!17 = !{!18}<br>
!18 = !{!"0x21\000\001"} ; [ DW_TAG_subrange_type ] [0, 1]<br>
-!19 = !{i32 12, i32 0, !11, null}<br>
+!19 = !MDLocation(line: 12, scope: !11)<br>
!20 = !{!"0x100\00my_bar\0013\000", !11, !6, !21} ; [ DW_TAG_auto_variable ] [my_bar] [line 13]<br>
!21 = !{!"0x13\00bar\006\0032\0032\000\000\000", !32, null, null, !22, null, i32 0, null} ; [ DW_TAG_structure_type ] [bar] [line 6, size 32, align 32, offset 0] [def] [from ]<br>
!22 = !{!23, !24}<br>
@@ -89,9 +89,9 @@ declare void @llvm.dbg.declare(metadata,<br>
!25 = !{!"0x1\00\000\000\0032\000\000", null, null, !9, !26, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 0, align 32, offset 0] [from int]<br>
!26 = !{!27}<br>
!27 = !{!"0x21\000\000"} ; [ DW_TAG_subrange_type ] [0, 0]<br>
-!28 = !{i32 13, i32 0, !11, null}<br>
-!29 = !{i32 15, i32 0, !11, null}<br>
-!30 = !{i32 16, i32 0, !11, null}<br>
-!31 = !{i32 17, i32 0, !11, null}<br>
+!28 = !MDLocation(line: 13, scope: !11)<br>
+!29 = !MDLocation(line: 15, scope: !11)<br>
+!30 = !MDLocation(line: 16, scope: !11)<br>
+!31 = !MDLocation(line: 17, scope: !11)<br>
!32 = !{!"test.c", !"/Volumes/Sandbox/llvm"}<br>
!33 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/ending-run.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/ending-run.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/ending-run.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/ending-run.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/ending-run.ll Wed Jan 14 16:27:36 2015<br>
@@ -38,11 +38,11 @@ declare void @llvm.dbg.declare(metadata,<br>
!8 = !{!9, !9}<br>
!9 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]<br>
!12 = !{!"0x101\00x\0016777221\000", !5, !6, !9} ; [ DW_TAG_arg_variable ]<br>
-!13 = !{i32 5, i32 5, !5, null}<br>
+!13 = !MDLocation(line: 5, column: 5, scope: !5)<br>
!14 = !{!"0x100\00y\008\000", !15, !6, !9} ; [ DW_TAG_auto_variable ]<br>
!15 = !{!"0xb\007\001\000", !19, !5} ; [ DW_TAG_lexical_block ]<br>
-!16 = !{i32 8, i32 9, !15, null}<br>
-!17 = !{i32 8, i32 18, !15, null}<br>
-!18 = !{i32 9, i32 5, !15, null}<br>
+!16 = !MDLocation(line: 8, column: 9, scope: !15)<br>
+!17 = !MDLocation(line: 8, column: 18, scope: !15)<br>
+!18 = !MDLocation(line: 9, column: 5, scope: !15)<br>
!19 = !{!"ending-run.c", !"/Users/echristo/tmp"}<br>
!20 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/fission-inline.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/fission-inline.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/fission-inline.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/fission-inline.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/fission-inline.ll Wed Jan 14 16:27:36 2015<br>
@@ -112,8 +112,8 @@ attributes #1 = { "less-precise-fpmad"="<br>
!22 = !{i32 2, !"Dwarf Version", i32 4}<br>
!23 = !{i32 2, !"Debug Info Version", i32 2}<br>
!24 = !{!"clang version 3.6.0 "}<br>
-!25 = !{i32 17, i32 5, !20, null}<br>
-!26 = !{i32 11, i32 3, !11, !27}<br>
-!27 = !{i32 18, i32 5, !20, null}<br>
-!28 = !{i32 12, i32 3, !11, !27}<br>
-!29 = !{i32 21, i32 1, !10, null}<br>
+!25 = !MDLocation(line: 17, column: 5, scope: !20)<br>
+!26 = !MDLocation(line: 11, column: 3, scope: !11, inlinedAt: !27)<br>
+!27 = !MDLocation(line: 18, column: 5, scope: !20)<br>
+!28 = !MDLocation(line: 12, column: 3, scope: !11, inlinedAt: !27)<br>
+!29 = !MDLocation(line: 21, column: 1, scope: !10)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/fission-ranges.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/fission-ranges.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/fission-ranges.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/fission-ranges.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/fission-ranges.ll Wed Jan 14 16:27:36 2015<br>
@@ -180,21 +180,21 @@ attributes #1 = { nounwind readnone }<br>
!24 = !{!"0xb\007\000\000", !1, !8} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/small.c]<br>
!25 = !{!"0xf\00\000\0064\0064\000\000", null, null, !11} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from int]<br>
!26 = !{i32 2, !"Dwarf Version", i32 4}<br>
-!27 = !{i32 20, i32 0, !4, null}<br>
-!28 = !{i32 21, i32 0, !4, null}<br>
+!27 = !MDLocation(line: 20, scope: !4)<br>
+!28 = !MDLocation(line: 21, scope: !4)<br>
!29 = !{i32 1}<br>
-!30 = !{i32 2, i32 0, !8, null}<br>
-!31 = !{i32 7, i32 0, !24, null}<br>
-!32 = !{i32 13, i32 0, !20, null}<br>
+!30 = !MDLocation(line: 2, scope: !8)<br>
+!31 = !MDLocation(line: 7, scope: !24)<br>
+!32 = !MDLocation(line: 13, scope: !20)<br>
!33 = !{!34, !34, i64 0}<br>
!34 = !{!"int", !35, i64 0}<br>
!35 = !{!"omnipotent char", !36, i64 0}<br>
!36 = !{!"Simple C/C++ TBAA"}<br>
-!37 = !{i32 8, i32 0, !23, null}<br>
-!38 = !{i32 9, i32 0, !22, null}<br>
-!39 = !{i32 10, i32 0, !21, null}<br>
-!40 = !{i32 12, i32 0, !20, null}<br>
+!37 = !MDLocation(line: 8, scope: !23)<br>
+!38 = !MDLocation(line: 9, scope: !22)<br>
+!39 = !MDLocation(line: 10, scope: !21)<br>
+!40 = !MDLocation(line: 12, scope: !20)<br>
!41 = !{i32* @c}<br>
-!42 = !{i32 15, i32 0, !8, null}<br>
+!42 = !MDLocation(line: 15, scope: !8)<br>
!43 = !{i32 1, !"Debug Info Version", i32 2}<br>
!44 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/formal_parameter.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/formal_parameter.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/formal_parameter.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/formal_parameter.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/formal_parameter.ll Wed Jan 14 16:27:36 2015<br>
@@ -73,12 +73,12 @@ attributes #3 = { nounwind }<br>
!11 = !{i32 2, !"Dwarf Version", i32 2}<br>
!12 = !{i32 1, !"Debug Info Version", i32 2}<br>
!13 = !{!"clang version 3.5.0 "}<br>
-!14 = !{i32 1, i32 0, !4, null}<br>
+!14 = !MDLocation(line: 1, scope: !4)<br>
!15 = !{!16, !16, i64 0}<br>
!16 = !{!"int", !17, i64 0}<br>
!17 = !{!"omnipotent char", !18, i64 0}<br>
!18 = !{!"Simple C/C++ TBAA"}<br>
-!19 = !{i32 3, i32 0, !4, null}<br>
-!20 = !{i32 4, i32 0, !21, null}<br>
+!19 = !MDLocation(line: 3, scope: !4)<br>
+!20 = !MDLocation(line: 4, scope: !21)<br>
!21 = !{!"0xb\004\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [formal_parameter.c]<br>
-!22 = !{i32 5, i32 0, !4, null}<br>
+!22 = !MDLocation(line: 5, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/generate-odr-hash.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/generate-odr-hash.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/generate-odr-hash.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/generate-odr-hash.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/generate-odr-hash.ll Wed Jan 14 16:27:36 2015<br>
@@ -267,11 +267,11 @@ attributes #1 = { nounwind readnone }<br>
!45 = !{!"clang version 3.5 "}<br>
!46 = !{!"0x100\00b\007\000", !22, !23, !47} ; [ DW_TAG_auto_variable ] [b] [line 7]<br>
!47 = !{!"0x13\00baz\006\008\008\000\000\000", !1, !22, null, !2, null, null, null} ; [ DW_TAG_structure_type ] [baz] [line 6, size 8, align 8, offset 0] [def] [from ]<br>
-!48 = !{i32 7, i32 0, !22, null}<br>
-!49 = !{i32 8, i32 0, !22, null}<br>
-!50 = !{i32 29, i32 0, !26, null}<br>
+!48 = !MDLocation(line: 7, scope: !22)<br>
+!49 = !MDLocation(line: 8, scope: !22)<br>
+!50 = !MDLocation(line: 29, scope: !26)<br>
!51 = !{!"0x101\00this\0016777216\001088", !27, null, !52} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!52 = !{!"0xf\00\000\0064\0064\000\000", null, null, !28} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from walrus]<br>
-!53 = !{i32 0, i32 0, !27, null}<br>
-!54 = !{i32 25, i32 0, !27, null}<br>
-!55 = !{i32 25, i32 0, !36, null}<br>
+!53 = !MDLocation(line: 0, scope: !27)<br>
+!54 = !MDLocation(line: 25, scope: !27)<br>
+!55 = !MDLocation(line: 25, scope: !36)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll Wed Jan 14 16:27:36 2015<br>
@@ -86,20 +86,20 @@ attributes #1 = { nounwind readnone }<br>
!15 = !{!"clang version 3.6.0 "}<br>
!16 = !{!"0x101\00a\0016777219\000", !8, !9, !12} ; [ DW_TAG_arg_variable ] [a] [line 3]<br>
!17 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!18 = !{i32 3, i32 13, !8, null}<br>
-!19 = !{i32 4, i32 5, !8, null}<br>
+!18 = !MDLocation(line: 3, column: 13, scope: !8)<br>
+!19 = !MDLocation(line: 4, column: 5, scope: !8)<br>
!20 = !{!"0x100\00b\004\000", !8, !9, !12} ; [ DW_TAG_auto_variable ] [b] [line 4]<br>
-!21 = !{i32 4, i32 9, !8, null}<br>
-!22 = !{i32 5, i32 5, !8, null}<br>
+!21 = !MDLocation(line: 4, column: 9, scope: !8)<br>
+!22 = !MDLocation(line: 5, column: 5, scope: !8)<br>
!23 = !{!"0x100\00c\005\000", !8, !9, !12} ; [ DW_TAG_auto_variable ] [c] [line 5]<br>
-!24 = !{i32 5, i32 9, !8, null}<br>
-!25 = !{i32 6, i32 5, !8, null}<br>
+!24 = !MDLocation(line: 5, column: 9, scope: !8)<br>
+!25 = !MDLocation(line: 6, column: 5, scope: !8)<br>
!26 = !{!"0x100\00d\006\000", !8, !9, !12} ; [ DW_TAG_auto_variable ] [d] [line 6]<br>
-!27 = !{i32 6, i32 9, !8, null}<br>
-!28 = !{i32 7, i32 5, !8, null}<br>
+!27 = !MDLocation(line: 6, column: 9, scope: !8)<br>
+!28 = !MDLocation(line: 7, column: 5, scope: !8)<br>
!29 = !{!"0x100\00e\007\000", !8, !9, !12} ; [ DW_TAG_auto_variable ] [e] [line 7]<br>
-!30 = !{i32 7, i32 9, !8, null}<br>
-!31 = !{i32 8, i32 5, !8, null}<br>
+!30 = !MDLocation(line: 7, column: 9, scope: !8)<br>
+!31 = !MDLocation(line: 8, column: 5, scope: !8)<br>
!32 = !{!"0x100\00f\008\000", !8, !9, !12} ; [ DW_TAG_auto_variable ] [f] [line 8]<br>
-!33 = !{i32 8, i32 9, !8, null}<br>
-!34 = !{i32 9, i32 5, !8, null}<br>
+!33 = !MDLocation(line: 8, column: 9, scope: !8)<br>
+!34 = !MDLocation(line: 9, column: 5, scope: !8)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll Wed Jan 14 16:27:36 2015<br>
@@ -322,12 +322,12 @@ attributes #1 = { nounwind readnone }<br>
!49 = !{!"clang version 3.5.0 "}<br>
!50 = !{!"0x101\00this\0016777216\001088", !20, null, !51} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!51 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1C"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1C]<br>
-!52 = !{i32 0, i32 0, !20, null}<br>
-!53 = !{i32 10, i32 0, !20, null}<br>
-!54 = !{i32 11, i32 0, !20, null}<br>
-!55 = !{i32 14, i32 0, !21, null}<br>
-!56 = !{i32 20, i32 0, !22, null}<br>
-!57 = !{i32 25, i32 0, !24, null}<br>
-!58 = !{i32 26, i32 0, !24, null}<br>
-!59 = !{i32 39, i32 0, !27, null}<br>
-!60 = !{i32 55, i32 0, !31, null}<br>
+!52 = !MDLocation(line: 0, scope: !20)<br>
+!53 = !MDLocation(line: 10, scope: !20)<br>
+!54 = !MDLocation(line: 11, scope: !20)<br>
+!55 = !MDLocation(line: 14, scope: !21)<br>
+!56 = !MDLocation(line: 20, scope: !22)<br>
+!57 = !MDLocation(line: 25, scope: !24)<br>
+!58 = !MDLocation(line: 26, scope: !24)<br>
+!59 = !MDLocation(line: 39, scope: !27)<br>
+!60 = !MDLocation(line: 55, scope: !31)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/inline-member-function.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/inline-member-function.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/inline-member-function.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/inline-member-function.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/inline-member-function.ll Wed Jan 14 16:27:36 2015<br>
@@ -88,9 +88,9 @@ attributes #1 = { nounwind readnone }<br>
!20 = !{i32 2, !"Dwarf Version", i32 4}<br>
!21 = !{i32 1, !"Debug Info Version", i32 2}<br>
!22 = !{!"clang version 3.5.0 "}<br>
-!23 = !{i32 8, i32 0, !13, null}<br>
+!23 = !MDLocation(line: 8, scope: !13)<br>
!24 = !{!"0x101\00this\0016777216\001088", !17, null, !25} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!25 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS3foo"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS3foo]<br>
-!26 = !{i32 0, i32 0, !17, !23}<br>
+!26 = !MDLocation(line: 0, scope: !17, inlinedAt: !23)<br>
!27 = !{!"0x101\00x\0033554434\000", !17, !14, !9} ; [ DW_TAG_arg_variable ] [x] [line 2]<br>
-!28 = !{i32 2, i32 0, !17, !23}<br>
+!28 = !MDLocation(line: 2, scope: !17, inlinedAt: !23)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/inline-seldag-test.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/inline-seldag-test.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/inline-seldag-test.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/inline-seldag-test.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/inline-seldag-test.ll Wed Jan 14 16:27:36 2015<br>
@@ -65,9 +65,9 @@ attributes #1 = { nounwind readnone }<br>
!14 = !{!"clang version 3.5.0 "}<br>
!15 = !{!"0x100\00x\005\000", !4, !5, !16} ; [ DW_TAG_auto_variable ] [x] [line 5]<br>
!16 = !{!"0x35\00\000\000\000\000\000", null, null, !11} ; [ DW_TAG_volatile_type ] [line 0, size 0, align 0, offset 0] [from int]<br>
-!17 = !{i32 5, i32 0, !4, null}<br>
-!18 = !{i32 6, i32 7, !4, null}<br>
+!17 = !MDLocation(line: 5, scope: !4)<br>
+!18 = !MDLocation(line: 6, column: 7, scope: !4)<br>
!19 = !{!"0x101\00y\0016777217\000", !8, !5, !11} ; [ DW_TAG_arg_variable ] [y] [line 1]<br>
-!20 = !{i32 1, i32 0, !8, !18}<br>
-!21 = !{i32 2, i32 0, !8, !18}<br>
-!22 = !{i32 7, i32 0, !4, null}<br>
+!20 = !MDLocation(line: 1, scope: !8, inlinedAt: !18)<br>
+!21 = !MDLocation(line: 2, scope: !8, inlinedAt: !18)<br>
+!22 = !MDLocation(line: 7, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/instcombine-instrinsics.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/instcombine-instrinsics.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/instcombine-instrinsics.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/instcombine-instrinsics.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/instcombine-instrinsics.ll Wed Jan 14 16:27:36 2015<br>
@@ -72,8 +72,8 @@ attributes #1 = { nounwind readnone }<br>
!15 = !{!16}<br>
!16 = !{!"0xd\00i\002\0064\0064\000\000", !1, !14, !17} ; [ DW_TAG_member ] [i] [line 2, size 64, align 64, offset 0] [from long int]<br>
!17 = !{!"0x24\00long int\000\0064\0064\000\000\005", null, null} ; [ DW_TAG_base_type ] [long int] [line 0, size 64, align 64, offset 0, enc DW_ATE_signed]<br>
-!18 = !{i32 8, i32 0, !4, null}<br>
-!19 = !{i32 9, i32 0, !4, null}<br>
-!20 = !{i32 10, i32 0, !4, null}<br>
-!21 = !{i32 11, i32 0, !4, null}<br>
-!22 = !{i32 12, i32 0, !4, null}<br>
+!18 = !MDLocation(line: 8, scope: !4)<br>
+!19 = !MDLocation(line: 9, scope: !4)<br>
+!20 = !MDLocation(line: 10, scope: !4)<br>
+!21 = !MDLocation(line: 11, scope: !4)<br>
+!22 = !MDLocation(line: 12, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/lexical_block.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/lexical_block.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/lexical_block.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/lexical_block.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/lexical_block.ll Wed Jan 14 16:27:36 2015<br>
@@ -62,6 +62,6 @@ attributes #1 = { nounwind readnone }<br>
!11 = !{!"0x100\00i\002\000", !12, !5, !13} ; [ DW_TAG_auto_variable ] [i] [line 2]<br>
!12 = !{!"0xb\002\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/lexical_block.cpp]<br>
!13 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
-!14 = !{i32 2, i32 0, !12, null}<br>
-!15 = !{i32 3, i32 0, !12, null}<br>
-!16 = !{i32 4, i32 0, !4, null}<br>
+!14 = !MDLocation(line: 2, scope: !12)<br>
+!15 = !MDLocation(line: 3, scope: !12)<br>
+!16 = !MDLocation(line: 4, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/line-info.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/line-info.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/line-info.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/line-info.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/line-info.ll Wed Jan 14 16:27:36 2015<br>
@@ -53,8 +53,8 @@ attributes #1 = { nounwind readnone }<br>
!12 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !13, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!13 = !{!9}<br>
!14 = !{!"0x101\00x\0016777217\000", !4, !6, !9} ; [ DW_TAG_arg_variable ] [x] [line 1]<br>
-!15 = !{i32 1, i32 0, !4, null}<br>
-!16 = !{i32 2, i32 0, !4, null}<br>
-!17 = !{i32 3, i32 0, !18, null}<br>
+!15 = !MDLocation(line: 1, scope: !4)<br>
+!16 = !MDLocation(line: 2, scope: !4)<br>
+!17 = !MDLocation(line: 3, scope: !18)<br>
!18 = !{!"0xb\000", !11, !10} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/blaikie/dev/scratch/list0.c]<br>
!19 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/linkage-name.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/linkage-name.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/linkage-name.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/linkage-name.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/linkage-name.ll Wed Jan 14 16:27:36 2015<br>
@@ -43,10 +43,10 @@ declare void @llvm.dbg.declare(metadata,<br>
!20 = !{!"0x34\00a\00a\00\009\000\001", null, !6, !11, %class.A* @a, null} ; [ DW_TAG_variable ]<br>
!21 = !{!"0x101\00this\0016777221\0064", !5, !6, !22} ; [ DW_TAG_arg_variable ]<br>
!22 = !{!"0xf\00\000\0064\0064\000\000", null, null, !11} ; [ DW_TAG_pointer_type ]<br>
-!23 = !{i32 5, i32 8, !5, null}<br>
+!23 = !MDLocation(line: 5, column: 8, scope: !5)<br>
!24 = !{!"0x101\00b\0033554437\000", !5, !6, !9} ; [ DW_TAG_arg_variable ]<br>
-!25 = !{i32 5, i32 14, !5, null}<br>
-!26 = !{i32 6, i32 4, !27, null}<br>
+!25 = !MDLocation(line: 5, column: 14, scope: !5)<br>
+!26 = !MDLocation(line: 6, column: 4, scope: !27)<br>
!27 = !{!"0xb\005\0017\000", !6, !5} ; [ DW_TAG_lexical_block ]<br>
!28 = !{!"foo.cpp", !"/Users/echristo"}<br>
!29 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/low-pc-cu.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/low-pc-cu.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/low-pc-cu.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/low-pc-cu.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/low-pc-cu.ll Wed Jan 14 16:27:36 2015<br>
@@ -43,4 +43,4 @@ attributes #0 = { nounwind uwtable "less<br>
!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
!9 = !{i32 1, !"Debug Info Version", i32 2}<br>
!10 = !{!"clang version 3.5.0 (trunk 204164) (llvm/trunk 204183)"}<br>
-!11 = !{i32 1, i32 0, !4, null}<br>
+!11 = !MDLocation(line: 1, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/misched-dbg-value.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/misched-dbg-value.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/misched-dbg-value.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/misched-dbg-value.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/misched-dbg-value.ll Wed Jan 14 16:27:36 2015<br>
@@ -167,20 +167,20 @@ attributes #1 = { nounwind readnone }<br>
!61 = !{!62}<br>
!62 = !{!"0x21\000\0031"} ; [ DW_TAG_subrange_type ] [0, 30]<br>
!63 = !{!"0x34\00PtrGlbNext\00PtrGlbNext\00\00178\000\001", null, !3, !47, %struct.Record** @PtrGlbNext, null} ; [ DW_TAG_variable ] [PtrGlbNext] [line 178] [def]<br>
-!64 = !{i32 181, i32 0, !12, null}<br>
-!65 = !{i32 182, i32 0, !12, null}<br>
-!66 = !{i32 183, i32 0, !12, null}<br>
-!67 = !{i32 184, i32 0, !12, null}<br>
-!68 = !{i32 189, i32 0, !12, null}<br>
-!69 = !{i32 190, i32 0, !12, null}<br>
-!73 = !{i32 191, i32 0, !12, null}<br>
-!74 = !{i32 192, i32 0, !12, null}<br>
-!75 = !{i32 193, i32 0, !76, null}<br>
+!64 = !MDLocation(line: 181, scope: !12)<br>
+!65 = !MDLocation(line: 182, scope: !12)<br>
+!66 = !MDLocation(line: 183, scope: !12)<br>
+!67 = !MDLocation(line: 184, scope: !12)<br>
+!68 = !MDLocation(line: 189, scope: !12)<br>
+!69 = !MDLocation(line: 190, scope: !12)<br>
+!73 = !MDLocation(line: 191, scope: !12)<br>
+!74 = !MDLocation(line: 192, scope: !12)<br>
+!75 = !MDLocation(line: 193, scope: !76)<br>
!76 = !{!"0xb\00193\000\000", !82, !12} ; [ DW_TAG_lexical_block ] [/Users/manmanren/test-Nov/rdar_13183203/test2/dry.c]<br>
-!77 = !{i32 194, i32 0, !76, null}<br>
-!78 = !{i32 195, i32 0, !12, null}<br>
-!79 = !{i32 196, i32 0, !12, null}<br>
-!80 = !{i32 197, i32 0, !12, null}<br>
-!81 = !{i32 198, i32 0, !12, null}<br>
+!77 = !MDLocation(line: 194, scope: !76)<br>
+!78 = !MDLocation(line: 195, scope: !12)<br>
+!79 = !MDLocation(line: 196, scope: !12)<br>
+!80 = !MDLocation(line: 197, scope: !12)<br>
+!81 = !MDLocation(line: 198, scope: !12)<br>
!82 = !{!"dry.c", !"/Users/manmanren/test-Nov/rdar_13183203/test2"}<br>
!83 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/nodebug_with_debug_loc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/nodebug_with_debug_loc.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/nodebug_with_debug_loc.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/nodebug_with_debug_loc.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/nodebug_with_debug_loc.ll Wed Jan 14 16:27:36 2015<br>
@@ -123,12 +123,12 @@ attributes #3 = { nounwind }<br>
!23 = !{i32 2, !"Dwarf Version", i32 4}<br>
!24 = !{i32 2, !"Debug Info Version", i32 2}<br>
!25 = !{!"clang version 3.5.0 "}<br>
-!26 = !{i32 15, i32 0, !11, null}<br>
+!26 = !MDLocation(line: 15, scope: !11)<br>
!27 = !{!"0x101\00lhs\0016777229\000", !17, !12, !20, !28} ; [ DW_TAG_arg_variable ] [lhs] [line 13]<br>
-!28 = !{i32 16, i32 0, !11, null}<br>
-!29 = !{i32 13, i32 0, !17, !28}<br>
-!30 = !{i32 17, i32 0, !11, null}<br>
-!31 = !{i32 18, i32 0, !11, null}<br>
+!28 = !MDLocation(line: 16, scope: !11)<br>
+!29 = !MDLocation(line: 13, scope: !17, inlinedAt: !28)<br>
+!30 = !MDLocation(line: 17, scope: !11)<br>
+!31 = !MDLocation(line: 18, scope: !11)<br>
!32 = !{!33, !34, i64 0}<br>
!33 = !{!"_ZTS6string", !34, i64 0}<br>
!34 = !{!"any pointer", !35, i64 0}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/objc-property-void.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/objc-property-void.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/objc-property-void.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/objc-property-void.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/objc-property-void.ll Wed Jan 14 16:27:36 2015<br>
@@ -98,7 +98,7 @@ attributes #1 = { nounwind readnone }<br>
!23 = !{!""}<br>
!24 = !{!"0x101\00self\0016777216\001088", !10, null, !25} ; [ DW_TAG_arg_variable ] [self] [line 0]<br>
!25 = !{!"0xf\00\000\0064\0064\000\000", null, null, !4} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from Foo]<br>
-!26 = !{i32 0, i32 0, !10, null}<br>
+!26 = !MDLocation(line: 0, scope: !10)<br>
!27 = !{!"0x101\00_cmd\0033554432\0064", !10, null, !28} ; [ DW_TAG_arg_variable ] [_cmd] [line 0]<br>
!28 = !{!"0x16\00SEL\005\000\000\000\000", !5, null, !15} ; [ DW_TAG_typedef ] [SEL] [line 5, size 0, align 0, offset 0] [from ]<br>
-!29 = !{i32 5, i32 0, !10, null}<br>
+!29 = !MDLocation(line: 5, scope: !10)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/op_deref.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/op_deref.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/op_deref.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/op_deref.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/op_deref.ll Wed Jan 14 16:27:36 2015<br>
@@ -89,23 +89,23 @@ declare void @llvm.stackrestore(i8*) nou<br>
!8 = !{null, !9}<br>
!9 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]<br>
!10 = !{!"0x101\00s\0016777217\000", !5, !6, !9} ; [ DW_TAG_arg_variable ]<br>
-!11 = !{i32 1, i32 26, !5, null}<br>
-!12 = !{i32 3, i32 13, !13, null}<br>
+!11 = !MDLocation(line: 1, column: 26, scope: !5)<br>
+!12 = !MDLocation(line: 3, column: 13, scope: !13)<br>
!13 = !{!"0xb\002\001\000", !28, !5} ; [ DW_TAG_lexical_block ]<br>
!14 = !{!"0x100\00vla\003\008192", !13, !6, !15} ; [ DW_TAG_auto_variable ]<br>
!15 = !{!"0x1\00\000\000\0032\000\000", null, null, !9, !16, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 0, align 32, offset 0] [from int]<br>
!16 = !{!17}<br>
!17 = !{!"0x21\000\00-1"} ; [ DW_TAG_subrange_type ]<br>
-!18 = !{i32 3, i32 7, !13, null}<br>
+!18 = !MDLocation(line: 3, column: 7, scope: !13)<br>
!19 = !{!"0x100\00i\004\000", !13, !6, !9} ; [ DW_TAG_auto_variable ]<br>
-!20 = !{i32 4, i32 7, !13, null}<br>
-!21 = !{i32 5, i32 8, !22, null}<br>
+!20 = !MDLocation(line: 4, column: 7, scope: !13)<br>
+!21 = !MDLocation(line: 5, column: 8, scope: !22)<br>
!22 = !{!"0xb\005\003\001", !28, !13} ; [ DW_TAG_lexical_block ]<br>
-!23 = !{i32 6, i32 5, !24, null}<br>
+!23 = !MDLocation(line: 6, column: 5, scope: !24)<br>
!24 = !{!"0xb\005\0027\002", !28, !22} ; [ DW_TAG_lexical_block ]<br>
-!25 = !{i32 7, i32 3, !24, null}<br>
-!26 = !{i32 5, i32 22, !22, null}<br>
-!27 = !{i32 8, i32 1, !13, null}<br>
+!25 = !MDLocation(line: 7, column: 3, scope: !24)<br>
+!26 = !MDLocation(line: 5, column: 22, scope: !22)<br>
+!27 = !MDLocation(line: 8, column: 1, scope: !13)<br>
!28 = !{!"bar.c", !"/Users/echristo/tmp"}<br>
!29 = !{i32 1, !"Debug Info Version", i32 2}<br>
!30 = !{!"0x102\006"} ; [ DW_TAG_expression ] [DW_OP_deref]<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/parameters.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/parameters.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/parameters.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/parameters.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/parameters.ll Wed Jan 14 16:27:36 2015<br>
@@ -106,13 +106,13 @@ attributes #2 = { "less-precise-fpmad"="<br>
!21 = !{i32 2, !"Dwarf Version", i32 3}<br>
!22 = !{!"0x101\00f\0016777222\008192", !4, !23, !8} ; [ DW_TAG_arg_variable ] [f] [line 6]<br>
!23 = !{!"0x29", !1} ; [ DW_TAG_file_type ] [/tmp/pass.cpp]<br>
-!24 = !{i32 6, i32 0, !4, null}<br>
-!25 = !{i32 7, i32 0, !4, null}<br>
+!24 = !MDLocation(line: 6, scope: !4)<br>
+!25 = !MDLocation(line: 7, scope: !4)<br>
!26 = !{!"0x101\00b\0016777228\000", !17, !23, !20} ; [ DW_TAG_arg_variable ] [b] [line 12]<br>
-!27 = !{i32 12, i32 0, !17, null}<br>
+!27 = !MDLocation(line: 12, scope: !17)<br>
!28 = !{!"0x101\00g\0033554444\008192", !17, !23, !8} ; [ DW_TAG_arg_variable ] [g] [line 12]<br>
-!29 = !{i32 13, i32 0, !30, null}<br>
+!29 = !MDLocation(line: 13, scope: !30)<br>
!30 = !{!"0xb\0013\000\000", !1, !17} ; [ DW_TAG_lexical_block ] [/tmp/pass.cpp]<br>
-!31 = !{i32 14, i32 0, !30, null}<br>
-!32 = !{i32 15, i32 0, !17, null}<br>
+!31 = !MDLocation(line: 14, scope: !30)<br>
+!32 = !MDLocation(line: 15, scope: !17)<br>
!33 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/pieces-1.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pieces-1.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pieces-1.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/pieces-1.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/pieces-1.ll Wed Jan 14 16:27:36 2015<br>
@@ -71,9 +71,9 @@ attributes #1 = { nounwind readnone }<br>
!18 = !{i32 1, !"Debug Info Version", i32 2}<br>
!19 = !{!"clang version 3.5 "}<br>
!20 = !{!"0x101\00s\0016777219\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [s] [line 3]<br>
-!21 = !{i32 3, i32 0, !4, null}<br>
+!21 = !MDLocation(line: 3, scope: !4)<br>
!22 = !{!"0x101\00s\0016777219\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [s] [line 3]<br>
-!23 = !{i32 4, i32 0, !4, null}<br>
+!23 = !MDLocation(line: 4, scope: !4)<br>
!24 = !{!"0x102\00147\000\008"} ; [ DW_TAG_expression ] [DW_OP_piece 0 8] [piece, size 8, offset 0]<br>
!25 = !{}<br>
!27 = !{!"0x102\00147\008\004"} ; [ DW_TAG_expression ] [DW_OP_piece 8 4] [piece, size 4, offset 8]<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/pieces-2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pieces-2.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pieces-2.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/pieces-2.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/pieces-2.ll Wed Jan 14 16:27:36 2015<br>
@@ -83,9 +83,9 @@ attributes #2 = { nounwind }<br>
!23 = !{i32 1, !"Debug Info Version", i32 2}<br>
!24 = !{!"clang version 3.5.0 "}<br>
!25 = !{!"0x101\00outer\0016777226\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [outer] [line 10]<br>
-!26 = !{i32 10, i32 0, !4, null}<br>
-!27 = !{i32 11, i32 0, !4, null}<br>
+!26 = !MDLocation(line: 10, scope: !4)<br>
+!27 = !MDLocation(line: 11, scope: !4)<br>
!28 = !{!"0x100\00i1\0011\000", !4, !5, !14} ; [ DW_TAG_auto_variable ] [i1] [line 11]<br>
!29 = !{!"0x102\00147\000\004"} ; [ DW_TAG_expression ] [DW_OP_piece 0 4] [piece, size 4, offset 0]<br>
!31 = !{i32 3, i32 0, i32 12}<br>
-!32 = !{i32 12, i32 0, !4, null}<br>
+!32 = !MDLocation(line: 12, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/pieces-3.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pieces-3.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pieces-3.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/pieces-3.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/pieces-3.ll Wed Jan 14 16:27:36 2015<br>
@@ -93,14 +93,14 @@ attributes #2 = { nounwind }<br>
!23 = !{!"clang version 3.5.0 "}<br>
!24 = !{!"0x101\00outer\0016777226\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [outer] [line 10]<br>
!25 = !{!"0x102\00147\000\008"} ; [ DW_TAG_expression ] [DW_OP_piece 0 8] [piece, size 8, offset 0]<br>
-!26 = !{i32 10, i32 0, !4, null}<br>
+!26 = !MDLocation(line: 10, scope: !4)<br>
!27 = !{!"0x101\00outer\0016777226\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [outer] [line 10]<br>
!28 = !{!"0x102\00147\008\008"} ; [ DW_TAG_expression ] [DW_OP_piece 8 8] [piece, size 8, offset 8]<br>
!29 = !{!"0x101\00outer\0016777226\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [outer] [line 10]<br>
!30 = !{!"0x102\00147\0012\004"} ; [ DW_TAG_expression ] [DW_OP_piece 12 4] [piece, size 4, offset 12]<br>
!31 = !{!"0x101\00outer\0016777226\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [outer] [line 10]<br>
!32 = !{!"0x102\00147\008\004"} ; [ DW_TAG_expression ] [DW_OP_piece 8 4] [piece, size 4, offset 8]<br>
-!33 = !{i32 11, i32 0, !4, null}<br>
+!33 = !MDLocation(line: 11, scope: !4)<br>
!34 = !{!"0x100\00i1\0011\000", !4, !5, !14} ; [ DW_TAG_auto_variable ] [i1] [line 11]<br>
!35 = !{!"0x102\00147\000\004"} ; [ DW_TAG_expression ] [DW_OP_piece 0 4] [piece, size 4, offset 0]<br>
-!36 = !{i32 12, i32 0, !4, null}<br>
+!36 = !MDLocation(line: 12, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/pr11300.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pr11300.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pr11300.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/pr11300.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/pr11300.ll Wed Jan 14 16:27:36 2015<br>
@@ -58,13 +58,13 @@ entry:<br>
!19 = !{!"0x24"} ; [ DW_TAG_base_type ]<br>
!20 = !{!"0x2e\00bar\00bar\00_ZN3foo3barEv\002\000\001\000\006\00256\000\002", !6, null, !13, null, void (%struct.foo*)* @_ZN3foo3barEv, null, !12, null} ; [ DW_TAG_subprogram ] [line 2] [def] [bar]<br>
!23 = !{!"0x101\00x\0016777220\000", !5, !6, !9} ; [ DW_TAG_arg_variable ]<br>
-!24 = !{i32 4, i32 15, !5, null}<br>
-!25 = !{i32 4, i32 20, !26, null}<br>
+!24 = !MDLocation(line: 4, column: 15, scope: !5)<br>
+!25 = !MDLocation(line: 4, column: 20, scope: !26)<br>
!26 = !{!"0xb\004\0018\000", !6, !5} ; [ DW_TAG_lexical_block ]<br>
-!27 = !{i32 4, i32 30, !26, null}<br>
+!27 = !MDLocation(line: 4, column: 30, scope: !26)<br>
!28 = !{!"0x101\00this\0016777218\0064", !20, !6, !15} ; [ DW_TAG_arg_variable ]<br>
-!29 = !{i32 2, i32 8, !20, null}<br>
-!30 = !{i32 2, i32 15, !31, null}<br>
+!29 = !MDLocation(line: 2, column: 8, scope: !20)<br>
+!30 = !MDLocation(line: 2, column: 15, scope: !31)<br>
!31 = !{!"0xb\002\0014\001", !6, !20} ; [ DW_TAG_lexical_block ]<br>
!32 = !{!"/home/espindola/llvm/test.cc", !"/home/espindola/tmpfs/build"}<br>
!33 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/pr12831.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pr12831.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pr12831.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/pr12831.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/pr12831.ll Wed Jan 14 16:27:36 2015<br>
@@ -210,29 +210,29 @@ entry:<br>
!132 = !{!"0x24\00bool\000\008\008\000\000\002", null, null} ; [ DW_TAG_base_type ]<br>
!133 = !{!"0x101\00this\0016777235\0064", !5, !6, !134} ; [ DW_TAG_arg_variable ]<br>
!134 = !{!"0xf\00\000\0064\0064\000\000", null, null, !10} ; [ DW_TAG_pointer_type ]<br>
-!135 = !{i32 19, i32 39, !5, null}<br>
-!136 = !{i32 20, i32 17, !137, null}<br>
+!135 = !MDLocation(line: 19, column: 39, scope: !5)<br>
+!136 = !MDLocation(line: 20, column: 17, scope: !137)<br>
!137 = !{!"0xb\0019\0051\000", !6, !5} ; [ DW_TAG_lexical_block ]<br>
-!138 = !{i32 23, i32 17, !137, null}<br>
-!139 = !{i32 26, i32 15, !137, null}<br>
+!138 = !MDLocation(line: 23, column: 17, scope: !137)<br>
+!139 = !MDLocation(line: 26, column: 15, scope: !137)<br>
!140 = !{!"0x101\00this\0016777224\0064", !106, !6, !141} ; [ DW_TAG_arg_variable ]<br>
!141 = !{!"0xf\00\000\0064\0064\000\000", null, null, !20} ; [ DW_TAG_pointer_type ]<br>
-!142 = !{i32 8, i32 45, !106, null}<br>
+!142 = !MDLocation(line: 8, column: 45, scope: !106)<br>
!143 = !{!"0x101\00__f\0033554440\000", !106, !6, !61} ; [ DW_TAG_arg_variable ]<br>
-!144 = !{i32 8, i32 63, !106, null}<br>
-!145 = !{i32 9, i32 9, !146, null}<br>
+!144 = !MDLocation(line: 8, column: 63, scope: !106)<br>
+!145 = !MDLocation(line: 9, column: 9, scope: !146)<br>
!146 = !{!"0xb\008\0081\001", !6, !106} ; [ DW_TAG_lexical_block ]<br>
-!147 = !{i32 10, i32 13, !146, null}<br>
-!148 = !{i32 4, i32 5, !149, null}<br>
+!147 = !MDLocation(line: 10, column: 13, scope: !146)<br>
+!148 = !MDLocation(line: 4, column: 5, scope: !149)<br>
!149 = !{!"0xb\003\00105\002", !6, !107} ; [ DW_TAG_lexical_block ]<br>
!150 = !{!"0x101\00this\0016777224\0064", !126, !6, !141} ; [ DW_TAG_arg_variable ]<br>
-!151 = !{i32 8, i32 45, !126, null}<br>
+!151 = !MDLocation(line: 8, column: 45, scope: !126)<br>
!152 = !{!"0x101\00__f\0033554440\000", !126, !6, !26} ; [ DW_TAG_arg_variable ]<br>
-!153 = !{i32 8, i32 63, !126, null}<br>
-!154 = !{i32 9, i32 9, !155, null}<br>
+!153 = !MDLocation(line: 8, column: 63, scope: !126)<br>
+!154 = !MDLocation(line: 9, column: 9, scope: !155)<br>
!155 = !{!"0xb\008\0081\003", !6, !126} ; [ DW_TAG_lexical_block ]<br>
-!156 = !{i32 10, i32 13, !155, null}<br>
-!157 = !{i32 4, i32 5, !158, null}<br>
+!156 = !MDLocation(line: 10, column: 13, scope: !155)<br>
+!157 = !MDLocation(line: 4, column: 5, scope: !158)<br>
!158 = !{!"0xb\003\00105\004", !6, !127} ; [ DW_TAG_lexical_block ]<br>
!159 = !{!"0x29", !161} ; [ DW_TAG_file_type ]<br>
!160 = !{!"BPLFunctionWriter2.ii", !"/home/peter/crashdelta"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/pr13303.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pr13303.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pr13303.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/pr13303.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/pr13303.ll Wed Jan 14 16:27:36 2015<br>
@@ -23,7 +23,7 @@ entry:<br>
!7 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !8, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!8 = !{!9}<br>
!9 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
-!10 = !{i32 1, i32 14, !11, null}<br>
+!10 = !MDLocation(line: 1, column: 14, scope: !11)<br>
!11 = !{!"0xb\001\0012\000", !12, !5} ; [ DW_TAG_lexical_block ] [/home/probinson/PR13303.c]<br>
!12 = !{!"PR13303.c", !"/home/probinson"}<br>
!13 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/pr19307.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pr19307.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/pr19307.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/pr19307.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/pr19307.ll Wed Jan 14 16:27:36 2015<br>
@@ -130,16 +130,16 @@ attributes #2 = { "less-precise-fpmad"="<br>
!43 = !{i32 2, !"Debug Info Version", i32 2}<br>
!44 = !{!"clang version 3.5.0 (209308)"}<br>
!45 = !{!"0x101\00offset\0016777219\000", !13, !14, !17} ; [ DW_TAG_arg_variable ] [offset] [line 3]<br>
-!46 = !{i32 3, i32 0, !13, null}<br>
+!46 = !MDLocation(line: 3, scope: !13)<br>
!47 = !{!"0x101\00limit\0033554435\000", !13, !14, !17} ; [ DW_TAG_arg_variable ] [limit] [line 3]<br>
!48 = !{!"0x101\00range\0050331652\008192", !13, !14, !19} ; [ DW_TAG_arg_variable ] [range] [line 4]<br>
-!49 = !{i32 4, i32 0, !13, null}<br>
-!50 = !{i32 5, i32 0, !51, null}<br>
+!49 = !MDLocation(line: 4, scope: !13)<br>
+!50 = !MDLocation(line: 5, scope: !51)<br>
!51 = !{!"0xb\005\000\000", !1, !13} ; [ DW_TAG_lexical_block ] [/llvm_cmake_gcc/pr19307.cc]<br>
-!52 = !{i32 5, i32 0, !53, null}<br>
+!52 = !MDLocation(line: 5, scope: !53)<br>
!53 = !{!"0xb\005\000\001", !1, !51} ; [ DW_TAG_lexical_block ] [/llvm_cmake_gcc/pr19307.cc]<br>
-!54 = !{i32 6, i32 0, !51, null}<br>
-!55 = !{i32 7, i32 0, !13, null}<br>
-!56 = !{i32 8, i32 0, !13, null}<br>
-!57 = !{i32 9, i32 0, !13, null}<br>
+!54 = !MDLocation(line: 6, scope: !51)<br>
+!55 = !MDLocation(line: 7, scope: !13)<br>
+!56 = !MDLocation(line: 8, scope: !13)<br>
+!57 = !MDLocation(line: 9, scope: !13)<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/prologue-stack.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/prologue-stack.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/prologue-stack.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/prologue-stack.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/prologue-stack.ll Wed Jan 14 16:27:36 2015<br>
@@ -29,8 +29,8 @@ declare i32 @callme(i32)<br>
!7 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !8, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!8 = !{!9}<br>
!9 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
-!10 = !{i32 5, i32 3, !11, null}<br>
+!10 = !MDLocation(line: 5, column: 3, scope: !11)<br>
!11 = !{!"0xb\004\001\000", !13, !5} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/bar.c]<br>
-!12 = !{i32 6, i32 3, !11, null}<br>
+!12 = !MDLocation(line: 6, column: 3, scope: !11)<br>
!13 = !{!"bar.c", !"/usr/local/google/home/echristo/tmp"}<br>
!14 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/recursive_inlining.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/recursive_inlining.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/recursive_inlining.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/recursive_inlining.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/recursive_inlining.ll Wed Jan 14 16:27:36 2015<br>
@@ -230,46 +230,46 @@ attributes #3 = { nounwind }<br>
!28 = !{i32 2, !"Dwarf Version", i32 4}<br>
!29 = !{i32 2, !"Debug Info Version", i32 2}<br>
!30 = !{!"clang version 3.6.0 "}<br>
-!31 = !{i32 16, i32 0, !14, null}<br>
-!32 = !{i32 17, i32 0, !14, null}<br>
+!31 = !MDLocation(line: 16, scope: !14)<br>
+!32 = !MDLocation(line: 17, scope: !14)<br>
!33 = !{!34, !34, i64 0}<br>
!34 = !{!"any pointer", !35, i64 0}<br>
!35 = !{!"omnipotent char", !36, i64 0}<br>
!36 = !{!"Simple C/C++ TBAA"}<br>
!37 = !{!"0x101\00this\0016777216\001088", !22, null, !25, !32} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!38 = !{i32 0, i32 0, !22, !32}<br>
-!39 = !{i32 8, i32 0, !22, !32}<br>
-!40 = !{i32 9, i32 0, !41, !32}<br>
+!38 = !MDLocation(line: 0, scope: !22, inlinedAt: !32)<br>
+!39 = !MDLocation(line: 8, scope: !22, inlinedAt: !32)<br>
+!40 = !MDLocation(line: 9, scope: !41, inlinedAt: !32)<br>
!41 = !{!"0xb\009\000\000", !5, !22} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/blaikie/dev/scratch/missing_concrete_variable_on_darwin/reduce/recursive_inlining.cpp]<br>
!42 = !{!43, !44, i64 0}<br>
!43 = !{!"_ZTS1C", !44, i64 0}<br>
!44 = !{!"int", !35, i64 0}<br>
-!45 = !{i32 9, i32 0, !46, !32}<br>
+!45 = !MDLocation(line: 9, scope: !46, inlinedAt: !32)<br>
!46 = !{!"0xb\009\000\001", !5, !41} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/blaikie/dev/scratch/missing_concrete_variable_on_darwin/reduce/recursive_inlining.cpp]<br>
-!47 = !{i32 10, i32 0, !22, !32}<br>
-!48 = !{i32 19, i32 0, !14, null}<br>
-!49 = !{i32 0, i32 0, !22, null}<br>
-!50 = !{i32 8, i32 0, !22, null}<br>
-!51 = !{i32 9, i32 0, !41, null}<br>
-!52 = !{i32 9, i32 0, !46, null}<br>
-!53 = !{i32 16, i32 0, !14, !54}<br>
-!54 = !{i32 20, i32 0, !18, !55}<br>
-!55 = !{i32 10, i32 0, !22, null}<br>
-!56 = !{i32 17, i32 0, !14, !54}<br>
+!47 = !MDLocation(line: 10, scope: !22, inlinedAt: !32)<br>
+!48 = !MDLocation(line: 19, scope: !14)<br>
+!49 = !MDLocation(line: 0, scope: !22)<br>
+!50 = !MDLocation(line: 8, scope: !22)<br>
+!51 = !MDLocation(line: 9, scope: !41)<br>
+!52 = !MDLocation(line: 9, scope: !46)<br>
+!53 = !MDLocation(line: 16, scope: !14, inlinedAt: !54)<br>
+!54 = !MDLocation(line: 20, scope: !18, inlinedAt: !55)<br>
+!55 = !MDLocation(line: 10, scope: !22)<br>
+!56 = !MDLocation(line: 17, scope: !14, inlinedAt: !54)<br>
!57 = !{!"0x101\00this\0016777216\001088", !22, null, !25, !56} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!58 = !{i32 0, i32 0, !22, !56}<br>
-!59 = !{i32 8, i32 0, !22, !56}<br>
-!60 = !{i32 9, i32 0, !41, !56}<br>
-!61 = !{i32 9, i32 0, !46, !56}<br>
-!62 = !{i32 10, i32 0, !22, !56}<br>
-!63 = !{i32 11, i32 0, !22, null}<br>
-!64 = !{i32 16, i32 0, !14, !65}<br>
-!65 = !{i32 20, i32 0, !18, null}<br>
-!66 = !{i32 17, i32 0, !14, !65}<br>
+!58 = !MDLocation(line: 0, scope: !22, inlinedAt: !56)<br>
+!59 = !MDLocation(line: 8, scope: !22, inlinedAt: !56)<br>
+!60 = !MDLocation(line: 9, scope: !41, inlinedAt: !56)<br>
+!61 = !MDLocation(line: 9, scope: !46, inlinedAt: !56)<br>
+!62 = !MDLocation(line: 10, scope: !22, inlinedAt: !56)<br>
+!63 = !MDLocation(line: 11, scope: !22)<br>
+!64 = !MDLocation(line: 16, scope: !14, inlinedAt: !65)<br>
+!65 = !MDLocation(line: 20, scope: !18)<br>
+!66 = !MDLocation(line: 17, scope: !14, inlinedAt: !65)<br>
!67 = !{!"0x101\00this\0016777216\001088", !22, null, !25, !66} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!68 = !{i32 0, i32 0, !22, !66}<br>
-!69 = !{i32 8, i32 0, !22, !66}<br>
-!70 = !{i32 9, i32 0, !41, !66}<br>
-!71 = !{i32 9, i32 0, !46, !66}<br>
-!72 = !{i32 21, i32 0, !19, null}<br>
-!73 = !{i32 22, i32 0, !20, null}<br>
+!68 = !MDLocation(line: 0, scope: !22, inlinedAt: !66)<br>
+!69 = !MDLocation(line: 8, scope: !22, inlinedAt: !66)<br>
+!70 = !MDLocation(line: 9, scope: !41, inlinedAt: !66)<br>
+!71 = !MDLocation(line: 9, scope: !46, inlinedAt: !66)<br>
+!72 = !MDLocation(line: 21, scope: !19)<br>
+!73 = !MDLocation(line: 22, scope: !20)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/reference-argument.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/reference-argument.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/reference-argument.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/reference-argument.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/reference-argument.ll Wed Jan 14 16:27:36 2015<br>
@@ -81,23 +81,23 @@ declare void @_ZN4SValD2Ev(%class.SVal*<br>
!46 = !{i32 786468}<br>
!47 = !{i32 2, !"Dwarf Version", i32 3}<br>
!48 = !{!"0x101\00v\0016777235\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [v] [line 19]<br>
-!49 = !{i32 19, i32 0, !4, null}<br>
+!49 = !MDLocation(line: 19, scope: !4)<br>
!50 = !{!"0x100\00v\0026\000", !29, !5, !9} ; [ DW_TAG_auto_variable ] [v] [line 26]<br>
-!51 = !{i32 26, i32 0, !29, null}<br>
-!52 = !{i32 27, i32 0, !29, null}<br>
-!53 = !{i32 28, i32 0, !29, null}<br>
+!51 = !MDLocation(line: 26, scope: !29)<br>
+!52 = !MDLocation(line: 27, scope: !29)<br>
+!53 = !MDLocation(line: 28, scope: !29)<br>
!54 = !{!"0x100\00a\0029\000", !29, !5, !39} ; [ DW_TAG_auto_variable ] [a] [line 29]<br>
-!55 = !{i32 29, i32 0, !29, null}<br>
-!56 = !{i32 30, i32 0, !29, null}<br>
-!57 = !{i32 31, i32 0, !29, null}<br>
-!58 = !{i32 32, i32 0, !29, null}<br>
+!55 = !MDLocation(line: 29, scope: !29)<br>
+!56 = !MDLocation(line: 30, scope: !29)<br>
+!57 = !MDLocation(line: 31, scope: !29)<br>
+!58 = !MDLocation(line: 32, scope: !29)<br>
!59 = !{!"0x101\00this\0016777238\001088", !35, !5, !60} ; [ DW_TAG_arg_variable ] [this] [line 22]<br>
!60 = !{!"0xf\00\000\0064\0064\000\000", null, null, !39} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from A]<br>
-!61 = !{i32 22, i32 0, !35, null}<br>
+!61 = !MDLocation(line: 22, scope: !35)<br>
!62 = !{!"0x101\00v\0033554454\008192", !35, !5, !9} ; [ DW_TAG_arg_variable ] [v] [line 22]<br>
!63 = !{!"0x101\00this\0016777230\001088", !33, !5, !64} ; [ DW_TAG_arg_variable ] [this] [line 14]<br>
!64 = !{!"0xf\00\000\0064\0064\000\000", null, null, !9} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from SVal]<br>
-!65 = !{i32 14, i32 0, !33, null}<br>
+!65 = !MDLocation(line: 14, scope: !33)<br>
!66 = !{!"0x101\00this\0016777230\001088", !34, !5, !64} ; [ DW_TAG_arg_variable ] [this] [line 14]<br>
-!67 = !{i32 14, i32 0, !34, null}<br>
+!67 = !MDLocation(line: 14, scope: !34)<br>
!68 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/rvalue-ref.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/rvalue-ref.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/rvalue-ref.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/rvalue-ref.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/rvalue-ref.ll Wed Jan 14 16:27:36 2015<br>
@@ -33,9 +33,9 @@ declare i32 @printf(i8*, ...)<br>
!9 = !{!"0x42\00\000\000\000\000\000", null, null, !10} ; [ DW_TAG_rvalue_reference_type ]<br>
!10 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]<br>
!11 = !{!"0x101\00i\0016777220\000", !5, !6, !9} ; [ DW_TAG_arg_variable ]<br>
-!12 = !{i32 4, i32 17, !5, null}<br>
-!13 = !{i32 6, i32 3, !14, null}<br>
+!12 = !MDLocation(line: 4, column: 17, scope: !5)<br>
+!13 = !MDLocation(line: 6, column: 3, scope: !14)<br>
!14 = !{!"0xb\005\001\000", !16, !5} ; [ DW_TAG_lexical_block ]<br>
-!15 = !{i32 7, i32 1, !14, null}<br>
+!15 = !MDLocation(line: 7, column: 1, scope: !14)<br>
!16 = !{!"foo.cpp", !"/Users/echristo/tmp"}<br>
!17 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/sret.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/sret.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/sret.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/sret.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/sret.ll Wed Jan 14 16:27:36 2015<br>
@@ -325,69 +325,69 @@ attributes #7 = { builtin nounwind }<br>
!66 = !{!"clang version 3.5.0 (trunk 203283) (llvm/trunk 203307)"}<br>
!67 = !{!"0x101\00this\0016777216\001088", !49, null, !68} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!68 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1A]<br>
-!69 = !{i32 0, i32 0, !49, null}<br>
+!69 = !MDLocation(line: 0, scope: !49)<br>
!70 = !{!"0x101\00i\0033554448\000", !49, !7, !12} ; [ DW_TAG_arg_variable ] [i] [line 16]<br>
-!71 = !{i32 16, i32 0, !49, null}<br>
-!72 = !{i32 18, i32 0, !49, null}<br>
-!73 = !{i32 19, i32 0, !49, null}<br>
+!71 = !MDLocation(line: 16, scope: !49)<br>
+!72 = !MDLocation(line: 18, scope: !49)<br>
+!73 = !MDLocation(line: 19, scope: !49)<br>
!74 = !{!"0x101\00this\0016777216\001088", !50, null, !68} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!75 = !{i32 0, i32 0, !50, null}<br>
+!75 = !MDLocation(line: 0, scope: !50)<br>
!76 = !{!"0x101\00rhs\0033554453\000", !50, !7, !22} ; [ DW_TAG_arg_variable ] [rhs] [line 21]<br>
-!77 = !{i32 21, i32 0, !50, null}<br>
-!78 = !{i32 23, i32 0, !50, null}<br>
-!79 = !{i32 24, i32 0, !50, null}<br>
+!77 = !MDLocation(line: 21, scope: !50)<br>
+!78 = !MDLocation(line: 23, scope: !50)<br>
+!79 = !MDLocation(line: 24, scope: !50)<br>
!80 = !{!"0x101\00this\0016777216\001088", !51, null, !68} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!81 = !{i32 0, i32 0, !51, null}<br>
+!81 = !MDLocation(line: 0, scope: !51)<br>
!82 = !{!"0x101\00rhs\0033554459\000", !51, !7, !22} ; [ DW_TAG_arg_variable ] [rhs] [line 27]<br>
-!83 = !{i32 27, i32 0, !51, null}<br>
-!84 = !{i32 29, i32 0, !51, null}<br>
-!85 = !{i32 30, i32 0, !51, null}<br>
+!83 = !MDLocation(line: 27, scope: !51)<br>
+!84 = !MDLocation(line: 29, scope: !51)<br>
+!85 = !MDLocation(line: 30, scope: !51)<br>
!86 = !{!"0x101\00this\0016777216\001088", !52, null, !68} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!87 = !{i32 0, i32 0, !52, null}<br>
-!88 = !{i32 35, i32 0, !52, null}<br>
+!87 = !MDLocation(line: 0, scope: !52)<br>
+!88 = !MDLocation(line: 35, scope: !52)<br>
!89 = !{!"0x101\00this\0016777216\001088", !53, null, !90} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!90 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1B"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1B]<br>
-!91 = !{i32 0, i32 0, !53, null}<br>
-!92 = !{i32 49, i32 0, !53, null}<br>
+!91 = !MDLocation(line: 0, scope: !53)<br>
+!92 = !MDLocation(line: 49, scope: !53)<br>
!93 = !{!"0x100\00a\0049\008192", !53, !7, !4} ; [ DW_TAG_auto_variable ] [a] [line 49]<br>
-!94 = !{i32 50, i32 0, !53, null}<br>
-!95 = !{i32 51, i32 0, !53, null}<br>
-!96 = !{i32 51, i32 0, !97, null}<br>
+!94 = !MDLocation(line: 50, scope: !53)<br>
+!95 = !MDLocation(line: 51, scope: !53)<br>
+!96 = !MDLocation(line: 51, scope: !97)<br>
!97 = !{!"0xb\0051\000\002", !1, !53} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/sret.cpp]<br>
-!98 = !{i32 51, i32 0, !99, null}<br>
+!98 = !MDLocation(line: 51, scope: !99)<br>
!99 = !{!"0xb\0051\000\003", !1, !100} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/sret.cpp]<br>
!100 = !{!"0xb\0051\000\001", !1, !53} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/sret.cpp]<br>
!101 = !{!"0x101\00this\0016777216\001088", !63, null, !68} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!102 = !{i32 0, i32 0, !63, null}<br>
-!103 = !{i32 8, i32 0, !63, null}<br>
+!102 = !MDLocation(line: 0, scope: !63)<br>
+!103 = !MDLocation(line: 8, scope: !63)<br>
!104 = !{!"0x101\00argc\0016777269\000", !54, !7, !12} ; [ DW_TAG_arg_variable ] [argc] [line 53]<br>
-!105 = !{i32 53, i32 0, !54, null}<br>
+!105 = !MDLocation(line: 53, scope: !54)<br>
!106 = !{!"0x101\00argv\0033554485\000", !54, !7, !57} ; [ DW_TAG_arg_variable ] [argv] [line 53]<br>
!107 = !{!"0x100\00b\0055\000", !54, !7, !37} ; [ DW_TAG_auto_variable ] [b] [line 55]<br>
-!108 = !{i32 55, i32 0, !54, null}<br>
+!108 = !MDLocation(line: 55, scope: !54)<br>
!109 = !{!"0x100\00return_val\0056\000", !54, !7, !12} ; [ DW_TAG_auto_variable ] [return_val] [line 56]<br>
-!110 = !{i32 56, i32 0, !54, null}<br>
-!111 = !{i32 56, i32 0, !112, null}<br>
+!110 = !MDLocation(line: 56, scope: !54)<br>
+!111 = !MDLocation(line: 56, scope: !112)<br>
!112 = !{!"0xb\0056\000\001", !1, !54} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/sret.cpp]<br>
!113 = !{!"0x100\00a\0058\000", !54, !7, !4} ; [ DW_TAG_auto_variable ] [a] [line 58]<br>
-!114 = !{i32 58, i32 0, !54, null}<br>
-!115 = !{i32 59, i32 0, !54, null}<br>
-!116 = !{i32 60, i32 0, !54, null}<br>
-!117 = !{i32 60, i32 0, !118, null}<br>
+!114 = !MDLocation(line: 58, scope: !54)<br>
+!115 = !MDLocation(line: 59, scope: !54)<br>
+!116 = !MDLocation(line: 60, scope: !54)<br>
+!117 = !MDLocation(line: 60, scope: !118)<br>
!118 = !{!"0xb\0060\000\001", !1, !54} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/sret.cpp]<br>
-!119 = !{i32 60, i32 0, !120, null}<br>
+!119 = !MDLocation(line: 60, scope: !120)<br>
!120 = !{!"0xb\0060\000\003", !1, !54} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/sret.cpp]<br>
-!121 = !{i32 60, i32 0, !122, null}<br>
+!121 = !MDLocation(line: 60, scope: !122)<br>
!122 = !{!"0xb\0060\000\002", !1, !54} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/sret.cpp]<br>
!123 = !{!"0x101\00this\0016777216\001088", !62, null, !90} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!124 = !{i32 0, i32 0, !62, null}<br>
-!125 = !{i32 41, i32 0, !62, null}<br>
+!124 = !MDLocation(line: 0, scope: !62)<br>
+!125 = !MDLocation(line: 41, scope: !62)<br>
!126 = !{!"0x101\00this\0016777216\001088", !61, null, !68} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!127 = !{i32 0, i32 0, !61, null}<br>
-!128 = !{i32 8, i32 0, !61, null}<br>
-!129 = !{i32 8, i32 0, !130, null}<br>
+!127 = !MDLocation(line: 0, scope: !61)<br>
+!128 = !MDLocation(line: 8, scope: !61)<br>
+!129 = !MDLocation(line: 8, scope: !130)<br>
!130 = !{!"0xb\008\000\001", !1, !61} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/sret.cpp]<br>
-!131 = !{i32 8, i32 0, !132, null}<br>
+!131 = !MDLocation(line: 8, scope: !132)<br>
!132 = !{!"0xb\008\000\002", !1, !61} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/sret.cpp]<br>
-!133 = !{i32 8, i32 0, !134, null}<br>
+!133 = !MDLocation(line: 8, scope: !134)<br>
!134 = !{!"0xb\008\000\003", !1, !61} ; [ DW_TAG_lexical_block ] [/usr/local/google/home/echristo/tmp/sret.cpp]<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll Wed Jan 14 16:27:36 2015<br>
@@ -92,12 +92,12 @@ entry:<br>
!13 = !{!"0x2e\00fn\00fn\00\001\000\001\000\006\00256\000\001", !24, !14, !7, null, i32 (i32)* @fn, null, null, !1} ; [ DW_TAG_subprogram ] [line 1] [def] [fn]<br>
!14 = !{!"0x29", !24} ; [ DW_TAG_file_type ]<br>
!15 = !{!"0x101\00a\0016777218\000", !5, !6, !9} ; [ DW_TAG_arg_variable ] [a] [line 2]<br>
-!16 = !{i32 2, i32 0, !5, null}<br>
-!17 = !{i32 4, i32 0, !18, null}<br>
+!16 = !MDLocation(line: 2, scope: !5)<br>
+!17 = !MDLocation(line: 4, scope: !18)<br>
!18 = !{!"0xb\003\000\000", !23, !5} ; [ DW_TAG_lexical_block ]<br>
!19 = !{!"0x101\00a\0016777217\000", !13, !14, !9} ; [ DW_TAG_arg_variable ] [a] [line 1]<br>
-!20 = !{i32 1, i32 0, !13, null}<br>
-!21 = !{i32 2, i32 0, !22, null}<br>
+!20 = !MDLocation(line: 1, scope: !13)<br>
+!21 = !MDLocation(line: 2, scope: !22)<br>
!22 = !{!"0xb\001\000\000", !24, !13} ; [ DW_TAG_lexical_block ]<br>
!23 = !{!"simple.c", !"/private/tmp"}<br>
!24 = !{!"simple2.c", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/subrange-type.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/subrange-type.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/subrange-type.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/subrange-type.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/subrange-type.ll Wed Jan 14 16:27:36 2015<br>
@@ -34,7 +34,7 @@ declare void @llvm.dbg.declare(metadata,<br>
!12 = !{!"0x1\00\000\0064\0032\000\000", null, null, !9, !13, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 64, align 32, offset 0] [from int]<br>
!13 = !{!14}<br>
!14 = !{!"0x21\000\002"} ; [ DW_TAG_subrange_type ] [0, 1]<br>
-!15 = !{i32 4, i32 0, !11, null}<br>
-!16 = !{i32 6, i32 0, !11, null}<br>
+!15 = !MDLocation(line: 4, scope: !11)<br>
+!16 = !MDLocation(line: 6, scope: !11)<br>
!17 = !{!"foo.c", !"/usr/local/google/home/echristo/tmp"}<br>
!18 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/subreg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/subreg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/subreg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/subreg.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/subreg.ll Wed Jan 14 16:27:36 2015<br>
@@ -28,7 +28,7 @@ declare void @llvm.dbg.value(metadata, i<br>
!4 = !{!"0x15\00\000\000\000\000\000\000", !10, !2, null, !5, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!5 = !{null}<br>
!6 = !{!"0x24\00short\000\0016\0016\000\000\005", null, !3} ; [ DW_TAG_base_type ]<br>
-!7 = !{i32 4, i32 22, !8, null}<br>
+!7 = !MDLocation(line: 4, column: 22, scope: !8)<br>
!8 = !{!"0xb\003\0019\000", !10, !1} ; [ DW_TAG_lexical_block ]<br>
!10 = !{!"/home/espindola/llvm/test.c", !"/home/espindola/tmpfs/build"}<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/subregisters.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/subregisters.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/subregisters.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/subregisters.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/subregisters.ll Wed Jan 14 16:27:36 2015<br>
@@ -103,15 +103,15 @@ attributes #4 = { nounwind }<br>
!22 = !{i32 2, !"Dwarf Version", i32 2}<br>
!23 = !{i32 1, !"Debug Info Version", i32 2}<br>
!24 = !{!"clang version 3.5 "}<br>
-!25 = !{i32 10, i32 0, !4, null}<br>
-!26 = !{i32 12, i32 0, !4, null}<br>
+!25 = !MDLocation(line: 10, scope: !4)<br>
+!26 = !MDLocation(line: 12, scope: !4)<br>
!27 = !{!28, !29, i64 0}<br>
!28 = !{!"bar", !29, i64 0, !29, i64 4}<br>
!29 = !{!"int", !30, i64 0}<br>
!30 = !{!"omnipotent char", !31, i64 0}<br>
!31 = !{!"Simple C/C++ TBAA"}<br>
-!32 = !{i32 13, i32 0, !4, null}<br>
-!33 = !{i32 14, i32 0, !4, null}<br>
-!34 = !{i32 18, i32 0, !17, null}<br>
-!35 = !{i32 19, i32 0, !17, null}<br>
-!36 = !{i32 20, i32 0, !17, null}<br>
+!32 = !MDLocation(line: 13, scope: !4)<br>
+!33 = !MDLocation(line: 14, scope: !4)<br>
+!34 = !MDLocation(line: 18, scope: !17)<br>
+!35 = !MDLocation(line: 19, scope: !17)<br>
+!36 = !MDLocation(line: 20, scope: !17)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/template.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/template.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/template.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/template.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/template.ll Wed Jan 14 16:27:36 2015<br>
@@ -125,6 +125,6 @@ attributes #0 = { nounwind uwtable "less<br>
!33 = !{i32 2, !"Dwarf Version", i32 4}<br>
!34 = !{i32 2, !"Debug Info Version", i32 2}<br>
!35 = !{!"clang version 3.6.0 (trunk 224394) (llvm/trunk 224384)"}<br>
-!36 = !{i32 3, i32 12, !10, null}<br>
-!37 = !{i32 1, i32 96, !14, null}<br>
-!38 = !{i32 0, i32 0, !28, null}<br>
+!36 = !MDLocation(line: 3, column: 12, scope: !10)<br>
+!37 = !MDLocation(line: 1, column: 96, scope: !14)<br>
+!38 = !MDLocation(line: 0, scope: !28)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/tls.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/tls.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/tls.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/tls.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/tls.ll Wed Jan 14 16:27:36 2015<br>
@@ -99,4 +99,4 @@ attributes #0 = { nounwind uwtable "less<br>
!15 = !{i32 2, !"Dwarf Version", i32 4}<br>
!16 = !{i32 1, !"Debug Info Version", i32 2}<br>
!17 = !{!"clang version 3.5 "}<br>
-!18 = !{i32 6, i32 0, !4, null}<br>
+!18 = !MDLocation(line: 6, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/union-template.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/union-template.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/union-template.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/union-template.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/union-template.ll Wed Jan 14 16:27:36 2015<br>
@@ -53,8 +53,8 @@ attributes #1 = { nounwind readnone }<br>
!21 = !{!22}<br>
!22 = !{!"0x2f\00T\000\000", null, !8, null} ; [ DW_TAG_template_type_parameter ]<br>
!23 = !{!"0x101\00value\0016777219\000", !4, !11, !8} ; [ DW_TAG_arg_variable ] [value] [line 3]<br>
-!24 = !{i32 3, i32 0, !4, null}<br>
+!24 = !MDLocation(line: 3, scope: !4)<br>
!25 = !{!"0x100\00tempValue\004\000", !4, !11, !12} ; [ DW_TAG_auto_variable ] [tempValue] [line 4]<br>
-!26 = !{i32 4, i32 0, !4, null}<br>
-!27 = !{i32 5, i32 0, !4, null}<br>
+!26 = !MDLocation(line: 4, scope: !4)<br>
+!27 = !MDLocation(line: 5, scope: !4)<br>
!28 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/vla.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/vla.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/vla.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/vla.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/vla.ll Wed Jan 14 16:27:36 2015<br>
@@ -91,17 +91,17 @@ entry:<br>
!13 = !{!"0xf\00\000\0064\0064\000\000", null, null, !14} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from char]<br>
!14 = !{!"0x24\00char\000\008\008\000\000\006", null, null} ; [ DW_TAG_base_type ] [char] [line 0, size 8, align 8, offset 0, enc DW_ATE_signed_char]<br>
!15 = !{!"0x101\00n\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [n] [line 1]<br>
-!16 = !{i32 1, i32 0, !4, null}<br>
-!17 = !{i32 2, i32 0, !4, null}<br>
+!16 = !MDLocation(line: 1, scope: !4)<br>
+!17 = !MDLocation(line: 2, scope: !4)<br>
!18 = !{!"0x100\00a\002\008192", !4, !5, !19} ; [ DW_TAG_auto_variable ] [a] [line 2]<br>
!19 = !{!"0x1\00\000\000\0032\000\000", null, null, !8, !20, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 0, align 32, offset 0] [from int]<br>
!20 = !{!21}<br>
!21 = !{!"0x21\000\00-1"} ; [ DW_TAG_subrange_type ] [unbounded]<br>
-!22 = !{i32 3, i32 0, !4, null}<br>
-!23 = !{i32 4, i32 0, !4, null}<br>
-!24 = !{i32 5, i32 0, !4, null}<br>
+!22 = !MDLocation(line: 3, scope: !4)<br>
+!23 = !MDLocation(line: 4, scope: !4)<br>
+!24 = !MDLocation(line: 5, scope: !4)<br>
!25 = !{!"0x101\00argc\0016777223\000", !9, !5, !8} ; [ DW_TAG_arg_variable ] [argc] [line 7]<br>
-!26 = !{i32 7, i32 0, !9, null}<br>
+!26 = !MDLocation(line: 7, scope: !9)<br>
!27 = !{!"0x101\00argv\0033554439\000", !9, !5, !12} ; [ DW_TAG_arg_variable ] [argv] [line 7]<br>
-!28 = !{i32 8, i32 0, !9, null}<br>
+!28 = !MDLocation(line: 8, scope: !9)<br>
!29 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/array.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/array.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/array.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/array.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/array.ll Wed Jan 14 16:27:36 2015<br>
@@ -31,8 +31,8 @@ declare void @llvm.dbg.declare(metadata,<br>
;CHECK-NOT: DW_AT_upper_bound<br>
;CHECK-NEXT: End Of Children Mark<br>
!10 = !{!"0x21\000\00-1"} ; [ DW_TAG_subrange_type ]<br>
-!11 = !{i32 4, i32 7, !7, null}<br>
-!12 = !{i32 5, i32 3, !7, null}<br>
+!11 = !MDLocation(line: 4, column: 7, scope: !7)<br>
+!12 = !MDLocation(line: 5, column: 3, scope: !7)<br>
!13 = !{!0}<br>
!14 = !{!"array.c", !"/private/tmp"}<br>
!15 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/block-asan.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/block-asan.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/block-asan.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/block-asan.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/block-asan.ll Wed Jan 14 16:27:36 2015<br>
@@ -81,7 +81,7 @@ attributes #3 = { nounwind }<br>
!20 = !{!"0xd\00__size\000\0032\0032\00160\000", !1, !5, !19} ; [ DW_TAG_member ] [__size] [line 0, size 32, align 32, offset 160] [from int]<br>
!21 = !{!"0xd\00x\000\0032\0032\00192\000", !1, !5, !19} ; [ DW_TAG_member ] [x] [line 0, size 32, align 32, offset 192] [from int]<br>
!22 = !{!"0x102\0034\008\006\0034\0024"} ; [ DW_TAG_expression ] [DW_OP_plus 8] [DW_OP_deref] [DW_OP_plus 24]<br>
-!23 = !{i32 4, i32 15, !4, null}<br>
-!24 = !{i32 4, i32 3, !4, null}<br>
-!25 = !{i32 5, i32 3, !4, null}<br>
-!26 = !{i32 6, i32 1, !4, null}<br>
+!23 = !MDLocation(line: 4, column: 15, scope: !4)<br>
+!24 = !MDLocation(line: 4, column: 3, scope: !4)<br>
+!25 = !MDLocation(line: 5, column: 3, scope: !4)<br>
+!26 = !MDLocation(line: 6, column: 1, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/constant-pointers.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/constant-pointers.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/constant-pointers.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/constant-pointers.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/constant-pointers.ll Wed Jan 14 16:27:36 2015<br>
@@ -48,4 +48,4 @@ attributes #0 = { nounwind uwtable "less<br>
!15 = !{i32 2, !"Dwarf Version", i32 4}<br>
!16 = !{i32 2, !"Debug Info Version", i32 2}<br>
!17 = !{!"clang version 3.5.0 "}<br>
-!18 = !{i32 3, i32 0, !4, null}<br>
+!18 = !MDLocation(line: 3, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/cross-cu-inlining.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/cross-cu-inlining.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/cross-cu-inlining.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/cross-cu-inlining.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/cross-cu-inlining.ll Wed Jan 14 16:27:36 2015<br>
@@ -131,10 +131,10 @@ attributes #3 = { nounwind }<br>
!16 = !{i32 2, !"Dwarf Version", i32 4}<br>
!17 = !{i32 2, !"Debug Info Version", i32 2}<br>
!18 = !{!"clang version 3.5.0 "}<br>
-!19 = !{i32 4, i32 0, !4, null}<br>
+!19 = !MDLocation(line: 4, scope: !4)<br>
!20 = !{!"0x101\00x\0016777217\000", !12, !13, !8} ; [ DW_TAG_arg_variable ] [x] [line 1]<br>
-!21 = !{i32 1, i32 0, !12, !19}<br>
-!22 = !{i32 2, i32 0, !12, !19}<br>
-!23 = !{i32 1, i32 0, !12, null}<br>
-!24 = !{i32 2, i32 0, !12, null}<br>
+!21 = !MDLocation(line: 1, scope: !12, inlinedAt: !19)<br>
+!22 = !MDLocation(line: 2, scope: !12, inlinedAt: !19)<br>
+!23 = !MDLocation(line: 1, scope: !12)<br>
+!24 = !MDLocation(line: 2, scope: !12)<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/cross-cu-linkonce-distinct.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/cross-cu-linkonce-distinct.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/cross-cu-linkonce-distinct.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/cross-cu-linkonce-distinct.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/cross-cu-linkonce-distinct.ll Wed Jan 14 16:27:36 2015<br>
@@ -91,5 +91,5 @@ attributes #1 = { nounwind readnone }<br>
!20 = !{i32 1, !"Debug Info Version", i32 2}<br>
!21 = !{!"clang version 3.5.0 "}<br>
!22 = !{!"0x101\00i\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [i] [line 1]<br>
-!23 = !{i32 1, i32 0, !4, null}<br>
-!24 = !{i32 2, i32 0, !4, null}<br>
+!23 = !MDLocation(line: 1, scope: !4)<br>
+!24 = !MDLocation(line: 2, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/cross-cu-linkonce.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/cross-cu-linkonce.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/cross-cu-linkonce.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/cross-cu-linkonce.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/cross-cu-linkonce.ll Wed Jan 14 16:27:36 2015<br>
@@ -69,5 +69,5 @@ attributes #1 = { nounwind readnone }<br>
!18 = !{i32 1, !"Debug Info Version", i32 2}<br>
!19 = !{!"clang version 3.5.0 "}<br>
!20 = !{!"0x101\00i\0016777217\000", !4, !6, !9} ; [ DW_TAG_arg_variable ] [i] [line 1]<br>
-!21 = !{i32 1, i32 0, !4, null}<br>
-!22 = !{i32 2, i32 0, !4, null}<br>
+!21 = !MDLocation(line: 1, scope: !4)<br>
+!22 = !MDLocation(line: 2, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/cu-range-hole.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/cu-range-hole.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/cu-range-hole.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/cu-range-hole.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/cu-range-hole.ll Wed Jan 14 16:27:36 2015<br>
@@ -69,6 +69,6 @@ attributes #1 = { nounwind readnone }<br>
!11 = !{i32 2, !"Dwarf Version", i32 4}<br>
!12 = !{i32 1, !"Debug Info Version", i32 2}<br>
!13 = !{!"0x101\00c\0016777217\000", !5, !6, !9} ; [ DW_TAG_arg_variable ] [c] [line 1]<br>
-!14 = !{i32 1, i32 0, !5, null}<br>
+!14 = !MDLocation(line: 1, scope: !5)<br>
!15 = !{!"0x101\00e\0016777219\000", !10, !6, !9} ; [ DW_TAG_arg_variable ] [e] [line 3]<br>
-!16 = !{i32 3, i32 0, !10, null}<br>
+!16 = !MDLocation(line: 3, scope: !10)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/cu-ranges.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/cu-ranges.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/cu-ranges.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/cu-ranges.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/cu-ranges.ll Wed Jan 14 16:27:36 2015<br>
@@ -63,9 +63,9 @@ attributes #1 = { nounwind readnone }<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
!12 = !{!"clang version 3.5.0 (trunk 204164) (llvm/trunk 204183)"}<br>
!13 = !{!"0x101\00a\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [a] [line 1]<br>
-!14 = !{i32 1, i32 0, !4, null}<br>
-!15 = !{i32 2, i32 0, !4, null}<br>
+!14 = !MDLocation(line: 1, scope: !4)<br>
+!15 = !MDLocation(line: 2, scope: !4)<br>
!16 = !{!"0x101\00a\0016777221\000", !9, !5, !8} ; [ DW_TAG_arg_variable ] [a] [line 5]<br>
-!17 = !{i32 5, i32 0, !9, null}<br>
-!18 = !{i32 6, i32 0, !9, null}<br>
+!17 = !MDLocation(line: 5, scope: !9)<br>
+!18 = !MDLocation(line: 6, scope: !9)<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/dead-argument-order.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dead-argument-order.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dead-argument-order.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/dead-argument-order.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/dead-argument-order.ll Wed Jan 14 16:27:36 2015<br>
@@ -77,5 +77,5 @@ attributes #1 = { nounwind readnone }<br>
!17 = !{i32 2, !"Debug Info Version", i32 2}<br>
!18 = !{!"clang version 3.5.0 "}<br>
!19 = !{%struct.S* undef}<br>
-!20 = !{i32 2, i32 0, !9, null}<br>
+!20 = !MDLocation(line: 2, scope: !9)<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/debug-info-always-inline.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/debug-info-always-inline.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/debug-info-always-inline.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/debug-info-always-inline.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/debug-info-always-inline.ll Wed Jan 14 16:27:36 2015<br>
@@ -132,12 +132,12 @@ attributes #3 = { "less-precise-fpmad"="<br>
!15 = !{i32 786433, null, null, !"", i32 0, i64 320, i64 32, i32 0, i32 0, !9, !16, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 320, align 32, offset 0] [from int]<br>
!16 = !{!17}<br>
!17 = !{i32 786465, i64 0, i64 10} ; [ DW_TAG_subrange_type ] [0, 9]<br>
-!18 = !{i32 3, i32 0, !4, null}<br>
-!19 = !{i32 4, i32 0, !4, null}<br>
+!18 = !MDLocation(line: 3, scope: !4)<br>
+!19 = !MDLocation(line: 4, scope: !4)<br>
!20 = !{i32 786688, !4, !"sum", !6, i32 5, !9, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [sum] [line 5]<br>
-!21 = !{i32 5, i32 0, !4, null}<br>
-!22 = !{i32 6, i32 0, !4, null}<br>
-!23 = !{i32 13, i32 0, !10, null}<br>
+!21 = !MDLocation(line: 5, scope: !4)<br>
+!22 = !MDLocation(line: 6, scope: !4)<br>
+!23 = !MDLocation(line: 13, scope: !10)<br>
!24 = !{i32 786688, !10, !"i", !6, i32 14, !9, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [i] [line 14]<br>
-!25 = !{i32 14, i32 0, !10, null}<br>
-!26 = !{i32 15, i32 0, !10, null}<br>
+!25 = !MDLocation(line: 14, scope: !10)<br>
+!26 = !MDLocation(line: 15, scope: !10)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/debug-info-qualifiers.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/debug-info-qualifiers.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/debug-info-qualifiers.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/debug-info-qualifiers.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/debug-info-qualifiers.ll Wed Jan 14 16:27:36 2015<br>
@@ -86,15 +86,15 @@ attributes #1 = { nounwind readnone }<br>
!22 = !{i32 1, !"Debug Info Version", i32 2}<br>
!23 = !{!"clang version 3.5 "}<br>
!24 = !{!"0x100\00a\0011\000", !17, !18, !4} ; [ DW_TAG_auto_variable ] [a] [line 11]<br>
-!25 = !{i32 11, i32 0, !17, null}<br>
+!25 = !MDLocation(line: 11, scope: !17)<br>
!26 = !{!"0x100\00pl\0016\000", !17, !18, !27} ; [ DW_TAG_auto_variable ] [pl] [line 16]<br>
!27 = !{!"0x1f\00\000\000\000\000\000", null, null, !28, !"_ZTS1A"} ; [ DW_TAG_ptr_to_member_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!28 = !{!"0x15\00\000\000\000\000\0016384\000", i32 0, null, null, !29, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [reference] [from ]<br>
!29 = !{null, !30}<br>
!30 = !{!"0xf\00\000\0064\0064\000\001088", null, null, !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [artificial] [from _ZTS1A]<br>
-!31 = !{i32 16, i32 0, !17, null}<br>
+!31 = !MDLocation(line: 16, scope: !17)<br>
!32 = !{!"0x100\00pr\0021\000", !17, !18, !33} ; [ DW_TAG_auto_variable ] [pr] [line 21]<br>
!33 = !{!"0x1f\00\000\000\000\000\000", null, null, !34, !"_ZTS1A"} ; [ DW_TAG_ptr_to_member_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!34 = !{!"0x15\00\000\000\000\000\0032768\000", i32 0, null, null, !29, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [rvalue reference] [from ]<br>
-!35 = !{i32 21, i32 0, !17, null}<br>
-!36 = !{i32 22, i32 0, !17, null}<br>
+!35 = !MDLocation(line: 21, scope: !17)<br>
+!36 = !MDLocation(line: 22, scope: !17)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/debuginfofinder-multiple-cu.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/debuginfofinder-multiple-cu.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/debuginfofinder-multiple-cu.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/debuginfofinder-multiple-cu.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/debuginfofinder-multiple-cu.ll Wed Jan 14 16:27:36 2015<br>
@@ -36,6 +36,6 @@ define void @g() {<br>
!11 = !{!"0x2e\00g\00g\00\001\000\001\000\006\000\000\001", !9, !12, !6, null, void ()* @g, null, null, !2} ; [ DW_TAG_subprogram ] [line 1] [def] [g]<br>
!12 = !{!"0x29", !9} ; [ DW_TAG_file_type ] [/tmp/test2.c]<br>
!13 = !{i32 2, !"Dwarf Version", i32 4}<br>
-!14 = !{i32 1, i32 0, !4, null}<br>
-!15 = !{i32 1, i32 0, !11, null}<br>
+!14 = !MDLocation(line: 1, scope: !4)<br>
+!15 = !MDLocation(line: 1, scope: !11)<br>
!16 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/duplicate_inline.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/duplicate_inline.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/duplicate_inline.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/duplicate_inline.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/duplicate_inline.ll Wed Jan 14 16:27:36 2015<br>
@@ -20,14 +20,14 @@<br>
; appears to be only one inlined function.<br>
; To fix this, we'd need to add some kind of unique metadata per call site, possibly something like:<br>
;<br>
-; !42 = !{i32 1, i32 0, !43, !44}<br>
-; !44 = !{i32 2, i32 0, !45, null}<br>
+; !42 = !MDLocation(line: 1, scope: !43, inlinedAt: !44)<br>
+; !44 = !MDLocation(line: 2, scope: !45)<br>
;<br>
; -><br>
;<br>
-; !42 = !{i32 1, i32 0, !43, !44}<br>
+; !42 = !MDLocation(line: 1, scope: !43, inlinedAt: !44)<br>
; !44 = !{!45, !44}<br>
-; !45 = !{i32 2, i32 0, !45, null}<br>
+; !45 = !MDLocation(line: 2, scope: !45)<br>
;<br>
; since cycles in metadata are not uniqued, the !44 node would not be shared<br>
; between calls to the same function from the same location, ensuring separate<br>
@@ -107,11 +107,11 @@ attributes #2 = { "less-precise-fpmad"="<br>
!14 = !{!"clang version 3.6.0 "}<br>
!15 = !{!"0x101\00x\0016777224\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [x] [line 8]<br>
!16 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!17 = !{i32 8, i32 13, !4, null}<br>
+!17 = !MDLocation(line: 8, column: 13, scope: !4)<br>
!18 = !{!"0x101\00y\0033554440\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [y] [line 8]<br>
-!19 = !{i32 8, i32 20, !4, null}<br>
-!20 = !{i32 8, i32 25, !4, null}<br>
+!19 = !MDLocation(line: 8, column: 20, scope: !4)<br>
+!20 = !MDLocation(line: 8, column: 25, scope: !4)<br>
!21 = !{!"0x101\00i\0016777218\000", !9, !5, !8} ; [ DW_TAG_arg_variable ] [i] [line 2]<br>
-!22 = !{i32 2, i32 51, !9, !20}<br>
-!23 = !{i32 2, i32 56, !9, !20}<br>
-!24 = !{i32 8, i32 36, !4, null}<br>
+!22 = !MDLocation(line: 2, column: 51, scope: !9, inlinedAt: !20)<br>
+!23 = !MDLocation(line: 2, column: 56, scope: !9, inlinedAt: !20)<br>
+!24 = !MDLocation(line: 8, column: 36, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/dwarf-public-names.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dwarf-public-names.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dwarf-public-names.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/dwarf-public-names.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/dwarf-public-names.ll Wed Jan 14 16:27:36 2015<br>
@@ -120,12 +120,12 @@ attributes #1 = { nounwind readnone }<br>
!27 = !{!"0x34\00global_namespace_variable\00global_namespace_variable\00_ZN2ns25global_namespace_variableE\0027\000\001", !21, !4, !11, i32* @_ZN2ns25global_namespace_variableE, null} ; [ DW_TAG_variable ] [global_namespace_variable] [line 27] [def]<br>
!28 = !{!"0x101\00this\0016777225\001088", !3, !4, !29} ; [ DW_TAG_arg_variable ] [this] [line 9]<br>
!29 = !{!"0xf\00\000\0064\0064\000\000", null, null, !8} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from C]<br>
-!30 = !{i32 9, i32 0, !3, null}<br>
-!31 = !{i32 10, i32 0, !3, null}<br>
-!32 = !{i32 11, i32 0, !3, null}<br>
-!33 = !{i32 14, i32 0, !18, null}<br>
-!34 = !{i32 20, i32 0, !19, null}<br>
-!35 = !{i32 25, i32 0, !20, null}<br>
-!36 = !{i32 26, i32 0, !20, null}<br>
+!30 = !MDLocation(line: 9, scope: !3)<br>
+!31 = !MDLocation(line: 10, scope: !3)<br>
+!32 = !MDLocation(line: 11, scope: !3)<br>
+!33 = !MDLocation(line: 14, scope: !18)<br>
+!34 = !MDLocation(line: 20, scope: !19)<br>
+!35 = !MDLocation(line: 25, scope: !20)<br>
+!36 = !MDLocation(line: 26, scope: !20)<br>
!37 = !{!"dwarf-public-names.cpp", !"/usr2/kparzysz/s.hex/t"}<br>
!38 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/enum-types.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/enum-types.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/enum-types.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/enum-types.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/enum-types.ll Wed Jan 14 16:27:36 2015<br>
@@ -71,8 +71,8 @@ attributes #1 = { nounwind readnone }<br>
!20 = !{i32 2, !"Debug Info Version", i32 2}<br>
!21 = !{!"clang version 3.5.0 (trunk 214102:214133) (llvm/trunk 214102:214132)"}<br>
!22 = !{!"0x101\00sa\0016777221\000", !7, !8, !"_ZTS2EA"} ; [ DW_TAG_arg_variable ] [sa] [line 5]<br>
-!23 = !{i32 5, i32 14, !7, null}<br>
-!24 = !{i32 6, i32 1, !7, null}<br>
+!23 = !MDLocation(line: 5, column: 14, scope: !7)<br>
+!24 = !MDLocation(line: 6, column: 1, scope: !7)<br>
!25 = !{!"0x101\00sa\0016777221\000", !17, !18, !"_ZTS2EA"} ; [ DW_TAG_arg_variable ] [sa] [line 5]<br>
-!26 = !{i32 5, i32 14, !17, null}<br>
-!27 = !{i32 6, i32 1, !17, null}<br>
+!26 = !MDLocation(line: 5, column: 14, scope: !17)<br>
+!27 = !MDLocation(line: 6, column: 1, scope: !17)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/enum.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/enum.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/enum.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/enum.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/enum.ll Wed Jan 14 16:27:36 2015<br>
@@ -75,6 +75,6 @@ attributes #1 = { nounwind readnone }<br>
!19 = !{i32 2, !"Dwarf Version", i32 3}<br>
!20 = !{!"0x100\00b\004\000", !13, !14, !21} ; [ DW_TAG_auto_variable ] [b] [line 4]<br>
!21 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
-!22 = !{i32 4, i32 0, !13, null}<br>
-!23 = !{i32 5, i32 0, !13, null}<br>
+!22 = !MDLocation(line: 4, scope: !13)<br>
+!23 = !MDLocation(line: 5, scope: !13)<br>
!24 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/global.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/global.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/global.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/global.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/global.ll Wed Jan 14 16:27:36 2015<br>
@@ -38,5 +38,5 @@ attributes #0 = { nounwind readnone uwta<br>
!9 = !{!10}<br>
!10 = !{!"0x34\00i\00i\00_ZL1i\001\001\001", null, !5, !8, null, null} ; [ DW_TAG_variable ]<br>
!11 = !{i32 2, !"Dwarf Version", i32 3}<br>
-!12 = !{i32 4, i32 0, !4, null}<br>
+!12 = !MDLocation(line: 4, scope: !4)<br>
!13 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/incorrect-variable-debugloc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/incorrect-variable-debugloc.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/incorrect-variable-debugloc.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/incorrect-variable-debugloc.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/incorrect-variable-debugloc.ll Wed Jan 14 16:27:36 2015<br>
@@ -375,17 +375,17 @@ attributes #3 = { nounwind readnone }<br>
!36 = !{i32 2, !"Dwarf Version", i32 4}<br>
!37 = !{i32 2, !"Debug Info Version", i32 2}<br>
!38 = !{!"clang version 3.5.0 "}<br>
-!39 = !{i32 6, i32 0, !32, !40}<br>
-!40 = !{i32 18, i32 0, !22, null}<br>
+!39 = !MDLocation(line: 6, scope: !32, inlinedAt: !40)<br>
+!40 = !MDLocation(line: 18, scope: !22)<br>
!41 = !{!42, !43, i64 0}<br>
!42 = !{!"_ZTS1B", !43, i64 0}<br>
!43 = !{!"int", !44, i64 0}<br>
!44 = !{!"omnipotent char", !45, i64 0}<br>
!45 = !{!"Simple C/C++ TBAA"}<br>
-!46 = !{i32 17, i32 0, !22, null}<br>
-!47 = !{i32 19, i32 0, !22, null}<br>
-!48 = !{i32 0, i32 0, !28, null}<br>
-!49 = !{i32 22, i32 0, !28, null}<br>
-!50 = !{i32 6, i32 0, !32, !51}<br>
-!51 = !{i32 23, i32 0, !28, null}<br>
-!52 = !{i32 24, i32 0, !28, null}<br>
+!46 = !MDLocation(line: 17, scope: !22)<br>
+!47 = !MDLocation(line: 19, scope: !22)<br>
+!48 = !MDLocation(line: 0, scope: !28)<br>
+!49 = !MDLocation(line: 22, scope: !28)<br>
+!50 = !MDLocation(line: 6, scope: !32, inlinedAt: !51)<br>
+!51 = !MDLocation(line: 23, scope: !28)<br>
+!52 = !MDLocation(line: 24, scope: !28)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/incorrect-variable-debugloc1.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/incorrect-variable-debugloc1.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/incorrect-variable-debugloc1.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/incorrect-variable-debugloc1.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/incorrect-variable-debugloc1.ll Wed Jan 14 16:27:36 2015<br>
@@ -70,8 +70,8 @@ attributes #2 = { nounwind readnone }<br>
!14 = !{!"clang version 3.6.0 (trunk 223522)"}<br>
!15 = !{i32 13}<br>
!16 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!17 = !{i32 5, i32 16, !4, null}<br>
-!18 = !{i32 5, i32 3, !4, null}<br>
-!19 = !{i32 6, i32 7, !4, null}<br>
-!20 = !{i32 7, i32 3, !4, null}<br>
+!17 = !MDLocation(line: 5, column: 16, scope: !4)<br>
+!18 = !MDLocation(line: 5, column: 3, scope: !4)<br>
+!19 = !MDLocation(line: 6, column: 7, scope: !4)<br>
+!20 = !MDLocation(line: 7, column: 3, scope: !4)<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/inheritance.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inheritance.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inheritance.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/inheritance.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/inheritance.ll Wed Jan 14 16:27:36 2015<br>
@@ -126,29 +126,29 @@ declare void @_ZdlPv(i8*) nounwind<br>
!18 = !{!"0x2e\00~test1\00~test1\00\004\000\000\001\006\000\000\000", i32 0, !8, !19, !8, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!19 = !{!"0x15\00\000\000\000\000\000\000", !4, null, null, !20, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!20 = !{null, !17, !7}<br>
-!21 = !{i32 11, i32 0, !1, null}<br>
-!22 = !{i32 13, i32 0, !1, null}<br>
-!23 = !{i32 14, i32 0, !1, null}<br>
+!21 = !MDLocation(line: 11, scope: !1)<br>
+!22 = !MDLocation(line: 13, scope: !1)<br>
+!23 = !MDLocation(line: 14, scope: !1)<br>
!24 = !{!"0x101\00this\0013\000", !25, !4, !26} ; [ DW_TAG_arg_variable ]<br>
!25 = !{!"0x2e\00test1\00test1\00_ZN5test1C1Ev\001\000\001\000\006\000\000\000", i32 0, !4, !15, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!26 = !{!"0x26\00\000\0064\0064\000\0064", !4, null, !27} ; [ DW_TAG_const_type ]<br>
!27 = !{!"0xf\00\000\0064\0064\000\000", !4, null, !8} ; [ DW_TAG_pointer_type ]<br>
-!28 = !{i32 1, i32 0, !25, null}<br>
-!29 = !{i32 1, i32 0, !30, null}<br>
+!28 = !MDLocation(line: 1, scope: !25)<br>
+!29 = !MDLocation(line: 1, scope: !30)<br>
!30 = !{!"0xb\000\000\000", !44, !31} ; [ DW_TAG_lexical_block ]<br>
!31 = !{!"0xb\000\000\000", !44, !25} ; [ DW_TAG_lexical_block ]<br>
!32 = !{!"0x101\00this\004\000", !33, !4, !26} ; [ DW_TAG_arg_variable ]<br>
!33 = !{!"0x2e\00~test1\00~test1\00_ZN5test1D1Ev\004\000\001\001\006\000\000\000", i32 0, !8, !15, !8, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
-!34 = !{i32 4, i32 0, !33, null}<br>
-!35 = !{i32 5, i32 0, !36, null}<br>
+!34 = !MDLocation(line: 4, scope: !33)<br>
+!35 = !MDLocation(line: 5, scope: !36)<br>
!36 = !{!"0xb\000\000\000", !44, !33} ; [ DW_TAG_lexical_block ]<br>
-!37 = !{i32 6, i32 0, !36, null}<br>
+!37 = !MDLocation(line: 6, scope: !36)<br>
!38 = !{!"0x101\00this\004\000", !39, !4, !26} ; [ DW_TAG_arg_variable ]<br>
!39 = !{!"0x2e\00~test1\00~test1\00_ZN5test1D0Ev\004\000\001\001\006\000\000\000", i32 0, !8, !15, !8, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
-!40 = !{i32 4, i32 0, !39, null}<br>
-!41 = !{i32 5, i32 0, !42, null}<br>
+!40 = !MDLocation(line: 4, scope: !39)<br>
+!41 = !MDLocation(line: 5, scope: !42)<br>
!42 = !{!"0xb\000\000\000", !44, !39} ; [ DW_TAG_lexical_block ]<br>
-!43 = !{i32 6, i32 0, !42, null}<br>
+!43 = !MDLocation(line: 6, scope: !42)<br>
!44 = !{!"inheritance.cpp", !"/tmp/"}<br>
!45 = !{i32 0}<br>
!46 = !{!"<built-in>", !"/tmp/"}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/inline-debug-info-multiret.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inline-debug-info-multiret.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inline-debug-info-multiret.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/inline-debug-info-multiret.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/inline-debug-info-multiret.ll Wed Jan 14 16:27:36 2015<br>
@@ -10,8 +10,8 @@<br>
; CHECK: br label %invoke.cont, !dbg ![[MD]]<br>
; The branch instruction has the source location of line 9 and its inlined location<br>
; has the source location of line 14.<br>
-; CHECK: ![[INL:[0-9]+]] = !{i32 14, i32 0, {{.*}}, null}<br>
-; CHECK: ![[MD]] = !{i32 9, i32 0, {{.*}}, ![[INL]]}<br>
+; CHECK: ![[INL:[0-9]+]] = !MDLocation(line: 14, scope: {{.*}})<br>
+; CHECK: ![[MD]] = !MDLocation(line: 9, scope: {{.*}}, inlinedAt: ![[INL]])<br>
<br>
; ModuleID = 'test.cpp'<br>
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"<br>
@@ -136,21 +136,21 @@ attributes #2 = { nounwind }<br>
!11 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !12, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!12 = !{!9}<br>
!13 = !{!"0x101\00k\0016777220\000", !4, !6, !9} ; [ DW_TAG_arg_variable ] [k] [line 4]<br>
-!14 = !{i32 4, i32 0, !4, null}<br>
+!14 = !MDLocation(line: 4, scope: !4)<br>
!15 = !{!"0x100\00k2\005\000", !4, !6, !9} ; [ DW_TAG_auto_variable ] [k2] [line 5]<br>
-!16 = !{i32 5, i32 0, !4, null}<br>
-!17 = !{i32 6, i32 0, !4, null}<br>
-!18 = !{i32 7, i32 0, !4, null}<br>
-!19 = !{i32 8, i32 0, !4, null}<br>
-!20 = !{i32 9, i32 0, !4, null}<br>
-!21 = !{i32 14, i32 0, !22, null}<br>
+!16 = !MDLocation(line: 5, scope: !4)<br>
+!17 = !MDLocation(line: 6, scope: !4)<br>
+!18 = !MDLocation(line: 7, scope: !4)<br>
+!19 = !MDLocation(line: 8, scope: !4)<br>
+!20 = !MDLocation(line: 9, scope: !4)<br>
+!21 = !MDLocation(line: 14, scope: !22)<br>
!22 = !{!"0xb\0013\000\000", !5, !10} ; [ DW_TAG_lexical_block ] [test.cpp]<br>
-!23 = !{i32 15, i32 0, !22, null}<br>
+!23 = !MDLocation(line: 15, scope: !22)<br>
!24 = !{!"0x100\00e\0016\000", !10, !6, !9} ; [ DW_TAG_auto_variable ] [e] [line 16]<br>
-!25 = !{i32 16, i32 0, !10, null}<br>
-!26 = !{i32 17, i32 0, !27, null}<br>
+!25 = !MDLocation(line: 16, scope: !10)<br>
+!26 = !MDLocation(line: 17, scope: !27)<br>
!27 = !{!"0xb\0016\000\001", !5, !10} ; [ DW_TAG_lexical_block ] [test.cpp]<br>
-!28 = !{i32 18, i32 0, !27, null}<br>
-!29 = !{i32 19, i32 0, !10, null}<br>
-!30 = !{i32 20, i32 0, !10, null}<br>
+!28 = !MDLocation(line: 18, scope: !27)<br>
+!29 = !MDLocation(line: 19, scope: !10)<br>
+!30 = !MDLocation(line: 20, scope: !10)<br>
!31 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/inline-debug-info.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inline-debug-info.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inline-debug-info.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/inline-debug-info.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/inline-debug-info.ll Wed Jan 14 16:27:36 2015<br>
@@ -31,8 +31,8 @@<br>
; CHECK: br label %invoke.cont, !dbg ![[MD:[0-9]+]]<br>
; The branch instruction has the source location of line 9 and its inlined location<br>
; has the source location of line 14.<br>
-; CHECK: ![[INL:[0-9]+]] = !{i32 14, i32 0, {{.*}}, null}<br>
-; CHECK: ![[MD]] = !{i32 9, i32 0, {{.*}}, ![[INL]]}<br>
+; CHECK: ![[INL:[0-9]+]] = !MDLocation(line: 14, scope: {{.*}})<br>
+; CHECK: ![[MD]] = !MDLocation(line: 9, scope: {{.*}}, inlinedAt: ![[INL]])<br>
<br>
; ModuleID = 'test.cpp'<br>
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"<br>
@@ -154,21 +154,21 @@ attributes #2 = { nounwind }<br>
!11 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !12, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!12 = !{!9}<br>
!13 = !{!"0x101\00k\0016777220\000", !4, !6, !9} ; [ DW_TAG_arg_variable ] [k] [line 4]<br>
-!14 = !{i32 4, i32 0, !4, null}<br>
+!14 = !MDLocation(line: 4, scope: !4)<br>
!15 = !{!"0x100\00k2\005\000", !4, !6, !9} ; [ DW_TAG_auto_variable ] [k2] [line 5]<br>
-!16 = !{i32 5, i32 0, !4, null}<br>
-!17 = !{i32 6, i32 0, !4, null}<br>
-!18 = !{i32 7, i32 0, !4, null}<br>
-!19 = !{i32 8, i32 0, !4, null}<br>
-!20 = !{i32 9, i32 0, !4, null}<br>
-!21 = !{i32 14, i32 0, !22, null}<br>
+!16 = !MDLocation(line: 5, scope: !4)<br>
+!17 = !MDLocation(line: 6, scope: !4)<br>
+!18 = !MDLocation(line: 7, scope: !4)<br>
+!19 = !MDLocation(line: 8, scope: !4)<br>
+!20 = !MDLocation(line: 9, scope: !4)<br>
+!21 = !MDLocation(line: 14, scope: !22)<br>
!22 = !{!"0xb\0013\000\000", !5, !10} ; [ DW_TAG_lexical_block ] [test.cpp]<br>
-!23 = !{i32 15, i32 0, !22, null}<br>
+!23 = !MDLocation(line: 15, scope: !22)<br>
!24 = !{!"0x100\00e\0016\000", !10, !6, !9} ; [ DW_TAG_auto_variable ] [e] [line 16]<br>
-!25 = !{i32 16, i32 0, !10, null}<br>
-!26 = !{i32 17, i32 0, !27, null}<br>
+!25 = !MDLocation(line: 16, scope: !10)<br>
+!26 = !MDLocation(line: 17, scope: !27)<br>
!27 = !{!"0xb\0016\000\001", !5, !10} ; [ DW_TAG_lexical_block ] [test.cpp]<br>
-!28 = !{i32 18, i32 0, !27, null}<br>
-!29 = !{i32 19, i32 0, !10, null}<br>
-!30 = !{i32 20, i32 0, !10, null}<br>
+!28 = !MDLocation(line: 18, scope: !27)<br>
+!29 = !MDLocation(line: 19, scope: !10)<br>
+!30 = !MDLocation(line: 20, scope: !10)<br>
!31 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/inline-no-debug-info.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inline-no-debug-info.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inline-no-debug-info.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/inline-no-debug-info.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/inline-no-debug-info.ll Wed Jan 14 16:27:36 2015<br>
@@ -21,10 +21,10 @@<br>
<br>
; Debug location of the code in caller() and of the inlined code that did not<br>
; have any debug location before.<br>
-; CHECK-DAG: [[A]] = !{i32 4, i32 0, !{{[01-9]+}}, null}<br>
+; CHECK-DAG: [[A]] = !MDLocation(line: 4, scope: !{{[01-9]+}})<br>
<br>
; Debug location of the inlined code.<br>
-; CHECK-DAG: [[B]] = !{i32 2, i32 0, !{{[01-9]+}}, [[A]]}<br>
+; CHECK-DAG: [[B]] = !MDLocation(line: 2, scope: !{{[01-9]+}}, inlinedAt: [[A]])<br>
<br>
<br>
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
@@ -65,5 +65,5 @@ attributes #0 = { nounwind uwtable "less<br>
!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
!9 = !{i32 2, !"Debug Info Version", i32 2}<br>
!10 = !{!"clang version 3.5.0 (210174)"}<br>
-!11 = !{i32 2, i32 0, !7, null}<br>
-!12 = !{i32 4, i32 0, !4, null}<br>
+!11 = !MDLocation(line: 2, scope: !7)<br>
+!12 = !MDLocation(line: 4, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/inline-scopes.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inline-scopes.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inline-scopes.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/inline-scopes.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/inline-scopes.ll Wed Jan 14 16:27:36 2015<br>
@@ -114,17 +114,17 @@ attributes #2 = { "less-precise-fpmad"="<br>
!16 = !{!"0x100\00b\003\000", !17, !11, !18} ; [ DW_TAG_auto_variable ] [b] [line 3]<br>
!17 = !{!"0xb\003\000\001", !1, !12} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/inline-scopes.cpp]<br>
!18 = !{!"0x24\00bool\000\008\008\000\000\002", null, null} ; [ DW_TAG_base_type ] [bool] [line 0, size 8, align 8, offset 0, enc DW_ATE_boolean]<br>
-!19 = !{i32 3, i32 0, !17, !20}<br>
-!20 = !{i32 8, i32 0, !4, null}<br>
-!21 = !{i32 4, i32 0, !17, !20}<br>
-!22 = !{i32 5, i32 0, !12, !20}<br>
-!23 = !{i32 6, i32 0, !12, !20}<br>
+!19 = !MDLocation(line: 3, scope: !17, inlinedAt: !20)<br>
+!20 = !MDLocation(line: 8, scope: !4)<br>
+!21 = !MDLocation(line: 4, scope: !17, inlinedAt: !20)<br>
+!22 = !MDLocation(line: 5, scope: !12, inlinedAt: !20)<br>
+!23 = !MDLocation(line: 6, scope: !12, inlinedAt: !20)<br>
!24 = !{!"0x100\00b\002\000", !25, !6, !18} ; [ DW_TAG_auto_variable ] [b] [line 2]<br>
!25 = !{!"0xb\002\000\000", !5, !26} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/y.cc]<br>
!26 = !{!"0xb\000", !5, !10} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/y.cc]<br>
-!27 = !{i32 2, i32 0, !25, !28}<br>
-!28 = !{i32 9, i32 0, !4, null}<br>
-!29 = !{i32 3, i32 0, !25, !28}<br>
-!30 = !{i32 4, i32 0, !26, !28}<br>
-!31 = !{i32 5, i32 0, !26, !28}<br>
-!32 = !{i32 10, i32 0, !4, null}<br>
+!27 = !MDLocation(line: 2, scope: !25, inlinedAt: !28)<br>
+!28 = !MDLocation(line: 9, scope: !4)<br>
+!29 = !MDLocation(line: 3, scope: !25, inlinedAt: !28)<br>
+!30 = !MDLocation(line: 4, scope: !26, inlinedAt: !28)<br>
+!31 = !MDLocation(line: 5, scope: !26, inlinedAt: !28)<br>
+!32 = !MDLocation(line: 10, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/inlined-arguments.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inlined-arguments.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inlined-arguments.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/inlined-arguments.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/inlined-arguments.ll Wed Jan 14 16:27:36 2015<br>
@@ -67,13 +67,13 @@ attributes #2 = { nounwind readnone }<br>
!14 = !{!"0x101\00y\0033554438\000", !8, !5, !11} ; [ DW_TAG_arg_variable ] [y] [line 6]<br>
!15 = !{i32 undef}<br>
!16 = !{!"0x101\00x\0016777222\000", !8, !5, !11, !17} ; [ DW_TAG_arg_variable ] [x] [line 6]<br>
-!17 = !{i32 4, i32 0, !4, null}<br>
-!18 = !{i32 6, i32 0, !8, !17}<br>
+!17 = !MDLocation(line: 4, scope: !4)<br>
+!18 = !MDLocation(line: 6, scope: !8, inlinedAt: !17)<br>
!19 = !{i32 2}<br>
!20 = !{!"0x101\00y\0033554438\000", !8, !5, !11, !17} ; [ DW_TAG_arg_variable ] [y] [line 6]<br>
-!21 = !{i32 7, i32 0, !8, !17}<br>
-!22 = !{i32 5, i32 0, !4, null}<br>
-!23 = !{i32 6, i32 0, !8, null}<br>
-!24 = !{i32 7, i32 0, !8, null}<br>
-!25 = !{i32 8, i32 0, !8, null}<br>
+!21 = !MDLocation(line: 7, scope: !8, inlinedAt: !17)<br>
+!22 = !MDLocation(line: 5, scope: !4)<br>
+!23 = !MDLocation(line: 6, scope: !8)<br>
+!24 = !MDLocation(line: 7, scope: !8)<br>
+!25 = !MDLocation(line: 8, scope: !8)<br>
!26 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/inlined-vars.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inlined-vars.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/inlined-vars.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/inlined-vars.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/inlined-vars.ll Wed Jan 14 16:27:36 2015<br>
@@ -46,11 +46,11 @@ declare void @llvm.dbg.value(metadata, i<br>
; VARIABLE-NOT: {{.*Abbrev.*DW_TAG_variable}}<br>
<br>
!18 = !{!"0x101\00argument\0016777219\000", !10, !6, !9, !19} ; [ DW_TAG_arg_variable ]<br>
-!19 = !{i32 11, i32 10, !5, null}<br>
-!21 = !{i32 3, i32 25, !10, !19}<br>
+!19 = !MDLocation(line: 11, column: 10, scope: !5)<br>
+!21 = !MDLocation(line: 3, column: 25, scope: !10, inlinedAt: !19)<br>
!22 = !{!"0x100\00local\004\000", !10, !6, !9, !19} ; [ DW_TAG_auto_variable ]<br>
-!23 = !{i32 4, i32 16, !10, !19}<br>
-!24 = !{i32 5, i32 3, !10, !19}<br>
-!25 = !{i32 6, i32 3, !10, !19}<br>
+!23 = !MDLocation(line: 4, column: 16, scope: !10, inlinedAt: !19)<br>
+!24 = !MDLocation(line: 5, column: 3, scope: !10, inlinedAt: !19)<br>
+!25 = !MDLocation(line: 6, column: 3, scope: !10, inlinedAt: !19)<br>
!26 = !{!"inline-bug.cc", !"/tmp/dbginfo/pr13202"}<br>
!27 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/lto-comp-dir.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/lto-comp-dir.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/lto-comp-dir.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/lto-comp-dir.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/lto-comp-dir.ll Wed Jan 14 16:27:36 2015<br>
@@ -78,7 +78,7 @@ attributes #1 = { uwtable "less-precise-<br>
!16 = !{i32 2, !"Dwarf Version", i32 4}<br>
!17 = !{i32 1, !"Debug Info Version", i32 2}<br>
!18 = !{!"clang version 3.5.0 "}<br>
-!19 = !{i32 2, i32 0, !4, null}<br>
-!20 = !{i32 3, i32 0, !11, null}<br>
-!21 = !{i32 4, i32 0, !11, null}<br>
+!19 = !MDLocation(line: 2, scope: !4)<br>
+!20 = !MDLocation(line: 3, scope: !11)<br>
+!21 = !MDLocation(line: 4, scope: !11)<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/member-order.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/member-order.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/member-order.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/member-order.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/member-order.ll Wed Jan 14 16:27:36 2015<br>
@@ -61,6 +61,6 @@ attributes #1 = { nounwind readnone }<br>
!15 = !{i32 2, !"Dwarf Version", i32 4}<br>
!16 = !{!"0x101\00this\0016777216\001088", !14, null, !17} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!17 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS3foo"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS3foo]<br>
-!18 = !{i32 0, i32 0, !14, null}<br>
-!19 = !{i32 7, i32 0, !14, null}<br>
+!18 = !MDLocation(line: 0, scope: !14)<br>
+!19 = !MDLocation(line: 7, scope: !14)<br>
!20 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/missing-abstract-variable.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/missing-abstract-variable.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/missing-abstract-variable.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/missing-abstract-variable.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/missing-abstract-variable.ll Wed Jan 14 16:27:36 2015<br>
@@ -161,22 +161,22 @@ attributes #2 = { nounwind readnone }<br>
!23 = !{!"clang version 3.5.0 "}<br>
!24 = !{i1 false}<br>
!25 = !{!"0x101\00b\0016777221\000", !14, !5, !11, !26} ; [ DW_TAG_arg_variable ] [b] [line 5]<br>
-!26 = !{i32 14, i32 0, !4, null}<br>
-!27 = !{i32 5, i32 0, !14, !26}<br>
-!28 = !{i32 10, i32 0, !14, !26}<br>
-!29 = !{i32 15, i32 0, !4, null}<br>
-!30 = !{i32 17, i32 0, !8, null}<br>
+!26 = !MDLocation(line: 14, scope: !4)<br>
+!27 = !MDLocation(line: 5, scope: !14, inlinedAt: !26)<br>
+!28 = !MDLocation(line: 10, scope: !14, inlinedAt: !26)<br>
+!29 = !MDLocation(line: 15, scope: !4)<br>
+!30 = !MDLocation(line: 17, scope: !8)<br>
!31 = !{!"0x101\00b\0016777221\000", !14, !5, !11, !32} ; [ DW_TAG_arg_variable ] [b] [line 5]<br>
-!32 = !{i32 18, i32 0, !8, null}<br>
-!33 = !{i32 5, i32 0, !14, !32}<br>
-!34 = !{i32 6, i32 0, !19, !32}<br>
-!35 = !{i32 7, i32 0, !18, !32}<br>
+!32 = !MDLocation(line: 18, scope: !8)<br>
+!33 = !MDLocation(line: 5, scope: !14, inlinedAt: !32)<br>
+!34 = !MDLocation(line: 6, scope: !19, inlinedAt: !32)<br>
+!35 = !MDLocation(line: 7, scope: !18, inlinedAt: !32)<br>
!36 = !{!37, !37, i64 0}<br>
!37 = !{!"int", !38, i64 0}<br>
!38 = !{!"omnipotent char", !39, i64 0}<br>
!39 = !{!"Simple C/C++ TBAA"}<br>
!40 = !{!"0x100\00s\007\000", !18, !5, !20, !32} ; [ DW_TAG_auto_variable ] [s] [line 7]<br>
-!41 = !{i32 8, i32 0, !18, !32}<br>
-!42 = !{i32 9, i32 0, !18, !32}<br>
-!43 = !{i32 10, i32 0, !14, !32}<br>
-!44 = !{i32 19, i32 0, !8, null}<br>
+!41 = !MDLocation(line: 8, scope: !18, inlinedAt: !32)<br>
+!42 = !MDLocation(line: 9, scope: !18, inlinedAt: !32)<br>
+!43 = !MDLocation(line: 10, scope: !14, inlinedAt: !32)<br>
+!44 = !MDLocation(line: 19, scope: !8)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/multiline.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/multiline.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/multiline.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/multiline.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/multiline.ll Wed Jan 14 16:27:36 2015<br>
@@ -73,10 +73,10 @@ attributes #1 = { "less-precise-fpmad"="<br>
!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
!9 = !{i32 2, !"Debug Info Version", i32 2}<br>
!10 = !{!"clang version 3.6.0 (trunk 225000) (llvm/trunk 224999)"}<br>
-!11 = !{i32 3, i32 3, !4, null}<br>
-!12 = !{i32 3, i32 9, !4, null}<br>
-!13 = !{i32 3, i32 15, !4, null}<br>
-!14 = !{i32 4, i32 3, !4, null}<br>
-!15 = !{i32 4, i32 9, !4, null}<br>
-!16 = !{i32 4, i32 15, !4, null}<br>
-!17 = !{i32 5, i32 1, !4, null}<br>
+!11 = !MDLocation(line: 3, column: 3, scope: !4)<br>
+!12 = !MDLocation(line: 3, column: 9, scope: !4)<br>
+!13 = !MDLocation(line: 3, column: 15, scope: !4)<br>
+!14 = !MDLocation(line: 4, column: 3, scope: !4)<br>
+!15 = !MDLocation(line: 4, column: 9, scope: !4)<br>
+!16 = !MDLocation(line: 4, column: 15, scope: !4)<br>
+!17 = !MDLocation(line: 5, column: 1, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/namespace.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/namespace.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/namespace.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/namespace.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/namespace.ll Wed Jan 14 16:27:36 2015<br>
@@ -348,19 +348,19 @@ attributes #1 = { nounwind readnone }<br>
!57 = !{i32 2, !"Dwarf Version", i32 2}<br>
!58 = !{i32 2, !"Debug Info Version", i32 2}<br>
!59 = !{!"clang version 3.6.0 "}<br>
-!60 = !{i32 3, i32 12, !10, null}<br>
+!60 = !MDLocation(line: 3, column: 12, scope: !10)<br>
!61 = !{!"0x101\00\0016777220\000", !14, !18, !13} ; [ DW_TAG_arg_variable ] [line 4]<br>
!62 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!63 = !{i32 4, i32 12, !14, null}<br>
-!64 = !{i32 4, i32 16, !14, null}<br>
-!65 = !{i32 20, i32 12, !17, null}<br>
+!63 = !MDLocation(line: 4, column: 12, scope: !14)<br>
+!64 = !MDLocation(line: 4, column: 16, scope: !14)<br>
+!65 = !MDLocation(line: 20, column: 12, scope: !17)<br>
!66 = !{!"0x101\00b\0016777237\000", !21, !18, !24} ; [ DW_TAG_arg_variable ] [b] [line 21]<br>
-!67 = !{i32 21, i32 15, !21, null}<br>
-!68 = !{i32 22, i32 7, !21, null}<br>
-!69 = !{i32 24, i32 5, !38, null}<br>
-!70 = !{i32 38, i32 3, !21, null}<br>
-!71 = !{i32 39, i32 1, !21, null}<br>
-!72 = !{i32 44, i32 15, !25, null}<br>
-!73 = !{i32 47, i32 21, !26, null}<br>
-!74 = !{i32 0, i32 0, !75, null}<br>
+!67 = !MDLocation(line: 21, column: 15, scope: !21)<br>
+!68 = !MDLocation(line: 22, column: 7, scope: !21)<br>
+!69 = !MDLocation(line: 24, column: 5, scope: !38)<br>
+!70 = !MDLocation(line: 38, column: 3, scope: !21)<br>
+!71 = !MDLocation(line: 39, column: 1, scope: !21)<br>
+!72 = !MDLocation(line: 44, column: 15, scope: !25)<br>
+!73 = !MDLocation(line: 47, column: 21, scope: !26)<br>
+!74 = !MDLocation(line: 0, scope: !75)<br>
!75 = !{!"0xb\000", !5, !27} ; [ DW_TAG_lexical_block ] [/tmp/foo.cpp]<br>
<br>
Modified: llvm/trunk/test/DebugInfo/namespace_function_definition.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/namespace_function_definition.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/namespace_function_definition.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/namespace_function_definition.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/namespace_function_definition.ll Wed Jan 14 16:27:36 2015<br>
@@ -41,4 +41,4 @@ attributes #0 = { nounwind uwtable "less<br>
!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
!9 = !{i32 1, !"Debug Info Version", i32 2}<br>
!10 = !{!"clang version 3.5.0 "}<br>
-!11 = !{i32 3, i32 0, !4, null}<br>
+!11 = !MDLocation(line: 3, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/namespace_inline_function_definition.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/namespace_inline_function_definition.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/namespace_inline_function_definition.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/namespace_inline_function_definition.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/namespace_inline_function_definition.ll Wed Jan 14 16:27:36 2015<br>
@@ -86,7 +86,7 @@ attributes #2 = { nounwind readnone }<br>
!13 = !{i32 2, !"Dwarf Version", i32 4}<br>
!14 = !{i32 2, !"Debug Info Version", i32 2}<br>
!15 = !{!"clang version 3.5.0 "}<br>
-!16 = !{i32 5, i32 0, !4, null}<br>
+!16 = !MDLocation(line: 5, scope: !4)<br>
!17 = !{!"0x101\00i\0016777222\000", !9, !5, !8} ; [ DW_TAG_arg_variable ] [i] [line 6]<br>
-!18 = !{i32 6, i32 0, !9, !16}<br>
-!19 = !{i32 6, i32 0, !9, null}<br>
+!18 = !MDLocation(line: 6, scope: !9, inlinedAt: !16)<br>
+!19 = !MDLocation(line: 6, scope: !9)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/nodebug.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/nodebug.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/nodebug.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/nodebug.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/nodebug.ll Wed Jan 14 16:27:36 2015<br>
@@ -48,4 +48,4 @@ attributes #0 = { uwtable "less-precise-<br>
!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
!9 = !{i32 2, !"Debug Info Version", i32 2}<br>
!10 = !{!"clang version 3.5.0 "}<br>
-!11 = !{i32 3, i32 0, !4, null}<br>
+!11 = !MDLocation(line: 3, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/restrict.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/restrict.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/restrict.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/restrict.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/restrict.ll Wed Jan 14 16:27:36 2015<br>
@@ -49,5 +49,5 @@ attributes #1 = { nounwind readnone }<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
!12 = !{!"clang version 3.5.0 "}<br>
!13 = !{!"0x101\00dst\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [dst] [line 1]<br>
-!14 = !{i32 1, i32 0, !4, null}<br>
-!15 = !{i32 2, i32 0, !4, null}<br>
+!14 = !MDLocation(line: 1, scope: !4)<br>
+!15 = !MDLocation(line: 2, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/sugared-constants.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/sugared-constants.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/sugared-constants.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/sugared-constants.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/sugared-constants.ll Wed Jan 14 16:27:36 2015<br>
@@ -71,12 +71,12 @@ attributes #2 = { nounwind readnone }<br>
!18 = !{i32 1, !"Debug Info Version", i32 2}<br>
!19 = !{!"clang version 3.5.0 "}<br>
!20 = !{i32 42}<br>
-!21 = !{i32 5, i32 0, !4, null}<br>
-!22 = !{i32 6, i32 0, !4, null}<br>
+!21 = !MDLocation(line: 5, scope: !4)<br>
+!22 = !MDLocation(line: 6, scope: !4)<br>
!23 = !{i32 117}<br>
-!24 = !{i32 7, i32 0, !4, null}<br>
-!25 = !{i32 8, i32 0, !4, null}<br>
+!24 = !MDLocation(line: 7, scope: !4)<br>
+!25 = !MDLocation(line: 8, scope: !4)<br>
!26 = !{i16 7}<br>
-!27 = !{i32 9, i32 0, !4, null}<br>
-!28 = !{i32 10, i32 0, !4, null}<br>
-!29 = !{i32 11, i32 0, !4, null}<br>
+!27 = !MDLocation(line: 9, scope: !4)<br>
+!28 = !MDLocation(line: 10, scope: !4)<br>
+!29 = !MDLocation(line: 11, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/tu-composite.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/tu-composite.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/tu-composite.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/tu-composite.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/tu-composite.ll Wed Jan 14 16:27:36 2015<br>
@@ -161,25 +161,25 @@ attributes #1 = { nounwind readnone }<br>
!35 = !{i32 2, !"Dwarf Version", i32 2}<br>
!36 = !{!"0x101\00this\0016777216\001088", !31, null, !37} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!37 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1C"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1C]<br>
-!38 = !{i32 0, i32 0, !31, null}<br>
-!39 = !{i32 5, i32 0, !31, null}<br>
+!38 = !MDLocation(line: 0, scope: !31)<br>
+!39 = !MDLocation(line: 5, scope: !31)<br>
!40 = !{!"0x100\00B\0021\000", !32, !7, !41} ; [ DW_TAG_auto_variable ] [B] [line 21]<br>
!41 = !{!"0x16\00baz\008\000\000\000\000", !1, null, !"_ZTS3bar"} ; [ DW_TAG_typedef ] [baz] [line 8, size 0, align 0, offset 0] [from _ZTS3bar]<br>
-!42 = !{i32 21, i32 0, !32, null}<br>
+!42 = !MDLocation(line: 21, scope: !32)<br>
!43 = !{!"0x100\00A\0022\000", !32, !7, !44} ; [ DW_TAG_auto_variable ] [A] [line 22]<br>
!44 = !{!"0x1\00\000\0024\008\000\000", null, null, !"_ZTS3bar", !45, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 24, align 8, offset 0] [from _ZTS3bar]<br>
!45 = !{!46}<br>
!46 = !{!"0x21\000\003"} ; [ DW_TAG_subrange_type ] [0, 2]<br>
-!47 = !{i32 22, i32 0, !32, null}<br>
+!47 = !MDLocation(line: 22, scope: !32)<br>
!48 = !{!"0x100\00B2\0023\000", !32, !7, !49} ; [ DW_TAG_auto_variable ] [B2] [line 23]<br>
!49 = !{!"0x16\00baz2\0010\000\000\000\000", !1, !"_ZTS1D", !"_ZTS3bar"} ; [ DW_TAG_typedef ] [baz2] [line 10, size 0, align 0, offset 0] [from _ZTS3bar]<br>
-!50 = !{i32 23, i32 0, !32, null}<br>
+!50 = !MDLocation(line: 23, scope: !32)<br>
!51 = !{!"0x100\00e\0024\000", !32, !7, !22} ; [ DW_TAG_auto_variable ] [e] [line 24]<br>
-!52 = !{i32 24, i32 0, !32, null}<br>
+!52 = !MDLocation(line: 24, scope: !32)<br>
!53 = !{!"0x100\00p\0025\000", !32, !7, !54} ; [ DW_TAG_auto_variable ] [p] [line 25]<br>
!54 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTSN1D7Nested2E"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTSN1D7Nested2E]<br>
-!55 = !{i32 25, i32 0, !32, null}<br>
+!55 = !MDLocation(line: 25, scope: !32)<br>
!56 = !{!"0x100\00t\0026\000", !32, !7, !24} ; [ DW_TAG_auto_variable ] [t] [line 26]<br>
-!57 = !{i32 26, i32 0, !32, null}<br>
-!58 = !{i32 27, i32 0, !32, null}<br>
+!57 = !MDLocation(line: 26, scope: !32)<br>
+!58 = !MDLocation(line: 27, scope: !32)<br>
!59 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/DebugInfo/two-cus-from-same-file.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/two-cus-from-same-file.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/two-cus-from-same-file.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/two-cus-from-same-file.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/two-cus-from-same-file.ll Wed Jan 14 16:27:36 2015<br>
@@ -54,15 +54,15 @@ declare void @llvm.dbg.value(metadata, i<br>
!19 = !{!21, !22}<br>
!21 = !{!"0x101\00argc\0016777227\000", !12, !6, !15} ; [ DW_TAG_arg_variable ]<br>
!22 = !{!"0x101\00argv\0033554443\000", !12, !6, !16} ; [ DW_TAG_arg_variable ]<br>
-!23 = !{i32 6, i32 3, !24, null}<br>
+!23 = !MDLocation(line: 6, column: 3, scope: !24)<br>
!24 = !{!"0xb\005\0016\000", !32, !5} ; [ DW_TAG_lexical_block ]<br>
-!25 = !{i32 7, i32 1, !24, null}<br>
-!26 = !{i32 11, i32 14, !12, null}<br>
-!27 = !{i32 11, i32 26, !12, null}<br>
-!28 = !{i32 12, i32 3, !29, null}<br>
+!25 = !MDLocation(line: 7, column: 1, scope: !24)<br>
+!26 = !MDLocation(line: 11, column: 14, scope: !12)<br>
+!27 = !MDLocation(line: 11, column: 26, scope: !12)<br>
+!28 = !MDLocation(line: 12, column: 3, scope: !29)<br>
!29 = !{!"0xb\0011\0034\000", !32, !12} ; [ DW_TAG_lexical_block ]<br>
-!30 = !{i32 13, i32 3, !29, null}<br>
-!31 = !{i32 14, i32 3, !29, null}<br>
+!30 = !MDLocation(line: 13, column: 3, scope: !29)<br>
+!31 = !MDLocation(line: 14, column: 3, scope: !29)<br>
!32 = !{!"foo.c", !"/tmp"}<br>
<br>
; This test is simple to be cross platform (many targets don't yet have<br>
<br>
Modified: llvm/trunk/test/DebugInfo/unconditional-branch.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/unconditional-branch.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/unconditional-branch.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/unconditional-branch.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/unconditional-branch.ll Wed Jan 14 16:27:36 2015<br>
@@ -58,8 +58,8 @@ attributes #1 = { nounwind readnone }<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5.0 (204712)"}<br>
!12 = !{!"0x101\00i\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [i] [line 1]<br>
-!13 = !{i32 1, i32 0, !4, null}<br>
-!14 = !{i32 2, i32 0, !4, null}<br>
-!15 = !{i32 4, i32 0, !16, null}<br>
+!13 = !MDLocation(line: 1, scope: !4)<br>
+!14 = !MDLocation(line: 2, scope: !4)<br>
+!15 = !MDLocation(line: 4, scope: !16)<br>
!16 = !{!"0xb\002\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [D:\work\EPRs\396363/test.c]<br>
-!17 = !{i32 6, i32 0, !4, null}<br>
+!17 = !MDLocation(line: 6, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/varargs.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/varargs.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/varargs.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/varargs.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/varargs.ll Wed Jan 14 16:27:36 2015<br>
@@ -93,10 +93,10 @@ attributes #1 = { nounwind readnone }<br>
!19 = !{i32 1, !"Debug Info Version", i32 2}<br>
!20 = !{!"clang version 3.5 "}<br>
!21 = !{!"0x101\00c\0016777229\000", !14, !15, !10} ; [ DW_TAG_arg_variable ] [c] [line 13]<br>
-!22 = !{i32 13, i32 0, !14, null}<br>
+!22 = !MDLocation(line: 13, scope: !14)<br>
!23 = !{!"0x100\00a\0016\000", !14, !15, !4} ; [ DW_TAG_auto_variable ] [a] [line 16]<br>
-!24 = !{i32 16, i32 0, !14, null}<br>
+!24 = !MDLocation(line: 16, scope: !14)<br>
!25 = !{!"0x100\00fptr\0018\000", !14, !15, !26} ; [ DW_TAG_auto_variable ] [fptr] [line 18]<br>
!26 = !{!"0xf\00\000\0064\0064\000\000", null, null, !16} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from ]<br>
-!27 = !{i32 18, i32 0, !14, null}<br>
-!28 = !{i32 22, i32 0, !14, null}<br>
+!27 = !MDLocation(line: 18, scope: !14)<br>
+!28 = !MDLocation(line: 22, scope: !14)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/version.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/version.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/version.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/version.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/version.ll Wed Jan 14 16:27:36 2015<br>
@@ -28,5 +28,5 @@ attributes #0 = { nounwind uwtable "less<br>
!7 = !{!8}<br>
!8 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
!9 = !{i32 2, !"Dwarf Version", i32 3}<br>
-!10 = !{i32 7, i32 0, !4, null}<br>
+!10 = !MDLocation(line: 7, scope: !4)<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Feature/md_on_instruction.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Feature/md_on_instruction.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Feature/md_on_instruction.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Feature/md_on_instruction.ll (original)<br>
+++ llvm/trunk/test/Feature/md_on_instruction.ll Wed Jan 14 16:27:36 2015<br>
@@ -21,7 +21,7 @@ declare void @llvm.dbg.region.end(metada<br>
!0 = !{!"0x2e\00foo\00foo\00foo\001\000\001\000\006\000\000\000", i32 0, !1, !2, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!1 = !{!"0x11\0012\00clang 1.0\001\00\000\00\000", !4, !5, !5, !4, null, null} ; [ DW_TAG_compile_unit ]<br>
!2 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !1} ; [ DW_TAG_base_type ]<br>
-!3 = !{i32 1, i32 13, !1, !1}<br>
+!3 = !MDLocation(line: 1, column: 13, scope: !1, inlinedAt: !1)<br>
!4 = !{!"foo.c", !"/tmp"}<br>
!5 = !{i32 0}<br>
!6 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Instrumentation/AddressSanitizer/debug_info.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/AddressSanitizer/debug_info.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/AddressSanitizer/debug_info.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Instrumentation/AddressSanitizer/debug_info.ll (original)<br>
+++ llvm/trunk/test/Instrumentation/AddressSanitizer/debug_info.ll Wed Jan 14 16:27:36 2015<br>
@@ -42,7 +42,7 @@ declare void @llvm.dbg.declare(metadata,<br>
!8 = !{!9, !9}<br>
!9 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
!10 = !{!"0x101\00p\0016777217\000", !5, !6, !9} ; [ DW_TAG_arg_variable ] [p] [line 1]<br>
-!11 = !{i32 1, i32 0, !5, null}<br>
+!11 = !MDLocation(line: 1, scope: !5)<br>
!12 = !{!"0x100\00r\002\000", !13, !6, !9} ; [ DW_TAG_auto_variable ] [r] [line 2]<br>
<br>
; Verify that debug descriptors for argument and local variable will be replaced<br>
@@ -56,7 +56,7 @@ declare void @llvm.dbg.declare(metadata,<br>
<br>
<br>
!13 = !{!"0xb\001\000\000", !16, !5} ; [ DW_TAG_lexical_block ] [/usr/local/google/llvm_cmake_clang/tmp/debuginfo/a.cc]<br>
-!14 = !{i32 2, i32 0, !13, null}<br>
-!15 = !{i32 3, i32 0, !13, null}<br>
+!14 = !MDLocation(line: 2, scope: !13)<br>
+!15 = !MDLocation(line: 3, scope: !13)<br>
!16 = !{!"a.cc", !"/usr/local/google/llvm_cmake_clang/tmp/debuginfo"}<br>
!17 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Instrumentation/DataFlowSanitizer/debug.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/DataFlowSanitizer/debug.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/DataFlowSanitizer/debug.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Instrumentation/DataFlowSanitizer/debug.ll (original)<br>
+++ llvm/trunk/test/Instrumentation/DataFlowSanitizer/debug.ll Wed Jan 14 16:27:36 2015<br>
@@ -33,4 +33,4 @@ attributes #0 = { nounwind uwtable "less<br>
!9 = !{i32 2, !"Dwarf Version", i32 4}<br>
!10 = !{i32 2, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.6.0 "}<br>
-!12 = !{i32 2, i32 1, !4, null}<br>
+!12 = !MDLocation(line: 2, column: 1, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Instrumentation/MemorySanitizer/store-origin.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/MemorySanitizer/store-origin.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/MemorySanitizer/store-origin.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Instrumentation/MemorySanitizer/store-origin.ll (original)<br>
+++ llvm/trunk/test/Instrumentation/MemorySanitizer/store-origin.ll Wed Jan 14 16:27:36 2015<br>
@@ -43,13 +43,13 @@ attributes #1 = { nounwind readnone }<br>
!13 = !{i32 2, !"Dwarf Version", i32 4}<br>
!14 = !{i32 1, !"Debug Info Version", i32 2}<br>
!15 = !{!"clang version 3.5.0 (204220)"}<br>
-!16 = !{i32 1, i32 0, !4, null}<br>
-!17 = !{i32 2, i32 0, !4, null}<br>
+!16 = !MDLocation(line: 1, scope: !4)<br>
+!17 = !MDLocation(line: 2, scope: !4)<br>
!18 = !{!19, !19, i64 0}<br>
!19 = !{!"int", !20, i64 0}<br>
!20 = !{!"omnipotent char", !21, i64 0}<br>
!21 = !{!"Simple C/C++ TBAA"}<br>
-!22 = !{i32 3, i32 0, !4, null}<br>
+!22 = !MDLocation(line: 3, scope: !4)<br>
<br>
<br>
; CHECK: @Store<br>
<br>
Modified: llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll (original)<br>
+++ llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll Wed Jan 14 16:27:36 2015<br>
@@ -16,7 +16,7 @@<br>
<br>
; Test that __sanitizer_cov call has !dbg pointing to the opening { of A::f().<br>
; CHECK: call void @__sanitizer_cov(i32*{{.*}}), !dbg [[A:!.*]]<br>
-; CHECK: [[A]] = !{i32 6, i32 0, !{{.*}}, null}<br>
+; CHECK: [[A]] = !MDLocation(line: 6, scope: !{{.*}})<br>
<br>
<br>
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
@@ -63,5 +63,5 @@ attributes #1 = { nounwind readnone }<br>
!17 = !{i32 2, !"Dwarf Version", i32 4}<br>
!18 = !{i32 2, !"Debug Info Version", i32 2}<br>
!19 = !{!"clang version 3.5.0 (210251)"}<br>
-!20 = !{i32 0, i32 0, !13, null}<br>
-!21 = !{i32 7, i32 0, !13, null}<br>
+!20 = !MDLocation(line: 0, scope: !13)<br>
+!21 = !MDLocation(line: 7, scope: !13)<br>
<br>
Modified: llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll (original)<br>
+++ llvm/trunk/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll Wed Jan 14 16:27:36 2015<br>
@@ -21,9 +21,9 @@ target triple = "x86_64-unknown-linux-gn<br>
; CHECK: call void @__sanitizer_cov(i32*{{.*}}), !dbg [[B:!.*]]<br>
; CHECK: call void @__sanitizer_cov(i32*{{.*}}), !dbg [[C:!.*]]<br>
; CHECK: ret void<br>
-; CHECK: [[A]] = !{i32 1, i32 0, !{{.*}}, null}<br>
-; CHECK: [[B]] = !{i32 3, i32 5, !{{.*}}, null}<br>
-; CHECK: [[C]] = !{i32 4, i32 1, !{{.*}}, null}<br>
+; CHECK: [[A]] = !MDLocation(line: 1, scope: !{{.*}})<br>
+; CHECK: [[B]] = !MDLocation(line: 3, column: 5, scope: !{{.*}})<br>
+; CHECK: [[C]] = !MDLocation(line: 4, column: 1, scope: !{{.*}})<br>
<br>
define void @_Z3fooPi(i32* %a) #0 {<br>
entry:<br>
@@ -64,12 +64,12 @@ attributes #1 = { nounwind readnone }<br>
!12 = !{i32 2, !"Dwarf Version", i32 4}<br>
!13 = !{i32 2, !"Debug Info Version", i32 2}<br>
!14 = !{!"clang version 3.6.0 (217079)"}<br>
-!15 = !{i32 1, i32 15, !4, null}<br>
-!16 = !{i32 2, i32 7, !17, null}<br>
+!15 = !MDLocation(line: 1, column: 15, scope: !4)<br>
+!16 = !MDLocation(line: 2, column: 7, scope: !17)<br>
!17 = !{!"0xb\002\007\000", !1, !4} ; [ DW_TAG_lexical_block ] [FOO/if.cc]<br>
-!18 = !{i32 3, i32 5, !17, null}<br>
+!18 = !MDLocation(line: 3, column: 5, scope: !17)<br>
!19 = !{!20, !20, i64 0}<br>
!20 = !{!"int", !21, i64 0}<br>
!21 = !{!"omnipotent char", !22, i64 0}<br>
!22 = !{!"Simple C/C++ TBAA"}<br>
-!23 = !{i32 4, i32 1, !4, null}<br>
+!23 = !MDLocation(line: 4, column: 1, scope: !4)<br>
<br>
Modified: llvm/trunk/test/JitListener/multiple.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/JitListener/multiple.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/JitListener/multiple.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/JitListener/multiple.ll (original)<br>
+++ llvm/trunk/test/JitListener/multiple.ll Wed Jan 14 16:27:36 2015<br>
@@ -142,26 +142,26 @@ attributes #1 = { nounwind readnone }<br>
!14 = !{!"clang version 3.6.0 (trunk)"}<br>
!15 = !{!"0x101\00a\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [a] [line 1]<br>
!16 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!17 = !{i32 1, i32 13, !4, null}<br>
-!18 = !{i32 2, i32 10, !4, null}<br>
-!19 = !{i32 2, i32 3, !4, null}<br>
+!17 = !MDLocation(line: 1, column: 13, scope: !4)<br>
+!18 = !MDLocation(line: 2, column: 10, scope: !4)<br>
+!19 = !MDLocation(line: 2, column: 3, scope: !4)<br>
!20 = !{!"0x101\00a\0016777221\000", !9, !5, !8} ; [ DW_TAG_arg_variable ] [a] [line 5]<br>
-!21 = !{i32 5, i32 13, !9, null}<br>
-!22 = !{i32 6, i32 7, !23, null}<br>
+!21 = !MDLocation(line: 5, column: 13, scope: !9)<br>
+!22 = !MDLocation(line: 6, column: 7, scope: !23)<br>
!23 = !{!"0xb\006\007\000", !1, !9} ; [ DW_TAG_lexical_block ] [F:\users\akaylor\llvm-s\llvm\test\JitListener/multiple.c]<br>
-!24 = !{i32 6, i32 7, !9, null}<br>
-!25 = !{i32 7, i32 5, !26, null}<br>
+!24 = !MDLocation(line: 6, column: 7, scope: !9)<br>
+!25 = !MDLocation(line: 7, column: 5, scope: !26)<br>
!26 = !{!"0xb\006\0015\001", !1, !23} ; [ DW_TAG_lexical_block ] [F:\users\akaylor\llvm-s\llvm\test\JitListener/multiple.c]<br>
-!27 = !{i32 9, i32 14, !9, null}<br>
-!28 = !{i32 9, i32 10, !9, null}<br>
-!29 = !{i32 9, i32 3, !9, null}<br>
-!30 = !{i32 10, i32 1, !9, null}<br>
+!27 = !MDLocation(line: 9, column: 14, scope: !9)<br>
+!28 = !MDLocation(line: 9, column: 10, scope: !9)<br>
+!29 = !MDLocation(line: 9, column: 3, scope: !9)<br>
+!30 = !MDLocation(line: 10, column: 1, scope: !9)<br>
!31 = !{!"0x101\00a\0016777228\000", !10, !5, !8} ; [ DW_TAG_arg_variable ] [a] [line 12]<br>
-!32 = !{i32 12, i32 15, !10, null}<br>
-!33 = !{i32 13, i32 11, !10, null}<br>
-!34 = !{i32 13, i32 3, !10, null}<br>
-!35 = !{i32 15, i32 7, !36, null}<br>
+!32 = !MDLocation(line: 12, column: 15, scope: !10)<br>
+!33 = !MDLocation(line: 13, column: 11, scope: !10)<br>
+!34 = !MDLocation(line: 13, column: 3, scope: !10)<br>
+!35 = !MDLocation(line: 15, column: 7, scope: !36)<br>
!36 = !{!"0xb\0013\0014\002", !1, !10} ; [ DW_TAG_lexical_block ] [F:\users\akaylor\llvm-s\llvm\test\JitListener/multiple.c]<br>
-!37 = !{i32 17, i32 7, !36, null}<br>
-!38 = !{i32 19, i32 7, !36, null}<br>
-!39 = !{i32 21, i32 1, !10, null}<br>
+!37 = !MDLocation(line: 17, column: 7, scope: !36)<br>
+!38 = !MDLocation(line: 19, column: 7, scope: !36)<br>
+!39 = !MDLocation(line: 21, column: 1, scope: !10)<br>
<br>
Modified: llvm/trunk/test/JitListener/simple.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/JitListener/simple.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/JitListener/simple.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/JitListener/simple.ll (original)<br>
+++ llvm/trunk/test/JitListener/simple.ll Wed Jan 14 16:27:36 2015<br>
@@ -49,6 +49,6 @@ attributes #1 = { nounwind readnone }<br>
!11 = !{!"clang version 3.6.0 (trunk)"}<br>
!12 = !{!"0x101\00a\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [a] [line 1]<br>
!13 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!14 = !{i32 1, i32 13, !4, null}<br>
-!15 = !{i32 2, i32 10, !4, null}<br>
-!16 = !{i32 2, i32 3, !4, null}<br>
+!14 = !MDLocation(line: 1, column: 13, scope: !4)<br>
+!15 = !MDLocation(line: 2, column: 10, scope: !4)<br>
+!16 = !MDLocation(line: 2, column: 3, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Linker/2011-08-04-DebugLoc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-04-DebugLoc.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-04-DebugLoc.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/2011-08-04-DebugLoc.ll (original)<br>
+++ llvm/trunk/test/Linker/2011-08-04-DebugLoc.ll Wed Jan 14 16:27:36 2015<br>
@@ -23,7 +23,7 @@ define i32 @foo() nounwind ssp {<br>
!3 = !{!"0x15\00\000\000\000\000\000\000", !8, !2, null, !4, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!4 = !{!5}<br>
!5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ]<br>
-!6 = !{i32 2, i32 13, !7, null}<br>
+!6 = !MDLocation(line: 2, column: 13, scope: !7)<br>
!7 = !{!"0xb\002\0011\000", !8, !1} ; [ DW_TAG_lexical_block ]<br>
!8 = !{!"a.c", !"/private/tmp"}<br>
!9 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/Linker/2011-08-04-DebugLoc2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-04-DebugLoc2.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-04-DebugLoc2.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/2011-08-04-DebugLoc2.ll (original)<br>
+++ llvm/trunk/test/Linker/2011-08-04-DebugLoc2.ll Wed Jan 14 16:27:36 2015<br>
@@ -20,7 +20,7 @@ define i32 @bar() nounwind ssp {<br>
!3 = !{!"0x15\00\000\000\000\000\000\000", !8, !2, null, !4, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!4 = !{!5}<br>
!5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ]<br>
-!6 = !{i32 1, i32 13, !7, null}<br>
+!6 = !MDLocation(line: 1, column: 13, scope: !7)<br>
!7 = !{!"0xb\001\0011\000", !8, !1} ; [ DW_TAG_lexical_block ]<br>
!8 = !{!"b.c", !"/private/tmp"}<br>
!9 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/Linker/2011-08-04-Metadata.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-04-Metadata.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-04-Metadata.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/2011-08-04-Metadata.ll (original)<br>
+++ llvm/trunk/test/Linker/2011-08-04-Metadata.ll Wed Jan 14 16:27:36 2015<br>
@@ -27,7 +27,7 @@ entry:<br>
!4 = !{null}<br>
!5 = !{!"0x34\00x\00x\00\002\001\001", !0, !2, !6, i32* @x} ; [ DW_TAG_variable ]<br>
!6 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ]<br>
-!7 = !{i32 3, i32 14, !8, null}<br>
+!7 = !MDLocation(line: 3, column: 14, scope: !8)<br>
!8 = !{!"0xb\003\0012\000", !9, !1} ; [ DW_TAG_lexical_block ]<br>
!9 = !{!"/tmp/one.c", !"/Volumes/Lalgate/Slate/D"}<br>
!10 = !{!1}<br>
<br>
Modified: llvm/trunk/test/Linker/2011-08-04-Metadata2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-04-Metadata2.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-04-Metadata2.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/2011-08-04-Metadata2.ll (original)<br>
+++ llvm/trunk/test/Linker/2011-08-04-Metadata2.ll Wed Jan 14 16:27:36 2015<br>
@@ -26,7 +26,7 @@ entry:<br>
!4 = !{null}<br>
!5 = !{!"0x34\00x\00x\00\001\001\001", !0, !2, !6, i32* @x} ; [ DW_TAG_variable ]<br>
!6 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ]<br>
-!7 = !{i32 2, i32 14, !8, null}<br>
+!7 = !MDLocation(line: 2, column: 14, scope: !8)<br>
!8 = !{!"0xb\002\0012\000", !9, !1} ; [ DW_TAG_lexical_block ]<br>
!9 = !{!"/tmp/two.c", !"/Volumes/Lalgate/Slate/D"}<br>
!10 = !{!1}<br>
<br>
Modified: llvm/trunk/test/Linker/2011-08-18-unique-class-type.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-18-unique-class-type.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-18-unique-class-type.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/2011-08-18-unique-class-type.ll (original)<br>
+++ llvm/trunk/test/Linker/2011-08-18-unique-class-type.ll Wed Jan 14 16:27:36 2015<br>
@@ -32,8 +32,8 @@ declare void @llvm.dbg.declare(metadata,<br>
!10 = !{!"0x2\00A\003\008\008\000\000\000", !17, !11, null, !2, null, null, null} ; [ DW_TAG_class_type ] [A] [line 3, size 8, align 8, offset 0] [def] [from ]<br>
!11 = !{!"0x39\00N1\002", !17, null} ; [ DW_TAG_namespace ]<br>
!12 = !{!"0x29", !17} ; [ DW_TAG_file_type ]<br>
-!13 = !{i32 4, i32 12, !5, null}<br>
-!14 = !{i32 4, i32 18, !15, null}<br>
+!13 = !MDLocation(line: 4, column: 12, scope: !5)<br>
+!14 = !MDLocation(line: 4, column: 18, scope: !15)<br>
!15 = !{!"0xb\004\0017\000", !16, !5} ; [ DW_TAG_lexical_block ]<br>
!16 = !{!"n1.c", !"/private/tmp"}<br>
!17 = !{!"./n.h", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/Linker/2011-08-18-unique-class-type2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-18-unique-class-type2.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-18-unique-class-type2.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/2011-08-18-unique-class-type2.ll (original)<br>
+++ llvm/trunk/test/Linker/2011-08-18-unique-class-type2.ll Wed Jan 14 16:27:36 2015<br>
@@ -30,8 +30,8 @@ declare void @llvm.dbg.declare(metadata,<br>
!10 = !{!"0x2\00A\003\008\008\000\000\000", !17, !11, null, !2, null, null, null} ; [ DW_TAG_class_type ] [A] [line 3, size 8, align 8, offset 0] [def] [from ]<br>
!11 = !{!"0x39\00N1\002", !17, null} ; [ DW_TAG_namespace ]<br>
!12 = !{!"0x29", !17} ; [ DW_TAG_file_type ]<br>
-!13 = !{i32 4, i32 12, !5, null}<br>
-!14 = !{i32 4, i32 20, !15, null}<br>
+!13 = !MDLocation(line: 4, column: 12, scope: !5)<br>
+!14 = !MDLocation(line: 4, column: 20, scope: !15)<br>
!15 = !{!"0xb\004\0019\000", !16, !5} ; [ DW_TAG_lexical_block ]<br>
!16 = !{!"n2.c", !"/private/tmp"}<br>
!17 = !{!"./n.h", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/Linker/2011-08-18-unique-debug-type.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-18-unique-debug-type.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-18-unique-debug-type.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/2011-08-18-unique-debug-type.ll (original)<br>
+++ llvm/trunk/test/Linker/2011-08-18-unique-debug-type.ll Wed Jan 14 16:27:36 2015<br>
@@ -21,7 +21,7 @@ entry:<br>
!7 = !{!"0x15\00\000\000\000\000\000\000", !12, !6, null, !8, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!8 = !{!9}<br>
!9 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]<br>
-!10 = !{i32 1, i32 13, !11, null}<br>
+!10 = !MDLocation(line: 1, column: 13, scope: !11)<br>
!11 = !{!"0xb\001\0011\000", !12, !5} ; [ DW_TAG_lexical_block ]<br>
!12 = !{!"one.c", !"/private/tmp"}<br>
!13 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Linker/2011-08-18-unique-debug-type2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-18-unique-debug-type2.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2011-08-18-unique-debug-type2.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/2011-08-18-unique-debug-type2.ll (original)<br>
+++ llvm/trunk/test/Linker/2011-08-18-unique-debug-type2.ll Wed Jan 14 16:27:36 2015<br>
@@ -21,7 +21,7 @@ entry:<br>
!7 = !{!"0x15\00\000\000\000\000\000\000", !12, !6, null, !8, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!8 = !{!9}<br>
!9 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]<br>
-!10 = !{i32 1, i32 13, !11, null}<br>
+!10 = !MDLocation(line: 1, column: 13, scope: !11)<br>
!11 = !{!"0xb\001\0011\000", !12, !5} ; [ DW_TAG_lexical_block ]<br>
!12 = !{!"two.c", !"/private/tmp"}<br>
!13 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Linker/DbgDeclare.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/DbgDeclare.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/DbgDeclare.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/DbgDeclare.ll (original)<br>
+++ llvm/trunk/test/Linker/DbgDeclare.ll Wed Jan 14 16:27:36 2015<br>
@@ -51,10 +51,10 @@ declare void @test(i32, i8**)<br>
!12 = !{!"0x26\00\000\000\000\000\000", null, null, !13} ; [ DW_TAG_const_type ]<br>
!13 = !{!"0x24\00char\000\008\008\000\000\006", null, null} ; [ DW_TAG_base_type ]<br>
!14 = !{!"0x101\00argc\0016777219\000", !5, !6, !9} ; [ DW_TAG_arg_variable ]<br>
-!15 = !{i32 3, i32 0, !5, null}<br>
+!15 = !MDLocation(line: 3, scope: !5)<br>
!16 = !{!"0x101\00argv\0033554435\000", !5, !6, !10} ; [ DW_TAG_arg_variable ]<br>
-!17 = !{i32 5, i32 0, !18, null}<br>
+!17 = !MDLocation(line: 5, scope: !18)<br>
!18 = !{!"0xb\004\000\000", !20, !5} ; [ DW_TAG_lexical_block ]<br>
-!19 = !{i32 6, i32 0, !18, null}<br>
+!19 = !MDLocation(line: 6, scope: !18)<br>
!20 = !{!"main.cpp", !"/private/tmp"}<br>
!21 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Linker/DbgDeclare2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/DbgDeclare2.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/DbgDeclare2.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/DbgDeclare2.ll (original)<br>
+++ llvm/trunk/test/Linker/DbgDeclare2.ll Wed Jan 14 16:27:36 2015<br>
@@ -64,16 +64,16 @@ declare i32 @puts(i8*)<br>
!12 = !{!"0x26\00\000\000\000\000\000", null, null, !13} ; [ DW_TAG_const_type ]<br>
!13 = !{!"0x24\00char\000\008\008\000\000\006", null, null} ; [ DW_TAG_base_type ]<br>
!14 = !{!"0x101\00argc\0016777220\000", !5, !6, !9} ; [ DW_TAG_arg_variable ]<br>
-!15 = !{i32 4, i32 0, !5, null}<br>
+!15 = !MDLocation(line: 4, scope: !5)<br>
!16 = !{!"0x101\00argv\0033554436\000", !5, !6, !10} ; [ DW_TAG_arg_variable ]<br>
!17 = !{!"0x100\00i\006\000", !18, !6, !9} ; [ DW_TAG_auto_variable ]<br>
!18 = !{!"0xb\006\000\001", !26, !19} ; [ DW_TAG_lexical_block ]<br>
!19 = !{!"0xb\005\000\000", !26, !5} ; [ DW_TAG_lexical_block ]<br>
-!20 = !{i32 6, i32 0, !18, null}<br>
-!21 = !{i32 8, i32 0, !22, null}<br>
+!20 = !MDLocation(line: 6, scope: !18)<br>
+!21 = !MDLocation(line: 8, scope: !22)<br>
!22 = !{!"0xb\007\000\002", !26, !18} ; [ DW_TAG_lexical_block ]<br>
-!23 = !{i32 9, i32 0, !22, null}<br>
-!24 = !{i32 10, i32 0, !19, null}<br>
+!23 = !MDLocation(line: 9, scope: !22)<br>
+!24 = !MDLocation(line: 10, scope: !19)<br>
!25 = !{!"main.cpp", !"/private/tmp"}<br>
!26 = !{!"test.cpp", !"/private/tmp"}<br>
!27 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Linker/Inputs/replaced-function-matches-first-subprogram.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/replaced-function-matches-first-subprogram.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/replaced-function-matches-first-subprogram.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/Inputs/replaced-function-matches-first-subprogram.ll (original)<br>
+++ llvm/trunk/test/Linker/Inputs/replaced-function-matches-first-subprogram.ll Wed Jan 14 16:27:36 2015<br>
@@ -24,4 +24,4 @@ entry:<br>
!9 = !{i32 2, !"Debug Info Version", i32 2}<br>
!10 = !{i32 1, !"PIC Level", i32 2}<br>
!11 = !{!"clang version 3.6.0 (trunk 224193) (llvm/trunk 224197)"}<br>
-!12 = !{i32 2, i32 15, !4, null}<br>
+!12 = !MDLocation(line: 2, column: 15, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Linker/Inputs/type-unique-inheritance-a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/type-unique-inheritance-a.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/type-unique-inheritance-a.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/Inputs/type-unique-inheritance-a.ll (original)<br>
+++ llvm/trunk/test/Linker/Inputs/type-unique-inheritance-a.ll Wed Jan 14 16:27:36 2015<br>
@@ -87,8 +87,8 @@ attributes #1 = { nounwind readnone }<br>
!18 = !{null, !12}<br>
!19 = !{i32 2, !"Dwarf Version", i32 2}<br>
!20 = !{!"0x101\00a\0016777221\000", !15, !16, !12} ; [ DW_TAG_arg_variable ] [a] [line 5]<br>
-!21 = !{i32 5, i32 0, !15, null}<br>
+!21 = !MDLocation(line: 5, scope: !15)<br>
!22 = !{!"0x100\00t\006\000", !15, !16, !4} ; [ DW_TAG_auto_variable ] [t] [line 6]<br>
-!23 = !{i32 6, i32 0, !15, null}<br>
-!24 = !{i32 7, i32 0, !15, null}<br>
+!23 = !MDLocation(line: 6, scope: !15)<br>
+!24 = !MDLocation(line: 7, scope: !15)<br>
!25 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Linker/Inputs/type-unique-inheritance-b.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/type-unique-inheritance-b.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/type-unique-inheritance-b.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/Inputs/type-unique-inheritance-b.ll (original)<br>
+++ llvm/trunk/test/Linker/Inputs/type-unique-inheritance-b.ll Wed Jan 14 16:27:36 2015<br>
@@ -69,13 +69,13 @@ attributes #3 = { "less-precise-fpmad"="<br>
!26 = !{!8}<br>
!27 = !{i32 2, !"Dwarf Version", i32 2}<br>
!28 = !{!"0x101\00a\0016777220\000", !20, !21, !8} ; [ DW_TAG_arg_variable ] [a] [line 4]<br>
-!29 = !{i32 4, i32 0, !20, null}<br>
+!29 = !MDLocation(line: 4, scope: !20)<br>
!30 = !{!"0x100\00t\005\000", !20, !21, !4} ; [ DW_TAG_auto_variable ] [t] [line 5]<br>
-!31 = !{i32 5, i32 0, !20, null}<br>
-!32 = !{i32 6, i32 0, !20, null}<br>
+!31 = !MDLocation(line: 5, scope: !20)<br>
+!32 = !MDLocation(line: 6, scope: !20)<br>
!33 = !{!"0x100\00a\0010\000", !24, !21, !11} ; [ DW_TAG_auto_variable ] [a] [line 10]<br>
-!34 = !{i32 10, i32 0, !24, null}<br>
-!35 = !{i32 11, i32 0, !24, null}<br>
-!36 = !{i32 12, i32 0, !24, null}<br>
-!37 = !{i32 13, i32 0, !24, null}<br>
+!34 = !MDLocation(line: 10, scope: !24)<br>
+!35 = !MDLocation(line: 11, scope: !24)<br>
+!36 = !MDLocation(line: 12, scope: !24)<br>
+!37 = !MDLocation(line: 13, scope: !24)<br>
!38 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll (original)<br>
+++ llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll Wed Jan 14 16:27:36 2015<br>
@@ -81,8 +81,8 @@ attributes #1 = { nounwind readnone }<br>
!15 = !{null, !8}<br>
!16 = !{i32 2, !"Dwarf Version", i32 2}<br>
!17 = !{!"0x101\00a\0016777219\000", !12, !13, !8} ; [ DW_TAG_arg_variable ] [a] [line 3]<br>
-!18 = !{i32 3, i32 0, !12, null}<br>
+!18 = !MDLocation(line: 3, scope: !12)<br>
!19 = !{!"0x100\00t\004\000", !12, !13, !4} ; [ DW_TAG_auto_variable ] [t] [line 4]<br>
-!20 = !{i32 4, i32 0, !12, null}<br>
-!21 = !{i32 5, i32 0, !12, null}<br>
+!20 = !MDLocation(line: 4, scope: !12)<br>
+!21 = !MDLocation(line: 5, scope: !12)<br>
!22 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Linker/Inputs/type-unique-simple2-b.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/type-unique-simple2-b.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/type-unique-simple2-b.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/Inputs/type-unique-simple2-b.ll (original)<br>
+++ llvm/trunk/test/Linker/Inputs/type-unique-simple2-b.ll Wed Jan 14 16:27:36 2015<br>
@@ -57,11 +57,11 @@ attributes #3 = { "less-precise-fpmad"="<br>
!18 = !{!8}<br>
!19 = !{i32 2, !"Dwarf Version", i32 2}<br>
!20 = !{!"0x101\00a\0016777220\000", !12, !13, !8} ; [ DW_TAG_arg_variable ] [a] [line 4]<br>
-!21 = !{i32 4, i32 0, !12, null}<br>
+!21 = !MDLocation(line: 4, scope: !12)<br>
!22 = !{!"0x100\00t\005\000", !12, !13, !4} ; [ DW_TAG_auto_variable ] [t] [line 5]<br>
-!23 = !{i32 5, i32 0, !12, null}<br>
-!24 = !{i32 6, i32 0, !12, null}<br>
-!25 = !{i32 8, i32 0, !16, null}<br>
-!26 = !{i32 9, i32 0, !16, null}<br>
-!27 = !{i32 10, i32 0, !16, null}<br>
+!23 = !MDLocation(line: 5, scope: !12)<br>
+!24 = !MDLocation(line: 6, scope: !12)<br>
+!25 = !MDLocation(line: 8, scope: !16)<br>
+!26 = !MDLocation(line: 9, scope: !16)<br>
+!27 = !MDLocation(line: 10, scope: !16)<br>
!28 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Linker/replaced-function-matches-first-subprogram.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/replaced-function-matches-first-subprogram.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/replaced-function-matches-first-subprogram.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/replaced-function-matches-first-subprogram.ll (original)<br>
+++ llvm/trunk/test/Linker/replaced-function-matches-first-subprogram.ll Wed Jan 14 16:27:36 2015<br>
@@ -68,8 +68,8 @@ entry:<br>
!11 = !{i32 2, !"Debug Info Version", i32 2}<br>
!12 = !{i32 1, !"PIC Level", i32 2}<br>
!13 = !{!"clang version 3.6.0 (trunk 224193) (llvm/trunk 224197)"}<br>
-!14 = !{i32 2, i32 20, !4, null}<br>
+!14 = !MDLocation(line: 2, column: 20, scope: !4)<br>
<br>
; The same subprogram should be pointed to by inside the !dbg reference.<br>
-; CHECK: ![[LOC]] = !{i32 2, i32 15, ![[SP2]], null}<br>
-!15 = !{i32 2, i32 15, !7, null}<br>
+; CHECK: ![[LOC]] = !MDLocation(line: 2, column: 15, scope: ![[SP2]])<br>
+!15 = !MDLocation(line: 2, column: 15, scope: !7)<br>
<br>
Modified: llvm/trunk/test/Linker/type-unique-odr-a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-odr-a.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-odr-a.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-odr-a.ll (original)<br>
+++ llvm/trunk/test/Linker/type-unique-odr-a.ll Wed Jan 14 16:27:36 2015<br>
@@ -96,7 +96,7 @@ attributes #1 = { nounwind readnone }<br>
!20 = !{i32 2, !"Dwarf Version", i32 4}<br>
!21 = !{i32 1, !"Debug Info Version", i32 2}<br>
!22 = !{!"clang version 3.5.0 "}<br>
-!23 = !{i32 11, i32 0, !15, null}<br>
+!23 = !MDLocation(line: 11, scope: !15)<br>
!24 = !{!"0x100\00a\008\000", !19, !16, !"_ZTS1A"} ; [ DW_TAG_auto_variable ] [a] [line 8]<br>
-!25 = !{i32 8, i32 0, !19, null}<br>
-!26 = !{i32 9, i32 0, !19, null}<br>
+!25 = !MDLocation(line: 8, scope: !19)<br>
+!26 = !MDLocation(line: 9, scope: !19)<br>
<br>
Modified: llvm/trunk/test/Linker/type-unique-odr-b.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-odr-b.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-odr-b.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-odr-b.ll (original)<br>
+++ llvm/trunk/test/Linker/type-unique-odr-b.ll Wed Jan 14 16:27:36 2015<br>
@@ -80,7 +80,7 @@ attributes #1 = { nounwind readnone }<br>
!23 = !{!"clang version 3.5.0 "}<br>
!24 = !{!"0x101\00this\0016777216\001088", !15, null, !25} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!25 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1A]<br>
-!26 = !{i32 0, i32 0, !15, null}<br>
-!27 = !{i32 8, i32 0, !15, null}<br>
-!28 = !{i32 11, i32 0, !16, null}<br>
-!29 = !{i32 10, i32 0, !20, null}<br>
+!26 = !MDLocation(line: 0, scope: !15)<br>
+!27 = !MDLocation(line: 8, scope: !15)<br>
+!28 = !MDLocation(line: 11, scope: !16)<br>
+!29 = !MDLocation(line: 10, scope: !20)<br>
<br>
Modified: llvm/trunk/test/Linker/type-unique-simple-a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple-a.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple-a.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-simple-a.ll (original)<br>
+++ llvm/trunk/test/Linker/type-unique-simple-a.ll Wed Jan 14 16:27:36 2015<br>
@@ -84,8 +84,8 @@ attributes #1 = { nounwind readnone }<br>
!13 = !{null, !8}<br>
!14 = !{i32 2, !"Dwarf Version", i32 2}<br>
!15 = !{!"0x101\00a\0016777219\000", !10, !11, !8} ; [ DW_TAG_arg_variable ] [a] [line 3]<br>
-!16 = !{i32 3, i32 0, !10, null}<br>
+!16 = !MDLocation(line: 3, scope: !10)<br>
!17 = !{!"0x100\00t\004\000", !10, !11, !4} ; [ DW_TAG_auto_variable ] [t] [line 4]<br>
-!18 = !{i32 4, i32 0, !10, null}<br>
-!19 = !{i32 5, i32 0, !10, null}<br>
+!18 = !MDLocation(line: 4, scope: !10)<br>
+!19 = !MDLocation(line: 5, scope: !10)<br>
!20 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Linker/type-unique-simple-b.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple-b.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple-b.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-simple-b.ll (original)<br>
+++ llvm/trunk/test/Linker/type-unique-simple-b.ll Wed Jan 14 16:27:36 2015<br>
@@ -57,11 +57,11 @@ attributes #3 = { "less-precise-fpmad"="<br>
!16 = !{!8}<br>
!17 = !{i32 2, !"Dwarf Version", i32 2}<br>
!18 = !{!"0x101\00a\0016777220\000", !10, !11, !8} ; [ DW_TAG_arg_variable ] [a] [line 4]<br>
-!19 = !{i32 4, i32 0, !10, null}<br>
+!19 = !MDLocation(line: 4, scope: !10)<br>
!20 = !{!"0x100\00t\005\000", !10, !11, !4} ; [ DW_TAG_auto_variable ] [t] [line 5]<br>
-!21 = !{i32 5, i32 0, !10, null}<br>
-!22 = !{i32 6, i32 0, !10, null}<br>
-!23 = !{i32 8, i32 0, !14, null}<br>
-!24 = !{i32 9, i32 0, !14, null}<br>
-!25 = !{i32 10, i32 0, !14, null}<br>
+!21 = !MDLocation(line: 5, scope: !10)<br>
+!22 = !MDLocation(line: 6, scope: !10)<br>
+!23 = !MDLocation(line: 8, scope: !14)<br>
+!24 = !MDLocation(line: 9, scope: !14)<br>
+!25 = !MDLocation(line: 10, scope: !14)<br>
!26 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Linker/type-unique-simple2-a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple2-a.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple2-a.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-simple2-a.ll (original)<br>
+++ llvm/trunk/test/Linker/type-unique-simple2-a.ll Wed Jan 14 16:27:36 2015<br>
@@ -118,12 +118,12 @@ attributes #4 = { nounwind readnone }<br>
!35 = !{i32 2, !"Dwarf Version", i32 2}<br>
!36 = !{i32 1, !"Debug Info Version", i32 2}<br>
!37 = !{!"clang version 3.5 "}<br>
-!38 = !{i32 3, i32 0, !27, null}<br>
+!38 = !MDLocation(line: 3, scope: !27)<br>
!39 = !{!"0x101\00this\0016777216\001088", !31, null, !40} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!40 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1A]<br>
-!41 = !{i32 0, i32 0, !31, null}<br>
-!42 = !{i32 2, i32 0, !43, null}<br>
+!41 = !MDLocation(line: 0, scope: !31)<br>
+!42 = !MDLocation(line: 2, scope: !43)<br>
!43 = !{!"0xb\000", !5, !31} ; [ DW_TAG_lexical_block ] [/./ab.h]<br>
!44 = !{!"0x101\00this\0016777216\001088", !34, null, !40} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!45 = !{i32 0, i32 0, !34, null}<br>
-!46 = !{i32 2, i32 0, !34, null}<br>
+!45 = !MDLocation(line: 0, scope: !34)<br>
+!46 = !MDLocation(line: 2, scope: !34)<br>
<br>
Modified: llvm/trunk/test/Linker/type-unique-simple2-b.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple2-b.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple2-b.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-simple2-b.ll (original)<br>
+++ llvm/trunk/test/Linker/type-unique-simple2-b.ll Wed Jan 14 16:27:36 2015<br>
@@ -81,8 +81,8 @@ attributes #1 = { nounwind readnone }<br>
!31 = !{!"clang version 3.5 "}<br>
!32 = !{!"0x101\00this\0016777216\001088", !26, null, !33} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
!33 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1A]<br>
-!34 = !{i32 0, i32 0, !26, null}<br>
-!35 = !{i32 2, i32 0, !26, null}<br>
+!34 = !MDLocation(line: 0, scope: !26)<br>
+!35 = !MDLocation(line: 2, scope: !26)<br>
!36 = !{!"0x101\00this\0016777216\001088", !28, null, !33} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!37 = !{i32 0, i32 0, !28, null}<br>
-!38 = !{i32 4, i32 0, !28, null}<br>
+!37 = !MDLocation(line: 0, scope: !28)<br>
+!38 = !MDLocation(line: 4, scope: !28)<br>
<br>
Modified: llvm/trunk/test/Linker/type-unique-type-array-a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-type-array-a.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-type-array-a.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-type-array-a.ll (original)<br>
+++ llvm/trunk/test/Linker/type-unique-type-array-a.ll Wed Jan 14 16:27:36 2015<br>
@@ -117,13 +117,13 @@ attributes #3 = { nounwind }<br>
!22 = !{i32 2, !"Debug Info Version", i32 2}<br>
!23 = !{!"clang version 3.5.0 (trunk 214102:214113M) (llvm/trunk 214102:214115M)"}<br>
!24 = !{!"0x101\00a\0016777227\000", !15, !16, !19} ; [ DW_TAG_arg_variable ] [a] [line 11]<br>
-!25 = !{i32 11, i32 14, !15, null}<br>
+!25 = !MDLocation(line: 11, column: 14, scope: !15)<br>
!26 = !{!"0x101\00sa\0033554443\000", !15, !16, !"_ZTS2SA"} ; [ DW_TAG_arg_variable ] [sa] [line 11]<br>
-!27 = !{i32 11, i32 20, !15, null}<br>
-!28 = !{i32 12, i32 3, !15, null}<br>
-!29 = !{i32 13, i32 1, !15, null}<br>
+!27 = !MDLocation(line: 11, column: 20, scope: !15)<br>
+!28 = !MDLocation(line: 12, column: 3, scope: !15)<br>
+!29 = !MDLocation(line: 13, column: 1, scope: !15)<br>
!30 = !{!"0x101\00this\0016777216\001088", !20, null, !19} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!31 = !{i32 0, i32 0, !20, null}<br>
+!31 = !MDLocation(line: 0, scope: !20)<br>
!32 = !{!"0x101\00a\0033554439\000", !20, !16, !"_ZTS2SA"} ; [ DW_TAG_arg_variable ] [a] [line 7]<br>
-!33 = !{i32 7, i32 17, !20, null}<br>
-!34 = !{i32 8, i32 3, !20, null}<br>
+!33 = !MDLocation(line: 7, column: 17, scope: !20)<br>
+!34 = !MDLocation(line: 8, column: 3, scope: !20)<br>
<br>
Modified: llvm/trunk/test/Linker/type-unique-type-array-b.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-type-array-b.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-type-array-b.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-type-array-b.ll (original)<br>
+++ llvm/trunk/test/Linker/type-unique-type-array-b.ll Wed Jan 14 16:27:36 2015<br>
@@ -96,13 +96,13 @@ attributes #3 = { nounwind }<br>
!22 = !{i32 2, !"Debug Info Version", i32 2}<br>
!23 = !{!"clang version 3.5.0 (trunk 214102:214113M) (llvm/trunk 214102:214115M)"}<br>
!24 = !{!"0x101\00b\0016777227\000", !15, !16, !19} ; [ DW_TAG_arg_variable ] [b] [line 11]<br>
-!25 = !{i32 11, i32 14, !15, null}<br>
+!25 = !MDLocation(line: 11, column: 14, scope: !15)<br>
!26 = !{!"0x101\00sa\0033554443\000", !15, !16, !"_ZTS2SA"} ; [ DW_TAG_arg_variable ] [sa] [line 11]<br>
-!27 = !{i32 11, i32 20, !15, null}<br>
-!28 = !{i32 12, i32 3, !15, null}<br>
-!29 = !{i32 13, i32 1, !15, null}<br>
+!27 = !MDLocation(line: 11, column: 20, scope: !15)<br>
+!28 = !MDLocation(line: 12, column: 3, scope: !15)<br>
+!29 = !MDLocation(line: 13, column: 1, scope: !15)<br>
!30 = !{!"0x101\00this\0016777216\001088", !20, null, !19} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!31 = !{i32 0, i32 0, !20, null}<br>
+!31 = !MDLocation(line: 0, scope: !20)<br>
!32 = !{!"0x101\00sa\0033554439\000", !20, !16, !"_ZTS2SA"} ; [ DW_TAG_arg_variable ] [sa] [line 7]<br>
-!33 = !{i32 7, i32 17, !20, null}<br>
-!34 = !{i32 8, i32 3, !20, null}<br>
+!33 = !MDLocation(line: 7, column: 17, scope: !20)<br>
+!34 = !MDLocation(line: 8, column: 3, scope: !20)<br>
<br>
Modified: llvm/trunk/test/MC/ARM/coff-debugging-secrel.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/coff-debugging-secrel.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/coff-debugging-secrel.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/ARM/coff-debugging-secrel.ll (original)<br>
+++ llvm/trunk/test/MC/ARM/coff-debugging-secrel.ll Wed Jan 14 16:27:36 2015<br>
@@ -16,7 +16,7 @@ entry:<br>
!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!7}<br>
!llvm.module.flags = !{!9, !10}<br>
<br>
-!0 = !{i32 1, i32 0, !1, null}<br>
+!0 = !MDLocation(line: 1, scope: !1)<br>
!1 = !{!"0x2e\00function\00function\00\001\000\001\000\006\000\000\001", !2, !3, !4, null, void ()* @function, null, null, !6} ; [ DW_TAG_subprogram ], [line 1], [def], [function]<br>
!2 = !{!"/Users/compnerd/work/llvm/test/MC/ARM/reduced.c", !"/Users/compnerd/work/llvm"}<br>
!3 = !{!"0x29", !2} ; [ DW_TAG_file_type] [/Users/compnerd/work/llvm/test/MC/ARM/reduced.c]<br>
<br>
Modified: llvm/trunk/test/MC/ELF/cfi-version.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/cfi-version.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/cfi-version.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/ELF/cfi-version.ll (original)<br>
+++ llvm/trunk/test/MC/ELF/cfi-version.ll Wed Jan 14 16:27:36 2015<br>
@@ -34,7 +34,7 @@ attributes #1 = { "less-precise-fpmad"="<br>
!9 = !{i32 2, !"Dwarf Version", i32 4}<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5.0 "}<br>
-!12 = !{i32 2, i32 0, !4, null}<br>
+!12 = !MDLocation(line: 2, scope: !4)<br>
<br>
; DWARF2: .debug_frame contents:<br>
; DWARF2: Version: 1<br>
<br>
Modified: llvm/trunk/test/Transforms/AddDiscriminators/basic.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/AddDiscriminators/basic.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/AddDiscriminators/basic.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/AddDiscriminators/basic.ll (original)<br>
+++ llvm/trunk/test/Transforms/AddDiscriminators/basic.ll Wed Jan 14 16:27:36 2015<br>
@@ -50,10 +50,10 @@ attributes #0 = { nounwind uwtable "less<br>
!7 = !{i32 2, !"Dwarf Version", i32 4}<br>
!8 = !{i32 1, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.5 "}<br>
-!10 = !{i32 3, i32 0, !11, null}<br>
+!10 = !MDLocation(line: 3, scope: !11)<br>
!11 = !{!"0xb\003\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [basic.c]<br>
-!12 = !{i32 4, i32 0, !4, null}<br>
+!12 = !MDLocation(line: 4, scope: !4)<br>
<br>
-; CHECK: !12 = !{i32 3, i32 0, !13, null}<br>
+; CHECK: !12 = !MDLocation(line: 3, scope: !13)<br>
; CHECK: !13 = !{!"0xb\001", !1, !11} ; [ DW_TAG_lexical_block ] [./basic.c]<br>
-; CHECK: !14 = !{i32 4, i32 0, !4, null}<br>
+; CHECK: !14 = !MDLocation(line: 4, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Transforms/AddDiscriminators/first-only.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/AddDiscriminators/first-only.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/AddDiscriminators/first-only.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/AddDiscriminators/first-only.ll (original)<br>
+++ llvm/trunk/test/Transforms/AddDiscriminators/first-only.ll Wed Jan 14 16:27:36 2015<br>
@@ -60,23 +60,23 @@ attributes #0 = { nounwind uwtable "less<br>
!7 = !{i32 2, !"Dwarf Version", i32 4}<br>
!8 = !{i32 1, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.5 (trunk 199750) (llvm/trunk 199751)"}<br>
-!10 = !{i32 3, i32 0, !11, null}<br>
+!10 = !MDLocation(line: 3, scope: !11)<br>
<br>
!11 = !{!"0xb\003\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [first-only.c]<br>
; CHECK: !11 = !{!"0xb\003\000\000", !1, !4}<br>
<br>
-!12 = !{i32 3, i32 0, !13, null}<br>
+!12 = !MDLocation(line: 3, scope: !13)<br>
<br>
!13 = !{!"0xb\003\000\001", !1, !11} ; [ DW_TAG_lexical_block ] [first-only.c]<br>
; CHECK: !13 = !{!"0xb\001", !1, !14} ; [ DW_TAG_lexical_block ] [./first-only.c]<br>
<br>
-!14 = !{i32 4, i32 0, !13, null}<br>
+!14 = !MDLocation(line: 4, scope: !13)<br>
; CHECK: !14 = !{!"0xb\003\000\001", !1, !11}<br>
<br>
-!15 = !{i32 5, i32 0, !13, null}<br>
-; CHECK: !15 = !{i32 4, i32 0, !14, null}<br>
+!15 = !MDLocation(line: 5, scope: !13)<br>
+; CHECK: !15 = !MDLocation(line: 4, scope: !14)<br>
<br>
-!16 = !{i32 6, i32 0, !4, null}<br>
-; CHECK: !16 = !{i32 5, i32 0, !14, null}<br>
-; CHECK: !17 = !{i32 6, i32 0, !4, null}<br>
+!16 = !MDLocation(line: 6, scope: !4)<br>
+; CHECK: !16 = !MDLocation(line: 5, scope: !14)<br>
+; CHECK: !17 = !MDLocation(line: 6, scope: !4)<br>
<br>
<br>
Modified: llvm/trunk/test/Transforms/AddDiscriminators/multiple.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/AddDiscriminators/multiple.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/AddDiscriminators/multiple.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/AddDiscriminators/multiple.ll (original)<br>
+++ llvm/trunk/test/Transforms/AddDiscriminators/multiple.ll Wed Jan 14 16:27:36 2015<br>
@@ -61,11 +61,11 @@ attributes #0 = { nounwind uwtable "less<br>
!7 = !{i32 2, !"Dwarf Version", i32 4}<br>
!8 = !{i32 1, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.5 (trunk 199750) (llvm/trunk 199751)"}<br>
-!10 = !{i32 3, i32 0, !11, null}<br>
+!10 = !MDLocation(line: 3, scope: !11)<br>
!11 = !{!"0xb\003\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [multiple.c]<br>
-!12 = !{i32 4, i32 0, !4, null}<br>
+!12 = !MDLocation(line: 4, scope: !4)<br>
<br>
-; CHECK: !12 = !{i32 3, i32 0, !13, null}<br>
+; CHECK: !12 = !MDLocation(line: 3, scope: !13)<br>
; CHECK: !13 = !{!"0xb\001", !1, !11} ; [ DW_TAG_lexical_block ] [./multiple.c]<br>
-; CHECK: !14 = !{i32 3, i32 0, !15, null}<br>
+; CHECK: !14 = !MDLocation(line: 3, scope: !15)<br>
; CHECK: !15 = !{!"0xb\002", !1, !11} ; [ DW_TAG_lexical_block ] [./multiple.c]<br>
<br>
Modified: llvm/trunk/test/Transforms/AddDiscriminators/no-discriminators.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/AddDiscriminators/no-discriminators.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/AddDiscriminators/no-discriminators.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/AddDiscriminators/no-discriminators.ll (original)<br>
+++ llvm/trunk/test/Transforms/AddDiscriminators/no-discriminators.ll Wed Jan 14 16:27:36 2015<br>
@@ -63,9 +63,9 @@ attributes #1 = { nounwind readnone }<br>
!11 = !{i32 1, !"Debug Info Version", i32 2}<br>
!12 = !{!"clang version 3.5.0 "}<br>
!13 = !{!"0x101\00i\0016777217\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [i] [line 1]<br>
-!14 = !{i32 1, i32 0, !4, null}<br>
-!15 = !{i32 2, i32 0, !16, null}<br>
-; CHECK: !15 = !{i32 2, i32 0, !16, null}<br>
+!14 = !MDLocation(line: 1, scope: !4)<br>
+!15 = !MDLocation(line: 2, scope: !16)<br>
+; CHECK: !15 = !MDLocation(line: 2, scope: !16)<br>
!16 = !{!"0xb\002\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [./no-discriminators]<br>
; CHECK: !16 = !{!"0xb\002\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [./no-discriminators]<br>
-!17 = !{i32 3, i32 0, !4, null}<br>
+!17 = !MDLocation(line: 3, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Transforms/ArgumentPromotion/dbg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ArgumentPromotion/dbg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ArgumentPromotion/dbg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/ArgumentPromotion/dbg.ll (original)<br>
+++ llvm/trunk/test/Transforms/ArgumentPromotion/dbg.ll Wed Jan 14 16:27:36 2015<br>
@@ -20,7 +20,7 @@ define void @caller(i32** %Y) {<br>
!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!3}<br>
<br>
!0 = !{i32 2, !"Debug Info Version", i32 2}<br>
-!1 = !{i32 8, i32 0, !2, null}<br>
+!1 = !MDLocation(line: 8, scope: !2)<br>
!2 = !{!"0x2e\00test\00test\00\003\001\001\000\006\00256\000\003", null, null, null, null, void (i32**)* @test, null, null, null} ; [ DW_TAG_subprogram ]<br>
!3 = !{!"0x11\004\00clang version 3.5.0 \000\00\000\00\002", null, null, null, !4, null, null} ; [ DW_TAG_compile_unit ] [/usr/local/google/home/blaikie/dev/scratch/pr20038/reduce/<stdin>] [DW_LANG_C_plus_plus]<br>
!4 = !{!2}<br>
<br>
Modified: llvm/trunk/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll (original)<br>
+++ llvm/trunk/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll Wed Jan 14 16:27:36 2015<br>
@@ -58,7 +58,7 @@ declare void @llvm.dbg.value(metadata, i<br>
!10 = !{!"0x101\00len\009\000", !1, !2, !9} ; [ DW_TAG_arg_variable ]<br>
!11 = !{!"0x101\00hash\0010\000", !1, !2, !9} ; [ DW_TAG_arg_variable ]<br>
!12 = !{!"0x101\00flags\0011\000", !1, !2, !9} ; [ DW_TAG_arg_variable ]<br>
-!13 = !{i32 13, i32 0, !14, null}<br>
+!13 = !MDLocation(line: 13, scope: !14)<br>
!14 = !{!"0xb\0012\000\000", !28, !1} ; [ DW_TAG_lexical_block ]<br>
!15 = !{!"0x101\00name\0017\000", !16, !2, !6} ; [ DW_TAG_arg_variable ]<br>
!16 = !{!"0x2e\00add_name_internal\00add_name_internal\00add_name_internal\0022\001\001\000\006\000\000\000", !28, !2, !17, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
@@ -69,10 +69,10 @@ declare void @llvm.dbg.value(metadata, i<br>
!21 = !{!"0x101\00hash\0019\000", !16, !2, !9} ; [ DW_TAG_arg_variable ]<br>
!22 = !{!"0x101\00extra\0020\000", !16, !2, !19} ; [ DW_TAG_arg_variable ]<br>
!23 = !{!"0x101\00flags\0021\000", !16, !2, !9} ; [ DW_TAG_arg_variable ]<br>
-!24 = !{i32 23, i32 0, !25, null}<br>
+!24 = !MDLocation(line: 23, scope: !25)<br>
!25 = !{!"0xb\0022\000\000", !28, !16} ; [ DW_TAG_lexical_block ]<br>
-!26 = !{i32 24, i32 0, !25, null}<br>
-!27 = !{i32 26, i32 0, !25, null}<br>
+!26 = !MDLocation(line: 24, scope: !25)<br>
+!27 = !MDLocation(line: 26, scope: !25)<br>
!28 = !{!"tail.c", !"/Users/echeng/LLVM/radars/r7927803/"}<br>
!29 = !{i32 0}<br>
!30 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/DeadArgElim/dbginfo.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/dbginfo.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/dbginfo.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/DeadArgElim/dbginfo.ll (original)<br>
+++ llvm/trunk/test/Transforms/DeadArgElim/dbginfo.ll Wed Jan 14 16:27:36 2015<br>
@@ -62,9 +62,9 @@ attributes #2 = { nounwind readnone }<br>
!12 = !{i32 2, !"Dwarf Version", i32 4}<br>
!13 = !{i32 2, !"Debug Info Version", i32 2}<br>
!14 = !{!"clang version 3.6.0 "}<br>
-!15 = !{i32 5, i32 3, !4, null}<br>
-!16 = !{i32 6, i32 1, !4, null}<br>
+!15 = !MDLocation(line: 5, column: 3, scope: !4)<br>
+!16 = !MDLocation(line: 6, column: 1, scope: !4)<br>
!17 = !{!"0x101\00\0016777217\000", !8, !5, !11} ; [ DW_TAG_arg_variable ] [line 1]<br>
!18 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!19 = !{i32 1, i32 19, !8, null}<br>
-!20 = !{i32 2, i32 1, !8, null}<br>
+!19 = !MDLocation(line: 1, column: 19, scope: !8)<br>
+!20 = !MDLocation(line: 2, column: 1, scope: !8)<br>
<br>
Modified: llvm/trunk/test/Transforms/GCOVProfiling/function-numbering.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/function-numbering.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/function-numbering.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/GCOVProfiling/function-numbering.ll (original)<br>
+++ llvm/trunk/test/Transforms/GCOVProfiling/function-numbering.ll Wed Jan 14 16:27:36 2015<br>
@@ -52,5 +52,5 @@ define void @baz() {<br>
!9 = !{i32 2, !"Dwarf Version", i32 2}<br>
!10 = !{i32 2, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.6.0 "}<br>
-!12 = !{i32 1, i32 13, !4, null}<br>
-!13 = !{i32 3, i32 13, !8, null}<br>
+!12 = !MDLocation(line: 1, column: 13, scope: !4)<br>
+!13 = !MDLocation(line: 3, column: 13, scope: !8)<br>
<br>
Modified: llvm/trunk/test/Transforms/GCOVProfiling/global-ctor.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/global-ctor.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/global-ctor.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/GCOVProfiling/global-ctor.ll (original)<br>
+++ llvm/trunk/test/Transforms/GCOVProfiling/global-ctor.ll Wed Jan 14 16:27:36 2015<br>
@@ -51,6 +51,6 @@ attributes #1 = { "less-precise-fpmad"="<br>
!10 = !{i32 2, !"Dwarf Version", i32 4}<br>
!11 = !{i32 2, !"Debug Info Version", i32 2}<br>
!12 = !{!"clang version 3.5.0 (trunk 210217)"}<br>
-!13 = !{i32 2, i32 0, !4, null}<br>
-!14 = !{i32 0, i32 0, !15, null}<br>
+!13 = !MDLocation(line: 2, scope: !4)<br>
+!14 = !MDLocation(line: 0, scope: !15)<br>
!15 = !{!"0xb\000", !5, !8} ; [ DW_TAG_lexical_block ] [/home/nlewycky/global-ctor.ll]<br>
<br>
Modified: llvm/trunk/test/Transforms/GCOVProfiling/linezero.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/linezero.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/linezero.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/GCOVProfiling/linezero.ll (original)<br>
+++ llvm/trunk/test/Transforms/GCOVProfiling/linezero.ll Wed Jan 14 16:27:36 2015<br>
@@ -124,19 +124,19 @@ attributes #3 = { noreturn nounwind }<br>
!27 = !{!"0x100\00__range\000\0064", !28, null, !29} ; [ DW_TAG_auto_variable ] [__range] [line 0]<br>
!28 = !{!"0xb\0051\000\000", !5, !15} ; [ DW_TAG_lexical_block ] [./linezero.cc]<br>
!29 = !{!"0x42\00\000\000\000\000\000", null, null, !"_ZTS6vector"} ; [ DW_TAG_rvalue_reference_type ] [line 0, size 0, align 0, offset 0] [from _ZTS6vector]<br>
-!30 = !{i32 0, i32 0, !28, null}<br>
-!31 = !{i32 51, i32 0, !28, null}<br>
+!30 = !MDLocation(line: 0, scope: !28)<br>
+!31 = !MDLocation(line: 51, scope: !28)<br>
!32 = !{!"0x100\00__begin\000\0064", !28, null, !10} ; [ DW_TAG_auto_variable ] [__begin] [line 0]<br>
!33 = !{!"0x100\00__end\000\0064", !28, null, !10} ; [ DW_TAG_auto_variable ] [__end] [line 0]<br>
-!34 = !{i32 51, i32 0, !35, null}<br>
+!34 = !MDLocation(line: 51, scope: !35)<br>
!35 = !{!"0xb\0051\000\005", !5, !36} ; [ DW_TAG_lexical_block ] [./linezero.cc]<br>
!36 = !{!"0xb\0051\000\001", !5, !28} ; [ DW_TAG_lexical_block ] [./linezero.cc]<br>
!37 = !{!"0x100\00spec\0051\000", !28, !16, !11} ; [ DW_TAG_auto_variable ] [spec] [line 51]<br>
-!38 = !{i32 51, i32 0, !39, null}<br>
+!38 = !MDLocation(line: 51, scope: !39)<br>
!39 = !{!"0xb\0051\000\002", !5, !28} ; [ DW_TAG_lexical_block ] [./linezero.cc]<br>
-!40 = !{i32 51, i32 0, !41, null}<br>
+!40 = !MDLocation(line: 51, scope: !41)<br>
!41 = !{!"0xb\0051\000\004", !5, !28} ; [ DW_TAG_lexical_block ] [./linezero.cc]<br>
-!42 = !{i32 51, i32 0, !43, null}<br>
+!42 = !MDLocation(line: 51, scope: !43)<br>
!43 = !{!"0xb\0051\000\003", !5, !28} ; [ DW_TAG_lexical_block ] [./linezero.cc]<br>
-!44 = !{i32 52, i32 0, !15, null}<br>
-!45 = !{i32 54, i32 0, !20, null}<br>
+!44 = !MDLocation(line: 52, scope: !15)<br>
+!45 = !MDLocation(line: 54, scope: !20)<br>
<br>
Modified: llvm/trunk/test/Transforms/GCOVProfiling/linkagename.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/linkagename.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/linkagename.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/GCOVProfiling/linkagename.ll (original)<br>
+++ llvm/trunk/test/Transforms/GCOVProfiling/linkagename.ll Wed Jan 14 16:27:36 2015<br>
@@ -21,7 +21,7 @@ entry:<br>
!5 = !{!"0x2e\00foo\00foo\00_Z3foov\001\000\001\000\006\00256\000\001", !1, !1, !6, null, void ()* @_Z3foov, null, null, !3} ; [ DW_TAG_subprogram ] [line 1] [def] [foo]<br>
!6 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !7, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!7 = !{null}<br>
-!8 = !{i32 1, i32 0, !5, null}<br>
+!8 = !MDLocation(line: 1, scope: !5)<br>
<br>
<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/GCOVProfiling/return-block.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/return-block.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/return-block.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/GCOVProfiling/return-block.ll (original)<br>
+++ llvm/trunk/test/Transforms/GCOVProfiling/return-block.ll Wed Jan 14 16:27:36 2015<br>
@@ -52,11 +52,11 @@ attributes #2 = { nounwind }<br>
!11 = !{i32 2, !"Dwarf Version", i32 4}<br>
!12 = !{i32 2, !"Debug Info Version", i32 2}<br>
!13 = !{!"clang version 3.6.0 (trunk 223182)"}<br>
-!14 = !{i32 6, i32 3, !4, null}<br>
-!15 = !{i32 7, i32 7, !4, null}<br>
-!16 = !{i32 8, i32 5, !17, null}<br>
+!14 = !MDLocation(line: 6, column: 3, scope: !4)<br>
+!15 = !MDLocation(line: 7, column: 7, scope: !4)<br>
+!16 = !MDLocation(line: 8, column: 5, scope: !17)<br>
!17 = !{!"0xb\007\007\000", !1, !4} ; [ DW_TAG_lexical_block ] [return-block.c]<br>
-!18 = !{i32 9, i32 1, !4, null}<br>
+!18 = !MDLocation(line: 9, column: 1, scope: !4)<br>
<br>
; There should be no destination edges for block 1.<br>
; CHECK: Block : 0 Counter : 0<br>
<br>
Modified: llvm/trunk/test/Transforms/GCOVProfiling/version.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/version.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GCOVProfiling/version.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/GCOVProfiling/version.ll (original)<br>
+++ llvm/trunk/test/Transforms/GCOVProfiling/version.ll Wed Jan 14 16:27:36 2015<br>
@@ -23,7 +23,7 @@ define void @test() {<br>
!5 = !{!"0x2e\00test\00test\00\001\000\001\000\006\00256\000\001", !10, !6, !7, null, void ()* @test, null, null, !3} ; [ DW_TAG_subprogram ] [line 1] [def] [test]<br>
!6 = !{!"0x29", !10} ; [ DW_TAG_file_type ]<br>
!7 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !3, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
-!8 = !{i32 1, i32 0, !5, null}<br>
+!8 = !MDLocation(line: 1, scope: !5)<br>
;; !9 is added through the echo line at the top.<br>
!10 = !{!"<stdin>", !"."}<br>
!11 = !{!"version", !"/usr/local/google/home/nlewycky"}<br>
<br>
Modified: llvm/trunk/test/Transforms/GlobalOpt/2009-03-05-dbg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2009-03-05-dbg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2009-03-05-dbg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/GlobalOpt/2009-03-05-dbg.ll (original)<br>
+++ llvm/trunk/test/Transforms/GlobalOpt/2009-03-05-dbg.ll Wed Jan 14 16:27:36 2015<br>
@@ -62,18 +62,18 @@ declare void @llvm.dbg.value(metadata, i<br>
!4 = !{!"0x2e\00foo\00foo\00foo\004\000\001\000\006\000\000\000", i32 0, !1, !5, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!5 = !{!"0x15\00\000\000\000\000\000\000", !1, null, null, !6, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!6 = !{!2, !2}<br>
-!7 = !{i32 5, i32 0, !8, null}<br>
+!7 = !MDLocation(line: 5, scope: !8)<br>
!8 = !{!"0xb\000\000\000", !20, !4} ; [ DW_TAG_lexical_block ]<br>
-!9 = !{i32 6, i32 0, !8, null}<br>
-!10 = !{i32 7, i32 0, !8, null}<br>
-!11 = !{i32 9, i32 0, !8, null}<br>
-!12 = !{i32 11, i32 0, !8, null}<br>
-!13 = !{i32 14, i32 0, !14, null}<br>
+!9 = !MDLocation(line: 6, scope: !8)<br>
+!10 = !MDLocation(line: 7, scope: !8)<br>
+!11 = !MDLocation(line: 9, scope: !8)<br>
+!12 = !MDLocation(line: 11, scope: !8)<br>
+!13 = !MDLocation(line: 14, scope: !14)<br>
!14 = !{!"0xb\000\000\000", !20, !15} ; [ DW_TAG_lexical_block ]<br>
!15 = !{!"0x2e\00bar\00bar\00bar\0013\000\001\000\006\000\000\000", i32 0, !1, !16, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!16 = !{!"0x15\00\000\000\000\000\000\000", !1, null, null, !17, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!17 = !{!2}<br>
-!18 = !{i32 15, i32 0, !14, null}<br>
-!19 = !{i32 16, i32 0, !14, null}<br>
+!18 = !MDLocation(line: 15, scope: !14)<br>
+!19 = !MDLocation(line: 16, scope: !14)<br>
!20 = !{!"g.c", !"/tmp"}<br>
!21 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/Transforms/Inline/debug-invoke.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/debug-invoke.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/debug-invoke.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/Inline/debug-invoke.ll (original)<br>
+++ llvm/trunk/test/Transforms/Inline/debug-invoke.ll Wed Jan 14 16:27:36 2015<br>
@@ -5,8 +5,8 @@<br>
; CHECK: invoke void @test()<br>
; CHECK-NEXT: to label {{.*}} unwind label {{.*}}, !dbg [[INL_LOC:!.*]]<br>
; CHECK: [[EMPTY:.*]] = !{}<br>
-; CHECK: [[INL_LOC]] = !{i32 1, i32 0, [[EMPTY]], [[INL_AT:.*]]}<br>
-; CHECK: [[INL_AT]] = !{i32 2, i32 0, [[EMPTY]], null}<br>
+; CHECK: [[INL_LOC]] = !MDLocation(line: 1, scope: [[EMPTY]], inlinedAt: [[INL_AT:.*]])<br>
+; CHECK: [[INL_AT]] = !MDLocation(line: 2, scope: [[EMPTY]])<br>
<br>
declare void @test()<br>
declare i32 @__gxx_personality_v0(...)<br>
@@ -33,5 +33,5 @@ lpad:<br>
!llvm.module.flags = !{!1}<br>
!1 = !{i32 2, !"Debug Info Version", i32 2}<br>
!2 = !{}<br>
-!3 = !{i32 1, i32 0, !2, null}<br>
-!4 = !{i32 2, i32 0, !2, null}<br>
+!3 = !MDLocation(line: 1, scope: !2)<br>
+!4 = !MDLocation(line: 2, scope: !2)<br>
<br>
Modified: llvm/trunk/test/Transforms/Inline/inline_dbg_declare.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/inline_dbg_declare.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/inline_dbg_declare.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/Inline/inline_dbg_declare.ll (original)<br>
+++ llvm/trunk/test/Transforms/Inline/inline_dbg_declare.ll Wed Jan 14 16:27:36 2015<br>
@@ -85,12 +85,12 @@ attributes #1 = { nounwind readnone }<br>
!15 = !{!"clang version 3.6.0 (trunk)"}<br>
!16 = !{!"0x101\00x\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [x] [line 1]<br>
!17 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
-!18 = !{i32 1, i32 17, !4, null}<br>
-!19 = !{i32 3, i32 5, !4, null}<br>
+!18 = !MDLocation(line: 1, column: 17, scope: !4)<br>
+!19 = !MDLocation(line: 3, column: 5, scope: !4)<br>
!20 = !{!"0x101\00dst\0016777222\000", !9, !5, !12} ; [ DW_TAG_arg_variable ] [dst] [line 6]<br>
-!21 = !{i32 6, i32 17, !9, null}<br>
-!22 = !{i32 8, i32 14, !9, null}<br>
-!23 = !{i32 9, i32 1, !9, null}<br>
+!21 = !MDLocation(line: 6, column: 17, scope: !9)<br>
+!22 = !MDLocation(line: 8, column: 14, scope: !9)<br>
+!23 = !MDLocation(line: 9, column: 1, scope: !9)<br>
<br>
; CHECK: [[m23]] = !{!"0x101\00x\0016777217\000", !4, !5, !8, !22} ; [ DW_TAG_arg_variable ] [x] [line 1]<br>
-; CHECK: [[m24]] = !{i32 1, i32 17, !4, !22}<br>
+; CHECK: [[m24]] = !MDLocation(line: 1, column: 17, scope: !4, inlinedAt: !22)<br>
<br>
Modified: llvm/trunk/test/Transforms/InstCombine/debug-line.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/debug-line.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/debug-line.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/InstCombine/debug-line.ll (original)<br>
+++ llvm/trunk/test/Transforms/InstCombine/debug-line.ll Wed Jan 14 16:27:36 2015<br>
@@ -20,9 +20,9 @@ declare i32 @printf(i8*, ...)<br>
!2 = !{!"0x11\0012\00clang\001\00\000\00\000", !8, !4, !4, !9, null, null} ; [ DW_TAG_compile_unit ]<br>
!3 = !{!"0x15\00\000\000\000\000\000\000", !8, !1, null, !4, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!4 = !{null}<br>
-!5 = !{i32 5, i32 2, !6, null}<br>
+!5 = !MDLocation(line: 5, column: 2, scope: !6)<br>
!6 = !{!"0xb\004\0012\000", !8, !0} ; [ DW_TAG_lexical_block ]<br>
-!7 = !{i32 6, i32 1, !6, null}<br>
+!7 = !MDLocation(line: 6, column: 1, scope: !6)<br>
!8 = !{!"m.c", !"/private/tmp"}<br>
!9 = !{!0}<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/InstCombine/debuginfo.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/debuginfo.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/debuginfo.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/InstCombine/debuginfo.ll (original)<br>
+++ llvm/trunk/test/Transforms/InstCombine/debuginfo.ll Wed Jan 14 16:27:36 2015<br>
@@ -44,10 +44,10 @@ entry:<br>
!10 = !{!"0x16\00size_t\0080\000\000\000\000", !27, !3, !11} ; [ DW_TAG_typedef ]<br>
!11 = !{!"0x16\00__darwin_size_t\0090\000\000\000\000", !27, !3, !12} ; [ DW_TAG_typedef ]<br>
!12 = !{!"0x24\00long unsigned int\000\0064\0064\000\000\007", null, !3} ; [ DW_TAG_base_type ]<br>
-!16 = !{i32 78, i32 28, !1, null}<br>
-!18 = !{i32 78, i32 40, !1, null}<br>
-!20 = !{i32 78, i32 54, !1, null}<br>
-!21 = !{i32 80, i32 3, !22, null}<br>
+!16 = !MDLocation(line: 78, column: 28, scope: !1)<br>
+!18 = !MDLocation(line: 78, column: 40, scope: !1)<br>
+!20 = !MDLocation(line: 78, column: 54, scope: !1)<br>
+!21 = !MDLocation(line: 80, column: 3, scope: !22)<br>
!22 = !{!"0xb\0080\003\007", !27, !23} ; [ DW_TAG_lexical_block ]<br>
!23 = !{!"0xb\0079\001\006", !27, !1} ; [ DW_TAG_lexical_block ]<br>
!24 = !{!1}<br>
<br>
Modified: llvm/trunk/test/Transforms/LICM/debug-value.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LICM/debug-value.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LICM/debug-value.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LICM/debug-value.ll (original)<br>
+++ llvm/trunk/test/Transforms/LICM/debug-value.ll Wed Jan 14 16:27:36 2015<br>
@@ -47,19 +47,19 @@ declare void @llvm.dbg.value(metadata, i<br>
!8 = !{null}<br>
!9 = !{!"0x2e\00daxpy\00daxpy\00\00230\000\001\000\006\00256\000\000", !25, !1, !7, i32 0, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!10 = !{!"0x2e\00dgefa\00dgefa\00\00267\000\001\000\006\00256\000\000", !25, !1, !7, null, null, null, null, null} ; [ DW_TAG_subprogram ] [line 267] [def] [scope 0] [dgefa]<br>
-!11 = !{i32 281, i32 9, !12, null}<br>
+!11 = !MDLocation(line: 281, column: 9, scope: !12)<br>
!12 = !{!"0xb\00272\005\0032", !25, !13} ; [ DW_TAG_lexical_block ]<br>
!13 = !{!"0xb\00271\005\0031", !25, !14} ; [ DW_TAG_lexical_block ]<br>
!14 = !{!"0xb\00267\001\0030", !25, !10} ; [ DW_TAG_lexical_block ]<br>
-!15 = !{i32 271, i32 5, !14, null}<br>
-!16 = !{i32 284, i32 10, !17, null}<br>
+!15 = !MDLocation(line: 271, column: 5, scope: !14)<br>
+!16 = !MDLocation(line: 284, column: 10, scope: !17)<br>
!17 = !{!"0xb\00282\009\0033", !25, !12} ; [ DW_TAG_lexical_block ]<br>
!18 = !{double undef}<br>
!19 = !{!"0x100\00temp\00268\000", !14, !1, !20} ; [ DW_TAG_auto_variable ]<br>
!20 = !{!"0x24\00double\000\0064\0064\000\000\004", null, !2} ; [ DW_TAG_base_type ]<br>
-!21 = !{i32 286, i32 14, !22, null}<br>
+!21 = !MDLocation(line: 286, column: 14, scope: !22)<br>
!22 = !{!"0xb\00285\0013\0034", !25, !17} ; [ DW_TAG_lexical_block ]<br>
-!23 = !{i32 296, i32 13, !17, null}<br>
-!24 = !{i32 313, i32 1, !14, null}<br>
+!23 = !MDLocation(line: 296, column: 13, scope: !17)<br>
+!24 = !MDLocation(line: 313, column: 1, scope: !14)<br>
!25 = !{!"/Volumes/Lalgate/work/llvm/projects/llvm-test/SingleSource/Benchmarks/CoyoteBench/lpbench.c", !"/private/tmp"}<br>
!26 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopIdiom/debug-line.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopIdiom/debug-line.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopIdiom/debug-line.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopIdiom/debug-line.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopIdiom/debug-line.ll Wed Jan 14 16:27:36 2015<br>
@@ -38,15 +38,15 @@ declare void @llvm.dbg.value(metadata, i<br>
!5 = !{!"0x101\00a\0016777218\000", !0, !1, !6} ; [ DW_TAG_arg_variable ]<br>
!6 = !{!"0xf\00\000\0064\0064\000\000", null, !2, !7} ; [ DW_TAG_pointer_type ]<br>
!7 = !{!"0x24\00double\000\0064\0064\000\000\004", null, !2} ; [ DW_TAG_base_type ]<br>
-!8 = !{i32 2, i32 18, !0, null}<br>
+!8 = !MDLocation(line: 2, column: 18, scope: !0)<br>
!9 = !{i32 0}<br>
!10 = !{!"0x100\00i\003\000", !11, !1, !13} ; [ DW_TAG_auto_variable ]<br>
!11 = !{!"0xb\003\003\001", !18, !12} ; [ DW_TAG_lexical_block ]<br>
!12 = !{!"0xb\002\0021\000", !18, !0} ; [ DW_TAG_lexical_block ]<br>
!13 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !2} ; [ DW_TAG_base_type ]<br>
-!14 = !{i32 3, i32 3, !12, null}<br>
-!15 = !{i32 4, i32 5, !11, null}<br>
-!16 = !{i32 3, i32 29, !11, null}<br>
-!17 = !{i32 5, i32 1, !12, null}<br>
+!14 = !MDLocation(line: 3, column: 3, scope: !12)<br>
+!15 = !MDLocation(line: 4, column: 5, scope: !11)<br>
+!16 = !MDLocation(line: 3, column: 29, scope: !11)<br>
+!17 = !MDLocation(line: 5, column: 1, scope: !12)<br>
!18 = !{!"li.c", !"/private/tmp"}<br>
!19 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopRotate/dbgvalue.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopRotate/dbgvalue.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopRotate/dbgvalue.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopRotate/dbgvalue.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopRotate/dbgvalue.ll Wed Jan 14 16:27:36 2015<br>
@@ -91,17 +91,17 @@ for.end:<br>
!4 = !{!5}<br>
!5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !2} ; [ DW_TAG_base_type ]<br>
!6 = !{!"0x101\00x\0032\000", !0, !1, !5} ; [ DW_TAG_arg_variable ]<br>
-!7 = !{i32 32, i32 13, !0, null}<br>
+!7 = !MDLocation(line: 32, column: 13, scope: !0)<br>
!8 = !{!"0x101\00y\0032\000", !0, !1, !5} ; [ DW_TAG_arg_variable ]<br>
-!9 = !{i32 32, i32 20, !0, null}<br>
+!9 = !MDLocation(line: 32, column: 20, scope: !0)<br>
!10 = !{!"0x101\00z\0032\000", !0, !1, !5} ; [ DW_TAG_arg_variable ]<br>
-!11 = !{i32 32, i32 27, !0, null}<br>
-!12 = !{i32 33, i32 3, !13, null}<br>
+!11 = !MDLocation(line: 32, column: 27, scope: !0)<br>
+!12 = !MDLocation(line: 33, column: 3, scope: !13)<br>
!13 = !{!"0xb\0032\0030\006", !18, !0} ; [ DW_TAG_lexical_block ]<br>
-!14 = !{i32 34, i32 5, !15, null}<br>
+!14 = !MDLocation(line: 34, column: 5, scope: !15)<br>
!15 = !{!"0xb\0033\0014\007", !18, !13} ; [ DW_TAG_lexical_block ]<br>
-!16 = !{i32 36, i32 3, !13, null}<br>
-!17 = !{i32 37, i32 1, !13, null}<br>
+!16 = !MDLocation(line: 36, column: 3, scope: !13)<br>
+!17 = !MDLocation(line: 37, column: 1, scope: !13)<br>
!18 = !{!"/Volumes/Lalgate/cj/llvm/projects/llvm-test/SingleSource/Benchmarks/BenchmarkGame/recursive.c", !"/Volumes/Lalgate/cj/D/projects/llvm-test/SingleSource/Benchmarks/BenchmarkGame"}<br>
!19 = !{i32 0}<br>
!20 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks-missed.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks-missed.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks-missed.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks-missed.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks-missed.ll Wed Jan 14 16:27:36 2015<br>
@@ -134,28 +134,28 @@ attributes #0 = { nounwind }<br>
!9 = !{i32 2, !"Dwarf Version", i32 2}<br>
!10 = !{i32 2, !"Debug Info Version", i32 2}<br>
!11 = !{!"clang version 3.5.0"}<br>
-!12 = !{i32 3, i32 8, !13, null}<br>
+!12 = !MDLocation(line: 3, column: 8, scope: !13)<br>
!13 = !{!"0xb\003\003\000", !1, !4} ; [ DW_TAG_lexical_block ]<br>
!14 = !{!14, !15, !15}<br>
!15 = !{!"llvm.loop.vectorize.enable", i1 true}<br>
-!16 = !{i32 4, i32 5, !17, null}<br>
+!16 = !MDLocation(line: 4, column: 5, scope: !17)<br>
!17 = !{!"0xb\003\0036\000", !1, !13} ; [ DW_TAG_lexical_block ]<br>
!18 = !{!19, !19, i64 0}<br>
!19 = !{!"int", !20, i64 0}<br>
!20 = !{!"omnipotent char", !21, i64 0}<br>
!21 = !{!"Simple C/C++ TBAA"}<br>
-!22 = !{i32 5, i32 9, !23, null}<br>
+!22 = !MDLocation(line: 5, column: 9, scope: !23)<br>
!23 = !{!"0xb\005\009\000", !1, !17} ; [ DW_TAG_lexical_block ]<br>
-!24 = !{i32 8, i32 1, !4, null}<br>
-!25 = !{i32 12, i32 8, !26, null}<br>
+!24 = !MDLocation(line: 8, column: 1, scope: !4)<br>
+!25 = !MDLocation(line: 12, column: 8, scope: !26)<br>
!26 = !{!"0xb\0012\003\000", !1, !7} ; [ DW_TAG_lexical_block ]<br>
!27 = !{!27, !28, !29}<br>
!28 = !{!"llvm.loop.interleave.count", i32 1}<br>
!29 = !{!"llvm.loop.vectorize.width", i32 1}<br>
-!30 = !{i32 13, i32 5, !26, null}<br>
-!31 = !{i32 14, i32 1, !7, null}<br>
-!32 = !{i32 18, i32 8, !33, null}<br>
+!30 = !MDLocation(line: 13, column: 5, scope: !26)<br>
+!31 = !MDLocation(line: 14, column: 1, scope: !7)<br>
+!32 = !MDLocation(line: 18, column: 8, scope: !33)<br>
!33 = !{!"0xb\0018\003\000", !1, !8} ; [ DW_TAG_lexical_block ]<br>
!34 = !{!34, !15}<br>
-!35 = !{i32 19, i32 5, !33, null}<br>
-!36 = !{i32 20, i32 1, !8, null}<br>
+!35 = !MDLocation(line: 19, column: 5, scope: !33)<br>
+!36 = !MDLocation(line: 20, column: 1, scope: !8)<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopVectorize/X86/vectorization-remarks.ll Wed Jan 14 16:27:36 2015<br>
@@ -58,17 +58,17 @@ declare void @ibar(i32*) #1<br>
!7 = !{i32 2, !"Dwarf Version", i32 4}<br>
!8 = !{i32 1, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.5.0 "}<br>
-!10 = !{i32 8, i32 3, !4, null}<br>
+!10 = !MDLocation(line: 8, column: 3, scope: !4)<br>
!11 = !{!12, !12, i64 0}<br>
!12 = !{!"int", !13, i64 0}<br>
!13 = !{!"omnipotent char", !14, i64 0}<br>
!14 = !{!"Simple C/C++ TBAA"}<br>
-!15 = !{i32 17, i32 8, !16, null}<br>
+!15 = !MDLocation(line: 17, column: 8, scope: !16)<br>
!16 = !{!"0xb\0017\008\002", !1, !17} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]<br>
!17 = !{!"0xb\0017\008\001", !1, !18} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]<br>
!18 = !{!"0xb\0017\003\000", !1, !4} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]<br>
-!19 = !{i32 18, i32 5, !20, null}<br>
+!19 = !MDLocation(line: 18, column: 5, scope: !20)<br>
!20 = !{!"0xb\0017\0027\000", !1, !18} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c]<br>
!21 = !{!13, !13, i64 0}<br>
-!22 = !{i32 20, i32 3, !4, null}<br>
-!23 = !{i32 21, i32 3, !4, null}<br>
+!22 = !MDLocation(line: 20, column: 3, scope: !4)<br>
+!23 = !MDLocation(line: 21, column: 3, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopVectorize/conditional-assignment.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/conditional-assignment.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/conditional-assignment.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopVectorize/conditional-assignment.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopVectorize/conditional-assignment.ll Wed Jan 14 16:27:36 2015<br>
@@ -46,13 +46,13 @@ attributes #0 = { nounwind }<br>
!7 = !{i32 2, !"Dwarf Version", i32 2}<br>
!8 = !{i32 2, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.6.0"}<br>
-!10 = !{i32 2, i32 8, !11, null}<br>
+!10 = !MDLocation(line: 2, column: 8, scope: !11)<br>
!11 = !{!"0xb\002\003\000", !1, !4} ; [ DW_TAG_lexical_block ]<br>
-!12 = !{i32 3, i32 9, !13, null}<br>
+!12 = !MDLocation(line: 3, column: 9, scope: !13)<br>
!13 = !{!"0xb\003\009\000", !1, !11} ; [ DW_TAG_lexical_block ]<br>
!14 = !{!15, !15, i64 0}<br>
!15 = !{!"int", !16, i64 0}<br>
!16 = !{!"omnipotent char", !17, i64 0}<br>
!17 = !{!"Simple C/C++ TBAA"}<br>
-!18 = !{i32 3, i32 29, !13, null}<br>
-!19 = !{i32 4, i32 1, !4, null}<br>
+!18 = !MDLocation(line: 3, column: 29, scope: !13)<br>
+!19 = !MDLocation(line: 4, column: 1, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopVectorize/control-flow.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/control-flow.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/control-flow.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopVectorize/control-flow.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopVectorize/control-flow.ll Wed Jan 14 16:27:36 2015<br>
@@ -65,14 +65,14 @@ attributes #0 = { nounwind }<br>
!7 = !{i32 2, !"Dwarf Version", i32 2}<br>
!8 = !{i32 2, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.5.0"}<br>
-!10 = !{i32 3, i32 8, !11, null}<br>
+!10 = !MDLocation(line: 3, column: 8, scope: !11)<br>
!11 = !{!"0xb\003\003\000", !1, !4} ; [ DW_TAG_lexical_block ]<br>
-!12 = !{i32 5, i32 9, !13, null}<br>
+!12 = !MDLocation(line: 5, column: 9, scope: !13)<br>
!13 = !{!"0xb\005\009\000", !1, !14} ; [ DW_TAG_lexical_block ]<br>
!14 = !{!"0xb\004\003\000", !1, !11} ; [ DW_TAG_lexical_block ]<br>
!15 = !{!16, !16, i64 0}<br>
!16 = !{!"int", !17, i64 0}<br>
!17 = !{!"omnipotent char", !18, i64 0}<br>
!18 = !{!"Simple C/C++ TBAA"}<br>
-!19 = !{i32 8, i32 7, !13, null}<br>
-!20 = !{i32 12, i32 3, !4, null}<br>
+!19 = !MDLocation(line: 8, column: 7, scope: !13)<br>
+!20 = !MDLocation(line: 12, column: 3, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopVectorize/dbg.value.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/dbg.value.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/dbg.value.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopVectorize/dbg.value.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopVectorize/dbg.value.ll Wed Jan 14 16:27:36 2015<br>
@@ -62,9 +62,9 @@ attributes #1 = { nounwind readnone }<br>
!15 = !{i32 786465, i64 0, i64 1024}<br>
!16 = !{!"0x34\00B\00B\00\002\000\001", null, !4, !13, [1024 x i32]* @B, null} ; [ DW_TAG_variable ]<br>
!17 = !{!"0x34\00C\00C\00\003\000\001", null, !4, !13, [1024 x i32]* @C, null} ; [ DW_TAG_variable ]<br>
-!18 = !{i32 6, i32 0, !10, null}<br>
-!19 = !{i32 7, i32 0, !20, null}<br>
+!18 = !MDLocation(line: 6, scope: !10)<br>
+!19 = !MDLocation(line: 7, scope: !20)<br>
!20 = !{!"0xb\006\000\001", !25, !10} ; [ DW_TAG_lexical_block ]<br>
-!24 = !{i32 9, i32 0, !3, null}<br>
+!24 = !MDLocation(line: 9, scope: !3)<br>
!25 = !{!"test", !"/path/to/somewhere"}<br>
!26 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopVectorize/debugloc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/debugloc.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/debugloc.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopVectorize/debugloc.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopVectorize/debugloc.ll Wed Jan 14 16:27:36 2015<br>
@@ -82,9 +82,9 @@ attributes #1 = { nounwind readnone }<br>
!16 = !{!"0x100\00i\005\000", !17, !6, !11} ; [ DW_TAG_auto_variable ] [i] [line 5]<br>
!17 = !{!"0xb\005\000\000", !5, !4} ; [ DW_TAG_lexical_block ] [/Volumes/Data/backedup/dev/os/llvm/debug/<stdin>]<br>
!18 = !{i32 2, !"Dwarf Version", i32 3}<br>
-!19 = !{i32 3, i32 0, !4, null}<br>
-!20 = !{i32 4, i32 0, !4, null}<br>
-!21 = !{i32 5, i32 0, !17, null}<br>
-!22 = !{i32 6, i32 0, !17, null}<br>
-!26 = !{i32 7, i32 0, !4, null}<br>
+!19 = !MDLocation(line: 3, scope: !4)<br>
+!20 = !MDLocation(line: 4, scope: !4)<br>
+!21 = !MDLocation(line: 5, scope: !17)<br>
+!22 = !MDLocation(line: 6, scope: !17)<br>
+!26 = !MDLocation(line: 7, scope: !4)<br>
!27 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopVectorize/no_array_bounds.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/no_array_bounds.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/no_array_bounds.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopVectorize/no_array_bounds.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopVectorize/no_array_bounds.ll Wed Jan 14 16:27:36 2015<br>
@@ -82,20 +82,20 @@ attributes #0 = { nounwind }<br>
!7 = !{i32 2, !"Dwarf Version", i32 2}<br>
!8 = !{i32 2, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.5.0"}<br>
-!10 = !{i32 4, i32 8, !11, null}<br>
+!10 = !MDLocation(line: 4, column: 8, scope: !11)<br>
!11 = !{!"0xb\004\003\000", !1, !4} ; [ DW_TAG_lexical_block ]<br>
!12 = !{!12, !13}<br>
!13 = !{!"llvm.loop.vectorize.enable", i1 true}<br>
-!14 = !{i32 5, i32 5, !15, null}<br>
+!14 = !MDLocation(line: 5, column: 5, scope: !15)<br>
!15 = !{!"0xb\004\0036\000", !1, !11} ; [ DW_TAG_lexical_block ]<br>
-!16 = !{i32 9, i32 8, !17, null}<br>
+!16 = !MDLocation(line: 9, column: 8, scope: !17)<br>
!17 = !{!"0xb\009\003\000", !1, !4} ; [ DW_TAG_lexical_block ]<br>
!18 = !{!18, !13, !19}<br>
!19 = !{!"llvm.loop.vectorize.width", i32 1}<br>
-!20 = !{i32 10, i32 5, !21, null}<br>
+!20 = !MDLocation(line: 10, column: 5, scope: !21)<br>
!21 = !{!"0xb\009\0036\000", !1, !17} ; [ DW_TAG_lexical_block ]<br>
!22 = !{!23, !23, i64 0}<br>
!23 = !{!"int", !24, i64 0}<br>
!24 = !{!"omnipotent char", !25, i64 0}<br>
!25 = !{!"Simple C/C++ TBAA"}<br>
-!26 = !{i32 12, i32 1, !4, null}<br>
+!26 = !MDLocation(line: 12, column: 1, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopVectorize/no_switch.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/no_switch.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/no_switch.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopVectorize/no_switch.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopVectorize/no_switch.ll Wed Jan 14 16:27:36 2015<br>
@@ -69,18 +69,18 @@ attributes #0 = { nounwind }<br>
!7 = !{i32 2, !"Dwarf Version", i32 2}<br>
!8 = !{i32 2, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.5.0"}<br>
-!10 = !{i32 3, i32 8, !11, null}<br>
+!10 = !MDLocation(line: 3, column: 8, scope: !11)<br>
!11 = !{!"0xb\003\003\000", !1, !4} ; [ DW_TAG_lexical_block ]<br>
!12 = !{!12, !13, !13}<br>
!13 = !{!"llvm.loop.vectorize.enable", i1 true}<br>
-!14 = !{i32 4, i32 5, !15, null}<br>
+!14 = !MDLocation(line: 4, column: 5, scope: !15)<br>
!15 = !{!"0xb\003\0036\000", !1, !11} ; [ DW_TAG_lexical_block ]<br>
!16 = !{!17, !17, i64 0}<br>
!17 = !{!"int", !18, i64 0}<br>
!18 = !{!"omnipotent char", !19, i64 0}<br>
!19 = !{!"Simple C/C++ TBAA"}<br>
-!20 = !{i32 6, i32 7, !21, null}<br>
+!20 = !MDLocation(line: 6, column: 7, scope: !21)<br>
!21 = !{!"0xb\004\0018\000", !1, !15} ; [ DW_TAG_lexical_block ]<br>
-!22 = !{i32 7, i32 5, !21, null}<br>
-!23 = !{i32 9, i32 7, !21, null}<br>
-!24 = !{i32 14, i32 1, !4, null}<br>
+!22 = !MDLocation(line: 7, column: 5, scope: !21)<br>
+!23 = !MDLocation(line: 9, column: 7, scope: !21)<br>
+!24 = !MDLocation(line: 14, column: 1, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo.ll (original)<br>
+++ llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo.ll Wed Jan 14 16:27:36 2015<br>
@@ -43,9 +43,9 @@ declare void @llvm.dbg.declare(metadata,<br>
!5 = !{!6, !7, !6}<br>
!6 = !{!"0x24\00double\000\0064\0064\000\000\004", !12, !2} ; [ DW_TAG_base_type ]<br>
!7 = !{!"0x24\00int\000\0032\0032\000\000\005", !12, !2} ; [ DW_TAG_base_type ]<br>
-!8 = !{i32 2, i32 0, !1, null}<br>
+!8 = !MDLocation(line: 2, scope: !1)<br>
!9 = !{!"0x101\00j\002\000", !1, !2, !6} ; [ DW_TAG_arg_variable ]<br>
-!10 = !{i32 3, i32 0, !11, null}<br>
+!10 = !MDLocation(line: 3, scope: !11)<br>
!11 = !{!"0xb\002\000\000", !12, !1} ; [ DW_TAG_lexical_block ]<br>
!12 = !{!"testfunc.c", !"/tmp"}<br>
!13 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll (original)<br>
+++ llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll Wed Jan 14 16:27:36 2015<br>
@@ -39,19 +39,19 @@ return:<br>
!4 = !{!"0x15\00\000\000\000\000\000\000", !20, !2, null, !5, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!5 = !{null, !6}<br>
!6 = !{!"0x24\00int\000\0032\0032\000\000\005", !20, !2} ; [ DW_TAG_base_type ]<br>
-!7 = !{i32 8, i32 0, !1, null}<br>
-!8 = !{i32 9, i32 0, !1, null}<br>
+!7 = !MDLocation(line: 8, scope: !1)<br>
+!8 = !MDLocation(line: 9, scope: !1)<br>
!9 = !{!"0x101\00x\004\000", !10, !2, !6} ; [ DW_TAG_arg_variable ]<br>
!10 = !{!"0x2e\00bar\00bar\00bar\004\001\001\000\006\000\000\004", !20, !2, !11, null, null, null, null, null} ; [ DW_TAG_subprogram ]<br>
!11 = !{!"0x15\00\000\000\000\000\000\000", !20, !2, null, !12, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!12 = !{null, !6, !13, !14}<br>
!13 = !{!"0x24\00long int\000\0064\0064\000\000\005", !20, !2} ; [ DW_TAG_base_type ]<br>
!14 = !{!"0xf\00\000\0064\0064\000\000", !20, !2, null} ; [ DW_TAG_pointer_type ]<br>
-!15 = !{i32 4, i32 0, !10, !8}<br>
+!15 = !MDLocation(line: 4, scope: !10, inlinedAt: !8)<br>
!16 = !{!"0x101\00y\004\000", !10, !2, !13} ; [ DW_TAG_arg_variable ]<br>
!17 = !{!"0x101\00z\004\000", !10, !2, !14} ; [ DW_TAG_arg_variable ]<br>
-!18 = !{i32 5, i32 0, !10, !8}<br>
-!19 = !{i32 10, i32 0, !1, null}<br>
+!18 = !MDLocation(line: 5, scope: !10, inlinedAt: !8)<br>
+!19 = !MDLocation(line: 10, scope: !1)<br>
!20 = !{!"bar.c", !"/tmp/"}<br>
!21 = !{i32 0}<br>
!22 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/ObjCARC/ensure-that-exception-unwind-path-is-visited.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ObjCARC/ensure-that-exception-unwind-path-is-visited.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ObjCARC/ensure-that-exception-unwind-path-is-visited.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/ObjCARC/ensure-that-exception-unwind-path-is-visited.ll (original)<br>
+++ llvm/trunk/test/Transforms/ObjCARC/ensure-that-exception-unwind-path-is-visited.ll Wed Jan 14 16:27:36 2015<br>
@@ -148,27 +148,27 @@ declare void @llvm.dbg.value(metadata, i<br>
!34 = !{i32 1, !"Objective-C Image Info Version", i32 0}<br>
!35 = !{i32 1, !"Objective-C Image Info Section", !"__DATA, __objc_imageinfo, regular, no_dead_strip"}<br>
!36 = !{i32 4, !"Objective-C Garbage Collection", i32 0}<br>
-!37 = !{i32 11, i32 0, !13, null}<br>
+!37 = !MDLocation(line: 11, scope: !13)<br>
!38 = !{}<br>
-!39 = !{i32 15, i32 0, !26, null}<br>
-!40 = !{i32 17, i32 0, !41, null}<br>
+!39 = !MDLocation(line: 15, scope: !26)<br>
+!40 = !MDLocation(line: 17, scope: !41)<br>
!41 = !{!"0xb\0016\000\003", !60, !26} ; [ DW_TAG_lexical_block ] [/Volumes/Files/gottesmmcab/Radar/12906997/test.m]<br>
-!42 = !{i32 22, i32 0, !26, null}<br>
-!43 = !{i32 23, i32 0, !22, null}<br>
-!44 = !{i32 19, i32 0, !41, null}<br>
+!42 = !MDLocation(line: 22, scope: !26)<br>
+!43 = !MDLocation(line: 23, scope: !22)<br>
+!44 = !MDLocation(line: 19, scope: !41)<br>
!45 = !{i8 0}<br>
-!46 = !{i32 20, i32 0, !47, null}<br>
+!46 = !MDLocation(line: 20, scope: !47)<br>
!47 = !{!"0xb\0019\000\005", !60, !48} ; [ DW_TAG_lexical_block ] [/Volumes/Files/gottesmmcab/Radar/12906997/test.m]<br>
!48 = !{!"0xb\0019\000\004", !60, !26} ; [ DW_TAG_lexical_block ] [/Volumes/Files/gottesmmcab/Radar/12906997/test.m]<br>
-!49 = !{i32 21, i32 0, !47, null}<br>
-!50 = !{i32 24, i32 0, !51, null}<br>
+!49 = !MDLocation(line: 21, scope: !47)<br>
+!50 = !MDLocation(line: 24, scope: !51)<br>
!51 = !{!"0xb\0023\000\006", !60, !22} ; [ DW_TAG_lexical_block ] [/Volumes/Files/gottesmmcab/Radar/12906997/test.m]<br>
-!52 = !{i32 25, i32 0, !51, null}<br>
-!53 = !{i32 27, i32 0, !13, null}<br>
-!54 = !{i32 28, i32 0, !13, null}<br>
-!55 = !{i32 4, i32 0, !27, null}<br>
-!56 = !{i32 6, i32 0, !57, null}<br>
+!52 = !MDLocation(line: 25, scope: !51)<br>
+!53 = !MDLocation(line: 27, scope: !13)<br>
+!54 = !MDLocation(line: 28, scope: !13)<br>
+!55 = !MDLocation(line: 4, scope: !27)<br>
+!56 = !MDLocation(line: 6, scope: !57)<br>
!57 = !{!"0xb\005\000\007", !60, !27} ; [ DW_TAG_lexical_block ] [/Volumes/Files/gottesmmcab/Radar/12906997/test.m]<br>
-!58 = !{i32 7, i32 0, !57, null}<br>
+!58 = !MDLocation(line: 7, scope: !57)<br>
!60 = !{!"test.m", !"/Volumes/Files/gottesmmcab/Radar/12906997"}<br>
!61 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/SLPVectorizer/X86/debug_info.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SLPVectorizer/X86/debug_info.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SLPVectorizer/X86/debug_info.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/SLPVectorizer/X86/debug_info.ll (original)<br>
+++ llvm/trunk/test/Transforms/SLPVectorizer/X86/debug_info.ll Wed Jan 14 16:27:36 2015<br>
@@ -18,8 +18,8 @@ target triple = "x86_64-apple-macosx10.7<br>
;CHECK: load <2 x double>* {{.*}}, !dbg ![[LOC]]<br>
;CHECK: store <2 x double> {{.*}}, !dbg ![[LOC2:[0-9]+]]<br>
;CHECK: ret<br>
-;CHECK: ![[LOC]] = !{i32 4, i32 0,<br>
-;CHECK: ![[LOC2]] = !{i32 7, i32 0,<br>
+;CHECK: ![[LOC]] = !MDLocation(line: 4, scope:<br>
+;CHECK: ![[LOC2]] = !MDLocation(line: 7, scope:<br>
<br>
define i32 @depth(double* nocapture %A, i32 %m) #0 {<br>
entry:<br>
@@ -76,14 +76,14 @@ attributes #1 = { nounwind readnone }<br>
!16 = !{!"0x100\00i\003\000", !17, !5, !8} ; [ DW_TAG_auto_variable ] [i] [line 3]<br>
!17 = !{!"0xb\003\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/Users/nadav/file.c]<br>
!18 = !{i32 2, !"Dwarf Version", i32 2}<br>
-!19 = !{i32 1, i32 0, !4, null}<br>
+!19 = !MDLocation(line: 1, scope: !4)<br>
!20 = !{double 0.000000e+00}<br>
-!21 = !{i32 2, i32 0, !4, null}<br>
+!21 = !MDLocation(line: 2, scope: !4)<br>
!22 = !{double 1.000000e+00}<br>
-!23 = !{i32 3, i32 0, !17, null}<br>
-!24 = !{i32 4, i32 0, !25, null}<br>
+!23 = !MDLocation(line: 3, scope: !17)<br>
+!24 = !MDLocation(line: 4, scope: !25)<br>
!25 = !{!"0xb\003\000\001", !1, !17} ; [ DW_TAG_lexical_block ] [/Users/nadav/file.c]<br>
-!29 = !{i32 5, i32 0, !25, null}<br>
-!30 = !{i32 7, i32 0, !4, null}<br>
-!31 = !{i32 8, i32 0, !4, null}<br>
+!29 = !MDLocation(line: 5, scope: !25)<br>
+!30 = !MDLocation(line: 7, scope: !4)<br>
+!31 = !MDLocation(line: 8, scope: !4)<br>
!32 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/SampleProfile/branch.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/branch.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/branch.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/SampleProfile/branch.ll (original)<br>
+++ llvm/trunk/test/Transforms/SampleProfile/branch.ll Wed Jan 14 16:27:36 2015<br>
@@ -125,19 +125,19 @@ attributes #4 = { nounwind readonly }<br>
!24 = !{!"0xb\0011\000\000", !1, !22} ; [ DW_TAG_lexical_block ] [./branch.cc]<br>
!25 = !{i32 2, !"Dwarf Version", i32 4}<br>
!26 = !{!"clang version 3.4 (trunk 192896) (llvm/trunk 192895)"}<br>
-!27 = !{i32 4, i32 0, !4, null}<br>
-!28 = !{i32 5, i32 0, !29, null}<br>
+!27 = !MDLocation(line: 4, scope: !4)<br>
+!28 = !MDLocation(line: 5, scope: !29)<br>
!29 = !{!"0xb\005\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [./branch.cc]<br>
-!30 = !{i32 8, i32 0, !4, null}<br>
+!30 = !MDLocation(line: 8, scope: !4)<br>
!31 = !{!32, !32, i64 0}<br>
!32 = !{!"any pointer", !33, i64 0}<br>
!33 = !{!"omnipotent char", !34, i64 0}<br>
!34 = !{!"Simple C/C++ TBAA"}<br>
-!35 = !{i32 9, i32 0, !20, null}<br>
-!36 = !{i32 13, i32 0, !24, null}<br>
-!37 = !{i32 14, i32 0, !24, null}<br>
-!38 = !{i32 11, i32 0, !22, null}<br>
-!39 = !{i32 20, i32 0, !4, null}<br>
-!40 = !{i32 21, i32 0, !4, null}<br>
-!41 = !{i32 22, i32 0, !4, null}<br>
+!35 = !MDLocation(line: 9, scope: !20)<br>
+!36 = !MDLocation(line: 13, scope: !24)<br>
+!37 = !MDLocation(line: 14, scope: !24)<br>
+!38 = !MDLocation(line: 11, scope: !22)<br>
+!39 = !MDLocation(line: 20, scope: !4)<br>
+!40 = !MDLocation(line: 21, scope: !4)<br>
+!41 = !MDLocation(line: 22, scope: !4)<br>
!42 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/SampleProfile/calls.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/calls.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/calls.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/SampleProfile/calls.ll (original)<br>
+++ llvm/trunk/test/Transforms/SampleProfile/calls.ll Wed Jan 14 16:27:36 2015<br>
@@ -103,18 +103,18 @@ declare i32 @printf(i8*, ...) #2<br>
!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
!9 = !{i32 1, !"Debug Info Version", i32 2}<br>
!10 = !{!"clang version 3.5 "}<br>
-!11 = !{i32 4, i32 0, !4, null}<br>
-!12 = !{i32 8, i32 0, !7, null}<br>
-!13 = !{i32 9, i32 0, !7, null}<br>
-!14 = !{i32 9, i32 0, !15, null}<br>
+!11 = !MDLocation(line: 4, scope: !4)<br>
+!12 = !MDLocation(line: 8, scope: !7)<br>
+!13 = !MDLocation(line: 9, scope: !7)<br>
+!14 = !MDLocation(line: 9, scope: !15)<br>
!15 = !{!"0xb\001", !1, !7} ; [ DW_TAG_lexical_block ] [./calls.cc]<br>
-!16 = !{i32 10, i32 0, !17, null}<br>
+!16 = !MDLocation(line: 10, scope: !17)<br>
!17 = !{!"0xb\0010\000\000", !1, !7} ; [ DW_TAG_lexical_block ] [./calls.cc]<br>
-!18 = !{i32 10, i32 0, !19, null}<br>
+!18 = !MDLocation(line: 10, scope: !19)<br>
!19 = !{!"0xb\001", !1, !17} ; [ DW_TAG_lexical_block ] [./calls.cc]<br>
-!20 = !{i32 10, i32 0, !21, null}<br>
+!20 = !MDLocation(line: 10, scope: !21)<br>
!21 = !{!"0xb\002", !1, !17} ; [ DW_TAG_lexical_block ] [./calls.cc]<br>
-!22 = !{i32 10, i32 0, !23, null}<br>
+!22 = !MDLocation(line: 10, scope: !23)<br>
!23 = !{!"0xb\003", !1, !17} ; [ DW_TAG_lexical_block ] [./calls.cc]<br>
-!24 = !{i32 11, i32 0, !7, null}<br>
-!25 = !{i32 12, i32 0, !7, null}<br>
+!24 = !MDLocation(line: 11, scope: !7)<br>
+!25 = !MDLocation(line: 12, scope: !7)<br>
<br>
Modified: llvm/trunk/test/Transforms/SampleProfile/discriminator.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/discriminator.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/discriminator.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/SampleProfile/discriminator.ll (original)<br>
+++ llvm/trunk/test/Transforms/SampleProfile/discriminator.ll Wed Jan 14 16:27:36 2015<br>
@@ -76,15 +76,15 @@ while.end:<br>
!7 = !{i32 2, !"Dwarf Version", i32 4}<br>
!8 = !{i32 1, !"Debug Info Version", i32 2}<br>
!9 = !{!"clang version 3.5 "}<br>
-!10 = !{i32 2, i32 0, !4, null}<br>
-!11 = !{i32 3, i32 0, !4, null}<br>
-!12 = !{i32 3, i32 0, !13, null}<br>
+!10 = !MDLocation(line: 2, scope: !4)<br>
+!11 = !MDLocation(line: 3, scope: !4)<br>
+!12 = !MDLocation(line: 3, scope: !13)<br>
!13 = !{!"0xb\001", !1, !4} ; [ DW_TAG_lexical_block ] [discriminator.c]<br>
-!14 = !{i32 4, i32 0, !15, null}<br>
+!14 = !MDLocation(line: 4, scope: !15)<br>
!15 = !{!"0xb\004\000\001", !1, !16} ; [ DW_TAG_lexical_block ] [discriminator.c]<br>
!16 = !{!"0xb\003\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [discriminator.c]<br>
-!17 = !{i32 4, i32 0, !18, null}<br>
+!17 = !MDLocation(line: 4, scope: !18)<br>
!18 = !{!"0xb\001", !1, !15} ; [ DW_TAG_lexical_block ] [discriminator.c]<br>
-!19 = !{i32 5, i32 0, !16, null}<br>
-!20 = !{i32 6, i32 0, !16, null}<br>
-!21 = !{i32 7, i32 0, !4, null}<br>
+!19 = !MDLocation(line: 5, scope: !16)<br>
+!20 = !MDLocation(line: 6, scope: !16)<br>
+!21 = !MDLocation(line: 7, scope: !4)<br>
<br>
Modified: llvm/trunk/test/Transforms/SampleProfile/fnptr.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/fnptr.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/fnptr.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/SampleProfile/fnptr.ll (original)<br>
+++ llvm/trunk/test/Transforms/SampleProfile/fnptr.ll Wed Jan 14 16:27:36 2015<br>
@@ -129,27 +129,27 @@ declare i32 @printf(i8* nocapture readon<br>
<br>
!0 = !{i32 2, !"Debug Info Version", i32 2}<br>
!1 = !{!"clang version 3.6.0 "}<br>
-!2 = !{i32 9, i32 3, !3, null}<br>
+!2 = !MDLocation(line: 9, column: 3, scope: !3)<br>
!3 = !{!"0x2e\00foo\00foo\00\008\000\001\000\000\00256\001\008", !4, !5, !6, null, double (i32)* @_Z3fooi, null, null, !7} ; [ DW_TAG_subprogram ] [line 8] [def] [foo]<br>
!4 = !{!"fnptr.cc", !"."}<br>
!5 = !{!"0x29", !4} ; [ DW_TAG_file_type ] [./fnptr.cc]<br>
!6 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !7, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!7 = !{}<br>
-!8 = !{i32 9, i32 14, !3, null}<br>
-!9 = !{i32 13, i32 3, !10, null}<br>
+!8 = !MDLocation(line: 9, column: 14, scope: !3)<br>
+!9 = !MDLocation(line: 13, column: 3, scope: !10)<br>
!10 = !{!"0x2e\00bar\00bar\00\0012\000\001\000\000\00256\001\0012", !4, !5, !6, null, double (i32)* @_Z3bari, null, null, !7} ; [ DW_TAG_subprogram ] [line 12] [def] [bar]<br>
-!11 = !{i32 13, i32 14, !10, null}<br>
-!12 = !{i32 19, i32 3, !13, null}<br>
+!11 = !MDLocation(line: 13, column: 14, scope: !10)<br>
+!12 = !MDLocation(line: 19, column: 3, scope: !13)<br>
!13 = !{!"0x2e\00main\00main\00\0016\000\001\000\000\00256\001\0016", !4, !5, !6, null, i32 ()* @main, null, null, !7} ; [ DW_TAG_subprogram ] [line 16] [def] [main]<br>
-!14 = !{i32 20, i32 5, !13, null}<br>
-!15 = !{i32 21, i32 15, !13, null}<br>
-!16 = !{i32 22, i32 11, !13, null}<br>
+!14 = !MDLocation(line: 20, column: 5, scope: !13)<br>
+!15 = !MDLocation(line: 21, column: 15, scope: !13)<br>
+!16 = !MDLocation(line: 22, column: 11, scope: !13)<br>
!17 = !{!"branch_weights", i32 534, i32 2064}<br>
-!18 = !{i32 23, i32 14, !13, null}<br>
-!19 = !{i32 25, i32 14, !13, null}<br>
-!20 = !{i32 20, i32 28, !13, null}<br>
+!18 = !MDLocation(line: 23, column: 14, scope: !13)<br>
+!19 = !MDLocation(line: 25, column: 14, scope: !13)<br>
+!20 = !MDLocation(line: 20, column: 28, scope: !13)<br>
!21 = !{!"branch_weights", i32 0, i32 1075}<br>
-!22 = !{i32 19, i32 26, !13, null}<br>
+!22 = !MDLocation(line: 19, column: 26, scope: !13)<br>
!23 = !{!"branch_weights", i32 0, i32 534}<br>
-!24 = !{i32 27, i32 3, !13, null}<br>
-!25 = !{i32 28, i32 3, !13, null}<br>
+!24 = !MDLocation(line: 27, column: 3, scope: !13)<br>
+!25 = !MDLocation(line: 28, column: 3, scope: !13)<br>
<br>
Modified: llvm/trunk/test/Transforms/SampleProfile/propagate.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/propagate.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/propagate.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/SampleProfile/propagate.ll (original)<br>
+++ llvm/trunk/test/Transforms/SampleProfile/propagate.ll Wed Jan 14 16:27:36 2015<br>
@@ -209,35 +209,35 @@ attributes #2 = { "less-precise-fpmad"="<br>
!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
!9 = !{i32 1, !"Debug Info Version", i32 2}<br>
!10 = !{!"clang version 3.5 "}<br>
-!11 = !{i32 4, i32 0, !12, null}<br>
+!11 = !MDLocation(line: 4, scope: !12)<br>
!12 = !{!"0xb\004\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
-!13 = !{i32 5, i32 0, !14, null}<br>
+!13 = !MDLocation(line: 5, scope: !14)<br>
!14 = !{!"0xb\004\000\000", !1, !12} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
-!15 = !{i32 7, i32 0, !16, null}<br>
+!15 = !MDLocation(line: 7, scope: !16)<br>
!16 = !{!"0xb\007\000\000", !1, !17} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
!17 = !{!"0xb\006\000\000", !1, !12} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
-!18 = !{i32 8, i32 0, !19, null}<br>
+!18 = !MDLocation(line: 8, scope: !19)<br>
!19 = !{!"0xb\008\000\000", !1, !20} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
!20 = !{!"0xb\007\000\000", !1, !16} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
-!21 = !{i32 9, i32 0, !19, null}<br>
-!22 = !{i32 10, i32 0, !23, null}<br>
+!21 = !MDLocation(line: 9, scope: !19)<br>
+!22 = !MDLocation(line: 10, scope: !23)<br>
!23 = !{!"0xb\0010\000\000", !1, !20} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
-!24 = !{i32 11, i32 0, !25, null}<br>
+!24 = !MDLocation(line: 11, scope: !25)<br>
!25 = !{!"0xb\0010\000\000", !1, !23} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
-!26 = !{i32 12, i32 0, !25, null}<br>
-!27 = !{i32 13, i32 0, !25, null}<br>
-!28 = !{i32 14, i32 0, !29, null}<br>
+!26 = !MDLocation(line: 12, scope: !25)<br>
+!27 = !MDLocation(line: 13, scope: !25)<br>
+!28 = !MDLocation(line: 14, scope: !29)<br>
!29 = !{!"0xb\0014\000\000", !1, !30} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
!30 = !{!"0xb\0013\000\000", !1, !23} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
-!31 = !{i32 15, i32 0, !32, null}<br>
+!31 = !MDLocation(line: 15, scope: !32)<br>
!32 = !{!"0xb\0014\000\000", !1, !29} ; [ DW_TAG_lexical_block ] [propagate.cc]<br>
-!33 = !{i32 16, i32 0, !32, null}<br>
-!34 = !{i32 17, i32 0, !32, null}<br>
-!35 = !{i32 19, i32 0, !20, null}<br>
-!36 = !{i32 21, i32 0, !4, null}<br>
-!37 = !{i32 22, i32 0, !4, null}<br>
-!38 = !{i32 25, i32 0, !7, null}<br>
-!39 = !{i32 26, i32 0, !7, null}<br>
-!40 = !{i32 27, i32 0, !7, null}<br>
-!41 = !{i32 28, i32 0, !7, null}<br>
-!42 = !{i32 29, i32 0, !7, null}<br>
+!33 = !MDLocation(line: 16, scope: !32)<br>
+!34 = !MDLocation(line: 17, scope: !32)<br>
+!35 = !MDLocation(line: 19, scope: !20)<br>
+!36 = !MDLocation(line: 21, scope: !4)<br>
+!37 = !MDLocation(line: 22, scope: !4)<br>
+!38 = !MDLocation(line: 25, scope: !7)<br>
+!39 = !MDLocation(line: 26, scope: !7)<br>
+!40 = !MDLocation(line: 27, scope: !7)<br>
+!41 = !MDLocation(line: 28, scope: !7)<br>
+!42 = !MDLocation(line: 29, scope: !7)<br>
<br>
Modified: llvm/trunk/test/Transforms/ScalarRepl/debuginfo-preserved.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/debuginfo-preserved.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/debuginfo-preserved.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/ScalarRepl/debuginfo-preserved.ll (original)<br>
+++ llvm/trunk/test/Transforms/ScalarRepl/debuginfo-preserved.ll Wed Jan 14 16:27:36 2015<br>
@@ -49,16 +49,16 @@ declare void @llvm.dbg.declare(metadata,<br>
!4 = !{!5}<br>
!5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ]<br>
!6 = !{!"0x101\00a\0016777217\000", !1, !2, !5} ; [ DW_TAG_arg_variable ]<br>
-!7 = !{i32 1, i32 11, !1, null}<br>
+!7 = !MDLocation(line: 1, column: 11, scope: !1)<br>
!8 = !{!"0x101\00b\0033554433\000", !1, !2, !5} ; [ DW_TAG_arg_variable ]<br>
-!9 = !{i32 1, i32 18, !1, null}<br>
+!9 = !MDLocation(line: 1, column: 18, scope: !1)<br>
!10 = !{!"0x100\00c\002\000", !11, !2, !5} ; [ DW_TAG_auto_variable ]<br>
!11 = !{!"0xb\001\0021\000", !18, !1} ; [ DW_TAG_lexical_block ]<br>
-!12 = !{i32 2, i32 9, !11, null}<br>
-!13 = !{i32 2, i32 14, !11, null}<br>
-!14 = !{i32 3, i32 5, !11, null}<br>
-!15 = !{i32 4, i32 5, !11, null}<br>
-!16 = !{i32 5, i32 5, !11, null}<br>
+!12 = !MDLocation(line: 2, column: 9, scope: !11)<br>
+!13 = !MDLocation(line: 2, column: 14, scope: !11)<br>
+!14 = !MDLocation(line: 3, column: 5, scope: !11)<br>
+!15 = !MDLocation(line: 4, column: 5, scope: !11)<br>
+!16 = !MDLocation(line: 5, column: 5, scope: !11)<br>
!17 = !{!1}<br>
!18 = !{!"/d/j/debug-test.c", !"/Volumes/Data/b"}<br>
!19 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/Transforms/Scalarizer/dbginfo.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Scalarizer/dbginfo.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Scalarizer/dbginfo.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/Scalarizer/dbginfo.ll (original)<br>
+++ llvm/trunk/test/Transforms/Scalarizer/dbginfo.ll Wed Jan 14 16:27:36 2015<br>
@@ -77,10 +77,10 @@ attributes #1 = { nounwind readnone }<br>
!17 = !{!"0x101\00c\0050331651\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [c] [line 3]<br>
!18 = !{i32 2, !"Dwarf Version", i32 4}<br>
!19 = !{!"clang version 3.4 (trunk 194134) (llvm/trunk 194126)"}<br>
-!20 = !{i32 3, i32 0, !4, null}<br>
-!21 = !{i32 5, i32 0, !4, null}<br>
+!20 = !MDLocation(line: 3, scope: !4)<br>
+!21 = !MDLocation(line: 5, scope: !4)<br>
!22 = !{!23, !23, i64 0}<br>
!23 = !{!"omnipotent char", !24, i64 0}<br>
!24 = !{!"Simple C/C++ TBAA"}<br>
-!25 = !{i32 6, i32 0, !4, null}<br>
+!25 = !MDLocation(line: 6, scope: !4)<br>
!26 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/SimplifyCFG/branch-fold-dbg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/branch-fold-dbg.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/branch-fold-dbg.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/SimplifyCFG/branch-fold-dbg.ll (original)<br>
+++ llvm/trunk/test/Transforms/SimplifyCFG/branch-fold-dbg.ll Wed Jan 14 16:27:36 2015<br>
@@ -46,14 +46,14 @@ declare void @llvm.dbg.value(metadata, i<br>
!2 = !{!"0x11\0012\00clang (trunk 129006)\001\00\000\00\000", !15, !4, !4, null, null, null} ; [ DW_TAG_compile_unit ]<br>
!3 = !{!"0x15\00\000\000\000\000\000\000", !15, !1, null, !4, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!4 = !{null}<br>
-!5 = !{i32 131, i32 2, !0, null}<br>
-!6 = !{i32 134, i32 2, !0, null}<br>
+!5 = !MDLocation(line: 131, column: 2, scope: !0)<br>
+!6 = !MDLocation(line: 134, column: 2, scope: !0)<br>
!7 = !{!"0x100\00bar\00232\000", !8, !1, !9} ; [ DW_TAG_auto_variable ]<br>
!8 = !{!"0xb\00231\001\003", !15, !0} ; [ DW_TAG_lexical_block ]<br>
!9 = !{!"0xf\00\000\0032\0032\000\000", null, !2, !10} ; [ DW_TAG_pointer_type ]<br>
!10 = !{!"0x26\00\000\000\000\000\000", null, !2, !11} ; [ DW_TAG_const_type ]<br>
!11 = !{!"0x24\00unsigned int\000\0032\0032\000\000\007", null, !2} ; [ DW_TAG_base_type ]<br>
-!12 = !{i32 232, i32 40, !8, null}<br>
-!13 = !{i32 234, i32 2, !8, null}<br>
-!14 = !{i32 274, i32 1, !8, null}<br>
+!12 = !MDLocation(line: 232, column: 40, scope: !8)<br>
+!13 = !MDLocation(line: 234, column: 2, scope: !8)<br>
+!14 = !MDLocation(line: 274, column: 1, scope: !8)<br>
!15 = !{!"a.c", !"/private/tmp"}<br>
<br>
Modified: llvm/trunk/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll (original)<br>
+++ llvm/trunk/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll Wed Jan 14 16:27:36 2015<br>
@@ -39,18 +39,18 @@ declare void @llvm.dbg.value(metadata, i<br>
!4 = !{!5}<br>
!5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !2} ; [ DW_TAG_base_type ]<br>
!6 = !{!"0x101\00i\0016777218\000", !0, !1, !5} ; [ DW_TAG_arg_variable ]<br>
-!7 = !{i32 2, i32 13, !0, null}<br>
+!7 = !MDLocation(line: 2, column: 13, scope: !0)<br>
!8 = !{i32 0}<br>
!9 = !{!"0x100\00k\003\000", !10, !1, !5} ; [ DW_TAG_auto_variable ]<br>
!10 = !{!"0xb\002\0016\000", !20, !0} ; [ DW_TAG_lexical_block ]<br>
-!11 = !{i32 3, i32 12, !10, null}<br>
-!12 = !{i32 4, i32 3, !10, null}<br>
-!13 = !{i32 5, i32 5, !14, null}<br>
+!11 = !MDLocation(line: 3, column: 12, scope: !10)<br>
+!12 = !MDLocation(line: 4, column: 3, scope: !10)<br>
+!13 = !MDLocation(line: 5, column: 5, scope: !14)<br>
!14 = !{!"0xb\004\0010\001", !20, !10} ; [ DW_TAG_lexical_block ]<br>
-!15 = !{i32 6, i32 3, !14, null}<br>
-!16 = !{i32 7, i32 5, !17, null}<br>
+!15 = !MDLocation(line: 6, column: 3, scope: !14)<br>
+!16 = !MDLocation(line: 7, column: 5, scope: !17)<br>
!17 = !{!"0xb\006\0010\002", !20, !10} ; [ DW_TAG_lexical_block ]<br>
-!18 = !{i32 8, i32 3, !17, null}<br>
-!19 = !{i32 9, i32 3, !10, null}<br>
+!18 = !MDLocation(line: 8, column: 3, scope: !17)<br>
+!19 = !MDLocation(line: 9, column: 3, scope: !10)<br>
!20 = !{!"b.c", !"/private/tmp"}<br>
!21 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/SimplifyCFG/trap-debugloc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/trap-debugloc.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/trap-debugloc.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/SimplifyCFG/trap-debugloc.ll (original)<br>
+++ llvm/trunk/test/Transforms/SimplifyCFG/trap-debugloc.ll Wed Jan 14 16:27:36 2015<br>
@@ -16,9 +16,9 @@ define void @foo() nounwind ssp {<br>
!2 = !{!"0x11\0012\00Apple clang version 3.0 (tags/Apple/clang-206.1) (based on LLVM 3.0svn)\001\00\000\00\000", !8, !4, !4, !9, null, null} ; [ DW_TAG_compile_unit ]<br>
!3 = !{!"0x15\00\000\000\000\000\000\000", !8, !1, null, !4, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!4 = !{null}<br>
-!5 = !{i32 4, i32 2, !6, null}<br>
+!5 = !MDLocation(line: 4, column: 2, scope: !6)<br>
!6 = !{!"0xb\003\0012\000", !8, !0} ; [ DW_TAG_lexical_block ]<br>
-!7 = !{i32 5, i32 1, !6, null}<br>
+!7 = !MDLocation(line: 5, column: 1, scope: !6)<br>
!8 = !{!"foo.c", !"/private/tmp"}<br>
!9 = !{!0}<br>
!10 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/StripSymbols/2010-06-30-StripDebug.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/StripSymbols/2010-06-30-StripDebug.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/StripSymbols/2010-06-30-StripDebug.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/StripSymbols/2010-06-30-StripDebug.ll (original)<br>
+++ llvm/trunk/test/Transforms/StripSymbols/2010-06-30-StripDebug.ll Wed Jan 14 16:27:36 2015<br>
@@ -28,7 +28,7 @@ declare void @llvm.dbg.value(metadata, i<br>
!7 = !{!"0x24\00int\000\0032\0032\000\000\005", !12, !1} ; [ DW_TAG_base_type ]<br>
!8 = !{!"0x34\00x\00x\00\001\000\001", !1, !1, !7, i32* @x} ; [ DW_TAG_variable ]<br>
!9 = !{i32 0}<br>
-!10 = !{i32 3, i32 0, !6, null}<br>
-!11 = !{i32 4, i32 0, !6, null}<br>
+!10 = !MDLocation(line: 3, scope: !6)<br>
+!11 = !MDLocation(line: 4, scope: !6)<br>
!12 = !{!"b.c", !"/tmp"}<br>
!13 = !{i32 1, !"Debug Info Version", i32 2}<br>
<br>
Modified: llvm/trunk/test/Transforms/StripSymbols/2010-08-25-crash.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/StripSymbols/2010-08-25-crash.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/StripSymbols/2010-08-25-crash.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/StripSymbols/2010-08-25-crash.ll (original)<br>
+++ llvm/trunk/test/Transforms/StripSymbols/2010-08-25-crash.ll Wed Jan 14 16:27:36 2015<br>
@@ -15,7 +15,7 @@ entry:<br>
!5 = !{!"0x24\00int\000\0032\0032\000\000\005", !10, !1} ; [ DW_TAG_base_type ]<br>
!6 = !{!"0x34\00i\00i\00i\002\001\001", !1, !1, !7, i32 0, null} ; [ DW_TAG_variable ]<br>
!7 = !{!"0x26\00\000\000\000\000\000", !10, !1, !5} ; [ DW_TAG_const_type ]<br>
-!8 = !{i32 3, i32 13, !9, null}<br>
+!8 = !MDLocation(line: 3, column: 13, scope: !9)<br>
!9 = !{!"0xb\003\0011\000", !10, !0} ; [ DW_TAG_lexical_block ]<br>
!10 = !{!"/tmp/a.c", !"/Volumes/Lalgate/clean/D.CW"}<br>
!11 = !{i32 0}<br>
<br>
Modified: llvm/trunk/test/Transforms/StripSymbols/strip-dead-debug-info.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/StripSymbols/strip-dead-debug-info.ll?rev=226048&r1=226047&r2=226048&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/StripSymbols/strip-dead-debug-info.ll?rev=226048&r1=226047&r2=226048&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/StripSymbols/strip-dead-debug-info.ll (original)<br>
+++ llvm/trunk/test/Transforms/StripSymbols/strip-dead-debug-info.ll Wed Jan 14 16:27:36 2015<br>
@@ -48,10 +48,10 @@ attributes #2 = { nounwind readonly ssp<br>
!15 = !{!"0x101\00i\007\000", !10, !5, !9} ; [ DW_TAG_arg_variable ]<br>
!16 = !{!"0x34\00abcd\00abcd\00\002\001\001", !5, !5, !9, null, null} ; [ DW_TAG_variable ]<br>
!17 = !{!"0x34\00xyz\00xyz\00\003\000\001", !5, !5, !9, i32* @xyz, null} ; [ DW_TAG_variable ]<br>
-!18 = !{i32 6, i32 0, !19, null}<br>
+!18 = !MDLocation(line: 6, scope: !19)<br>
!19 = !{!"0xb\006\000\000", !1, !6} ; [ DW_TAG_lexical_block ] [/tmp//g.c]<br>
-!20 = !{i32 7, i32 0, !10, null}<br>
-!21 = !{i32 10, i32 0, !22, null}<br>
+!20 = !MDLocation(line: 7, scope: !10)<br>
+!21 = !MDLocation(line: 10, scope: !22)<br>
!22 = !{!"0xb\007\000\000", !1, !10} ; [ DW_TAG_lexical_block ] [/tmp//g.c]<br>
!23 = !{!3, !6, !10}<br>
!24 = !{!16, !17}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>