<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Mon, Jan 8, 2018 at 9:02 AM Adrian McCarthy <<a href="mailto:amccarth@google.com">amccarth@google.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">So that git-svnrevert utility is shell script?</div></blockquote><div><br>Ah, yeah, guess so. (guess the Linux Subsystem isn't sufficiently usable to make this trivial to run?)<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"> I can't seem to find a portable version (a la Python).</div></blockquote><div><br>*nod* there's probably just the one. Could be ported/reimplemented in Python.<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div>Oh, and regular Notepad is not an option because of mismatched line-endings.<br></div></div></blockquote><div><br>Oh, yeah, awesome :)<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 2, 2018 at 11:00 AM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><br><div class="gmail_quote"><span><div dir="ltr">On Tue, Jan 2, 2018 at 10:58 AM Adrian McCarthy <<a href="mailto:amccarth@google.com" target="_blank">amccarth@google.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I did actually type all that information in along with notes about the problem, but git doesn't play nice with some text editors(*), so the info was lost.</div></blockquote></span><div><br>Ah, fun - thanks for the explanation!<br> </div><span><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div>I noted the loss immediately after the commit was submitted and provided it in a comment on the IRC channel as well as in a follow-up email to llvm-commits, but I don't see that message now, so I'll have to figure out what happened to that as well.<br></div></div></blockquote></span><div><br>*nod* would be good to understand what happened. Might be worth working around by setting notepad (or something similarly naive) as the git editor in the interim.<br> </div><span><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div>I'll try the git-svnrevert utility next time.<br></div></div></blockquote></span><div><br>*nod* it'd at least get the revision number in there - I don't think it launches the editor, I usually "git commit --amend" after it to add the extra context, buildbot failure links, etc.<br><br>- Dave<br> </div><div><div class="m_-5992914517160758039h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div></div><div><br></div><div>(*) Git revert launches the text editor. The new editor process sees that I already have another instance of the editor running, and directs that instance to open the file in a new tab, and then exits. Git sees that the process it launched exited, and uses the empty file as the commit message. In the mean time, I provide the relevant information in the editor, save the file, and close the editor. There was no feedback that the info was lost--unlike with regular commits, which will at least complain that no commit message was entered.<br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Dec 27, 2017 at 2:10 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><br><div class="gmail_quote"><span><div dir="ltr">On Tue, Dec 19, 2017 at 3:35 PM Adrian McCarthy via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: amccarth<br>
Date: Tue Dec 19 15:34:37 2017<br>
New Revision: 321125<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=321125&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=321125&view=rev</a><br>
Log:<br>
Revert "Fix faulty assertion in debug info"<br>
<br>
This reverts commit e32def3f7ebe1136b7038336eff56a415a962bf2.<br></blockquote></span><div><br>Please include an explanation/motivation for the revert, and the svn revision number rather than the git hash. (there's a utility in llvm/utils/git-svn/git-svnrevert for git reverting by hash, while still making an svn revision number in the commit message)<br> </div><div><div class="m_-5992914517160758039m_6578360591856315874m_-6421458643566288315h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Removed:<br>
llvm/trunk/test/DebugInfo/void-typedef.ll<br>
Modified:<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp?rev=321125&r1=321124&r2=321125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp?rev=321125&r1=321124&r2=321125&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp Tue Dec 19 15:34:37 2017<br>
@@ -163,8 +163,7 @@ uint64_t DebugHandlerBase::getBaseTypeSi<br>
<br>
DIType *BaseType = DDTy->getBaseType().resolve();<br>
<br>
- if (!BaseType)<br>
- return 0;<br>
+ assert(BaseType && "Unexpected invalid base type");<br>
<br>
// If this is a derived type, go ahead and get the base type, unless it's a<br>
// reference then it's just the size of the field. Pointer types have no need<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=321125&r1=321124&r2=321125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=321125&r1=321124&r2=321125&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Tue Dec 19 15:34:37 2017<br>
@@ -1391,8 +1391,7 @@ void DwarfUnit::constructMemberDIE(DIE &<br>
if (!Name.empty())<br>
addString(MemberDie, dwarf::DW_AT_name, Name);<br>
<br>
- if (DIType *Resolved = resolve(DT->getBaseType()))<br>
- addType(MemberDie, Resolved);<br>
+ addType(MemberDie, resolve(DT->getBaseType()));<br>
<br>
addSourceLine(MemberDie, DT);<br>
<br>
<br>
Removed: llvm/trunk/test/DebugInfo/void-typedef.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/void-typedef.ll?rev=321124&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/void-typedef.ll?rev=321124&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/void-typedef.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/void-typedef.ll (removed)<br>
@@ -1,88 +0,0 @@<br>
-; Choosing CodeView generates debug metadata for class-scope typedefs that<br>
-; Dwarf would normally omit. Choosing both CodeView and Dwarf triggered<br>
-; assertion failures and crashes because the Dwarf handler wasn't prepared for<br>
-; those records (in particular, ones with the void type represented by a<br>
-; null pointer).<br>
-;<br>
-; This test was generated with:<br>
-; clang++ -cc1 -emit-llvm -debug-info-kind=limited -dwarf-version=4 -gcodeview -x c++<br>
-; on the following source code:<br>
-;<br>
-; class A {<br>
-; typedef void _Nodeptr;<br>
-; };<br>
-; class B {<br>
-; A FailedTestsCache;<br>
-; bool m_fn1();<br>
-; };<br>
-; bool B::m_fn1() {}<br>
-;<br>
-; CodeView generates a DIDerivedType for the _Nodeptr typedef.<br>
-;<br>
-; RUN: llc %s -o - 2>&1 | FileCheck %s<br>
-; CHECK-NOT: Assertion failed<br>
-<br>
-; ModuleID = 'bug.cpp'<br>
-source_filename = "bug.cpp"<br>
-target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"<br>
-target triple = "i686-pc-windows-msvc"<br>
-<br>
-%class.B = type { %class.A }<br>
-%class.A = type { i8 }<br>
-<br>
-; Function Attrs: noinline nounwind optnone<br>
-define x86_thiscallcc zeroext i1 @"\01?m_fn1@B@@AAE_NXZ"(%class.B* %this) #0 align 2 !dbg !9 {<br>
-entry:<br>
- %retval = alloca i1, align 1<br>
- %this.addr = alloca %class.B*, align 4<br>
- store %class.B* %this, %class.B** %this.addr, align 4<br>
- call void @llvm.dbg.declare(metadata %class.B** %this.addr, metadata !22, metadata !DIExpression()), !dbg !24<br>
- %this1 = load %class.B*, %class.B** %this.addr, align 4<br>
- call void @llvm.trap(), !dbg !25<br>
- unreachable, !dbg !25<br>
-<br>
-return: ; No predecessors!<br>
- %0 = load i1, i1* %retval, align 1, !dbg !25<br>
- ret i1 %0, !dbg !25<br>
-}<br>
-<br>
-; Function Attrs: nounwind readnone speculatable<br>
-declare void @llvm.dbg.declare(metadata, metadata, metadata) #1<br>
-<br>
-; Function Attrs: noreturn nounwind<br>
-declare void @llvm.trap() #2<br>
-<br>
-attributes #0 = { noinline nounwind optnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-features"="+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }<br>
-attributes #1 = { nounwind readnone speculatable }<br>
-attributes #2 = { noreturn nounwind }<br>
-<br>
-!<a href="http://llvm.dbg.cu" rel="noreferrer" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
-!llvm.module.flags = !{!3, !4, !5, !6, !7}<br>
-!llvm.ident = !{!8}<br>
-<br>
-!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 6.0.0 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)<br>
-!1 = !DIFile(filename: "<stdin>", directory: "D:\5Csrc\5Cbug", checksumkind: CSK_MD5, checksum: "2216f11c5ddda8c48a6f92a6079ad4b6")<br>
-!2 = !{}<br>
-!3 = !{i32 1, !"NumRegisterParameters", i32 0}<br>
-!4 = !{i32 2, !"Dwarf Version", i32 4}<br>
-!5 = !{i32 2, !"CodeView", i32 1}<br>
-!6 = !{i32 2, !"Debug Info Version", i32 3}<br>
-!7 = !{i32 1, !"wchar_size", i32 2}<br>
-!8 = !{!"clang version 6.0.0 "}<br>
-!9 = distinct !DISubprogram(name: "m_fn1", linkageName: "\01?m_fn1@B@@AAE_NXZ", scope: !11, file: !10, line: 8, type: !18, isLocal: false, isDefinition: true, scopeLine: 8, flags: DIFlagPrototyped, isOptimized: false, unit: !0, declaration: !17, variables: !2)<br>
-!10 = !DIFile(filename: "bug.cpp", directory: "D:\5Csrc\5Cbug", checksumkind: CSK_MD5, checksum: "2216f11c5ddda8c48a6f92a6079ad4b6")<br>
-!11 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "B", file: !10, line: 4, size: 8, elements: !12, identifier: ".?AVB@@")<br>
-!12 = !{!13, !17}<br>
-!13 = !DIDerivedType(tag: DW_TAG_member, name: "FailedTestsCache", scope: !11, file: !10, line: 5, baseType: !14, size: 8)<br>
-!14 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "A", file: !10, line: 1, size: 8, elements: !15, identifier: ".?AVA@@")<br>
-!15 = !{!16}<br>
-!16 = !DIDerivedType(tag: DW_TAG_typedef, name: "_Nodeptr", scope: !14, file: !10, line: 2, baseType: null)<br>
-!17 = !DISubprogram(name: "m_fn1", linkageName: "\01?m_fn1@B@@AAE_NXZ", scope: !11, file: !10, line: 6, type: !18, isLocal: false, isDefinition: false, scopeLine: 6, flags: DIFlagPrototyped, isOptimized: false)<br>
-!18 = !DISubroutineType(cc: DW_CC_BORLAND_thiscall, types: !19)<br>
-!19 = !{!20, !21}<br>
-!20 = !DIBasicType(name: "bool", size: 8, encoding: DW_ATE_boolean)<br>
-!21 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 32, flags: DIFlagArtificial | DIFlagObjectPointer)<br>
-!22 = !DILocalVariable(name: "this", arg: 1, scope: !9, type: !23, flags: DIFlagArtificial | DIFlagObjectPointer)<br>
-!23 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 32)<br>
-!24 = !DILocation(line: 0, scope: !9)<br>
-!25 = !DILocation(line: 8, scope: !9)<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div></div></div>
</blockquote></div><br></div>
</blockquote></div></div></div></div>
</blockquote></div><br></div>
</blockquote></div></div>