<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">Hey David<div><br></div><div>This commit is breaking the buildbot. Can you please take a look?</div><div><br></div><div><a href="http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-nobootstrap-RAincremental/builds/1573">http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-nobootstrap-RAincremental/builds/1573</a></div><div><br></div><div>Thanks,</div><div>Pete</div><div><div><div>On May 10, 2013, at 2:52 PM, David Blaikie <<a href="mailto:dblaikie@gmail.com">dblaikie@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">Author: dblaikie<br>Date: Fri May 10 16:52:07 2013<br>New Revision: 181632<br><br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project?rev=181632&view=rev">http://llvm.org/viewvc/llvm-project?rev=181632&view=rev</a><br>Log:<br>PR14492: Debug Info: Support for values of non-integer non-type template parameters.<br><br>This is only tested for global variables at the moment (& includes tests<br>for the unnamed parameter case, since apparently this entire function<br>was completely untested previously)<br><br>Added:<br> llvm/trunk/test/DebugInfo/template.ll<br>Modified:<br> llvm/trunk/include/llvm/DIBuilder.h<br> llvm/trunk/include/llvm/DebugInfo.h<br> llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br> llvm/trunk/lib/IR/DIBuilder.cpp<br> llvm/trunk/lib/IR/DebugInfo.cpp<br><br>Modified: llvm/trunk/include/llvm/DIBuilder.h<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DIBuilder.h?rev=181632&r1=181631&r2=181632&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DIBuilder.h?rev=181632&r1=181631&r2=181632&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/DIBuilder.h (original)<br>+++ llvm/trunk/include/llvm/DIBuilder.h Fri May 10 16:52:07 2013<br>@@ -332,10 +332,9 @@ namespace llvm {<br> /// @param LineNo Line number.<br> /// @param ColumnNo Column Number.<br> DITemplateValueParameter<br>- createTemplateValueParameter(DIDescriptor Scope, StringRef Name, DIType Ty,<br>- uint64_t Value,<br>- MDNode *File = 0, unsigned LineNo = 0,<br>- unsigned ColumnNo = 0);<br>+ createTemplateValueParameter(DIDescriptor Scope, StringRef Name,<br>+ DIType Ty, Value *Val, MDNode *File = 0,<br>+ unsigned LineNo = 0, unsigned ColumnNo = 0);<br><br> /// createArrayType - Create debugging information entry for an array.<br> /// @param Size Array size.<br><br>Modified: llvm/trunk/include/llvm/DebugInfo.h<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo.h?rev=181632&r1=181631&r2=181632&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo.h?rev=181632&r1=181631&r2=181632&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/DebugInfo.h (original)<br>+++ llvm/trunk/include/llvm/DebugInfo.h Fri May 10 16:52:07 2013<br>@@ -401,7 +401,7 @@ namespace llvm {<br> DIScope getContext() const { return getFieldAs<DIScope>(1); }<br> StringRef getName() const { return getStringField(2); }<br> DIType getType() const { return getFieldAs<DIType>(3); }<br>- uint64_t getValue() const { return getUInt64Field(4); }<br>+ Value *getValue() const;<br> StringRef getFilename() const {<br> return getFieldAs<DIFile>(5).getFilename();<br> }<br><br>Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=181632&r1=181631&r2=181632&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=181632&r1=181631&r2=181632&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)<br>+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Fri May 10 16:52:07 2013<br>@@ -588,6 +588,9 @@ static bool isTypeSigned(DIType Ty, int<br>/// addConstantValue - Add constant value entry in variable DIE.<br>bool CompileUnit::addConstantValue(DIE *Die, const MachineOperand &MO,<br> DIType Ty) {<br>+ // FIXME: This is a bit conservative/simple - it emits negative values at<br>+ // their maximum bit width which is a bit unfortunate (& doesn't prefer<br>+ // udata/sdata over dataN as suggested by the DWARF spec)<br> assert(MO.isImm() && "Invalid machine operand!");<br> DIEBlock *Block = new (DIEValueAllocator) DIEBlock();<br> int SizeInBits = -1;<br>@@ -1095,8 +1098,21 @@ CompileUnit::getOrCreateTemplateValuePar<br> addType(ParamDIE, TPV.getType());<br> if (!TPV.getName().empty())<br> addString(ParamDIE, dwarf::DW_AT_name, TPV.getName());<br>- addUInt(ParamDIE, dwarf::DW_AT_const_value, dwarf::DW_FORM_udata,<br>- TPV.getValue());<br>+ if (Value *Val = TPV.getValue()) {<br>+ if (ConstantInt *CI = dyn_cast<ConstantInt>(Val))<br>+ addConstantValue(ParamDIE, CI, TPV.getType().isUnsignedDIType());<br>+ else if (GlobalValue *GV = dyn_cast<GlobalValue>(Val)) {<br>+ // For declaration non-type template parameters (such as global values and<br>+ // functions)<br>+ DIEBlock *Block = new (DIEValueAllocator) DIEBlock();<br>+ addOpAddress(Block, Asm->Mang->getSymbol(GV));<br>+ // Emit DW_OP_stack_value to use the address as the immediate value of the<br>+ // parameter, rather than a pointer to it.<br>+ addUInt(Block, 0, dwarf::DW_FORM_data1, dwarf::DW_OP_stack_value);<br>+ addBlock(ParamDIE, dwarf::DW_AT_location, 0, Block);<br>+ }<br>+ }<br>+<br> return ParamDIE;<br>}<br><br><br>Modified: llvm/trunk/lib/IR/DIBuilder.cpp<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=181632&r1=181631&r2=181632&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=181632&r1=181631&r2=181632&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/IR/DIBuilder.cpp (original)<br>+++ llvm/trunk/lib/IR/DIBuilder.cpp Fri May 10 16:52:07 2013<br>@@ -502,7 +502,7 @@ DIBuilder::createTemplateTypeParameter(D<br>/// value parameter.<br>DITemplateValueParameter<br>DIBuilder::createTemplateValueParameter(DIDescriptor Context, StringRef Name,<br>- DIType Ty, uint64_t Val,<br>+ DIType Ty, Value *Val,<br> MDNode *File, unsigned LineNo,<br> unsigned ColumnNo) {<br> Value *Elts[] = {<br>@@ -510,7 +510,7 @@ DIBuilder::createTemplateValueParameter(<br> getNonCompileUnitScope(Context),<br> MDString::get(VMContext, Name),<br> Ty,<br>- ConstantInt::get(Type::getInt64Ty(VMContext), Val),<br>+ Val,<br> File,<br> ConstantInt::get(Type::getInt32Ty(VMContext), LineNo),<br> ConstantInt::get(Type::getInt32Ty(VMContext), ColumnNo)<br><br>Modified: llvm/trunk/lib/IR/DebugInfo.cpp<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=181632&r1=181631&r2=181632&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=181632&r1=181631&r2=181632&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/IR/DebugInfo.cpp (original)<br>+++ llvm/trunk/lib/IR/DebugInfo.cpp Fri May 10 16:52:07 2013<br>@@ -695,6 +695,10 @@ DIArray DISubprogram::getVariables() con<br> return DIArray();<br>}<br><br>+Value *DITemplateValueParameter::getValue() const {<br>+ return getField(DbgNode, 4);<br>+}<br>+<br>void DIScope::setFilename(StringRef Name, LLVMContext &Context) {<br> if (!DbgNode)<br> return;<br><br>Added: llvm/trunk/test/DebugInfo/template.ll<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/template.ll?rev=181632&view=auto">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/template.ll?rev=181632&view=auto</a><br>==============================================================================<br>--- llvm/trunk/test/DebugInfo/template.ll (added)<br>+++ llvm/trunk/test/DebugInfo/template.ll Fri May 10 16:52:07 2013<br>@@ -0,0 +1,84 @@<br>+; REQUIRES: object-emission<br>+<br>+; RUN: llc -O0 -filetype=obj < %s > %t<br>+; RUN: llvm-dwarfdump %t | FileCheck %s<br>+<br>+; IR generated with `clang++ -g -emit-llvm -S` from the following code:<br>+; template<int, int* x> func() { }<br>+; int glbl = func<3, &glbl>();<br>+<br>+; CHECK: [[INT:0x[0-9a-f]*]]:{{ *}}DW_TAG_base_type<br>+; CHECK-NEXT: DW_AT_name{{.*}} = "int"<br>+<br>+; CHECK: DW_AT_name{{.*}}"func<3, &glbl>"<br>+; CHECK-NOT: NULL<br>+; CHECK: DW_TAG_template_value_parameter<br>+; CHECK-NEXT: DW_AT_type{{.*}}=> {[[INT]]}<br>+; CHECK-NEXT: DW_AT_name{{.*}}= "x"<br>+<br>+; This could be made shorter by encoding it as _sdata rather than data4, or<br>+; even as data1. DWARF strongly urges implementations to prefer<span class="Apple-converted-space"> </span><br>+; _sdata/_udata rather than dataN<br>+<br>+; CHECK-NEXT: DW_AT_const_value [DW_FORM_data4]{{.*}}(0x00000003)<br>+<br>+; CHECK: DW_TAG_template_value_parameter<br>+; CHECK-NEXT: DW_AT_type{{.*}}=> {[[INTPTR:0x[0-9a-f]*]]}<br>+<br>+; The address of the global 'glbl', followed by DW_OP_stack_value (9f), to use<br>+; the value immediately, rather than indirecting through the address.<br>+<br>+; CHECK-NEXT: DW_AT_location [DW_FORM_block1]{{ *}}(<0x0a> 03 00 00 00 00 00 00 00 00 9f )<br>+<br>+; CHECK: [[INTPTR]]:{{ *}}DW_TAG_pointer_type<br>+; CHECK-NEXT: DW_AT_type{{.*}} => {[[INT]]}<br>+<br>+@glbl = global i32 0, align 4<br>+@llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @_GLOBAL__I_a }]<br>+<br>+define internal void @__cxx_global_var_init() section ".text.startup" {<br>+entry:<br>+ %call = call i32 @_Z4funcILi3EXadL_Z4glblEEEiv(), !dbg !20<br>+ store i32 %call, i32* @glbl, align 4, !dbg !20<br>+ ret void, !dbg !20<br>+}<br>+<br>+; Function Attrs: nounwind uwtable<br>+define linkonce_odr i32 @_Z4funcILi3EXadL_Z4glblEEEiv() #0 {<br>+entry:<br>+ ret i32 3, !dbg !21<br>+}<br>+<br>+define internal void @_GLOBAL__I_a() section ".text.startup" {<br>+entry:<br>+ call void @__cxx_global_var_init(), !dbg !22<br>+ ret void, !dbg !22<br>+}<br>+<br>+attributes #0 = { nounwind uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf"="true" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "unsafe-fp-math"="false" "use-soft-float"="false" }<br>+<br>+!llvm.dbg.cu = !{!0}<br>+<br>+!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !18, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [/usr/local/google/home/blaikie/dev/scratch/templ.cpp] [DW_LANG_C_plus_plus]<br>+!1 = metadata !{metadata !"templ.cpp", metadata !"/usr/local/google/home/blaikie/dev/scratch"}<br>+!2 = metadata !{i32 0}<br>+!3 = metadata !{metadata !4, metadata !8, metadata !16}<br>+!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"__cxx_global_var_init", metadata !"__cxx_global_var_init", metadata !"", i32 2, metadata !6, i1 true, i1 true, i32 0, i32 0, null, i32 256, i1 false, void ()* @__cxx_global_var_init, null, null, metadata !2, i32 2} ; [ DW_TAG_subprogram ] [line 2] [local] [def] [__cxx_global_var_init]<br>+!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [/usr/local/google/home/blaikie/dev/scratch/templ.cpp]<br>+!6 = metadata !{i32 786453, i32 0, i32 0, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>+!7 = metadata !{null}<br>+!8 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"func<3, &glbl>", metadata !"func<3, &glbl>", metadata !"_Z4funcILi3EXadL_Z4glblEEEiv", i32 1, metadata !9, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 ()* @_Z4funcILi3EXadL_Z4glblEEEiv, metadata !12, null, metadata !2, i32 1} ; [ DW_TAG_subprogram ] [line 1] [def] [func<3, &glbl>]<br>+!9 = metadata !{i32 786453, i32 0, i32 0, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !10, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>+!10 = metadata !{metadata !11}<br>+!11 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>+!12 = metadata !{metadata !13, metadata !14}<br>+!13 = metadata !{i32 786480, null, metadata !"x", metadata !11, i32 3, null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]<br>+!14 = metadata !{i32 786480, null, metadata !"", metadata !15, i32* @glbl, null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]<br>+!15 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !11} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from int]<br>+!16 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"_GLOBAL__I_a", metadata !"_GLOBAL__I_a", metadata !"", i32 1, metadata !17, i1 true, i1 true, i32 0, i32 0, null, i32 64, i1 false, void ()* @_GLOBAL__I_a, null, null, metadata !2, i32 1} ; [ DW_TAG_subprogram ] [line 1] [local] [def] [_GLOBAL__I_a]<br>+!17 = metadata !{i32 786453, i32 0, i32 0, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !2, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>+!18 = metadata !{metadata !19}<br>+!19 = metadata !{i32 786484, i32 0, null, metadata !"glbl", metadata !"glbl", metadata !"", metadata !5, i32 2, metadata !11, i32 0, i32 1, i32* @glbl, null} ; [ DW_TAG_variable ] [glbl] [line 2] [def]<br>+!20 = metadata !{i32 2, i32 0, metadata !4, null}<br>+!21 = metadata !{i32 1, i32 0, metadata !8, null}<br>+!22 = metadata !{i32 1, i32 0, metadata !16, null}<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">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a></div></blockquote></div><br></div></body></html>