<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;" class="">It's possible that this testcase can be golfed some more. I copied it almost verbatim from the PR. I'll see what I can do. The important thing is that it needs to trigger the situation where the frontend is creating an inlined function.<div class=""><br class=""></div><div class="">-- adrian<br class=""><div><blockquote type="cite" class=""><div class="">On Aug 28, 2017, at 4:43 PM, David Blaikie <<a href="mailto:dblaikie@gmail.com" class="">dblaikie@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Seems like a rather complex test case - could you explain what's going on there? (maybe in the form of a comment in the code - what path through all those classes is required to tickle this)<br class=""><br class=""><div class="gmail_quote"><div dir="ltr" class="">On Wed, Aug 23, 2017 at 2:25 PM Adrian Prantl via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a>> wrote:<br class=""></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br class="">
Date: Wed Aug 23 14:24:12 2017<br class="">
New Revision: 311601<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=311601&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=311601&view=rev</a><br class="">
Log:<br class="">
Fix a bug in CGDebugInfo::EmitInlineFunctionStart causing DILocations to be<br class="">
parented in function declarations.<br class="">
<br class="">
Fixes PR33997.<br class="">
<a href="https://bugs.llvm.org/show_bug.cgi?id=33997" rel="noreferrer" target="_blank" class="">https://bugs.llvm.org/show_bug.cgi?id=33997</a><br class="">
<br class="">
Added:<br class="">
    cfe/trunk/test/CodeGenCXX/debug-info-inlined.cpp<br class="">
Modified:<br class="">
    cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br class="">
<br class="">
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=311601&r1=311600&r2=311601&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=311601&r1=311600&r2=311601&view=diff</a><br class="">
==============================================================================<br class="">
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)<br class="">
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Wed Aug 23 14:24:12 2017<br class="">
@@ -3287,7 +3287,7 @@ void CGDebugInfo::EmitInlineFunctionStar<br class="">
   llvm::DISubprogram *SP = nullptr;<br class="">
   if (FI != SPCache.end())<br class="">
     SP = dyn_cast_or_null<llvm::DISubprogram>(FI->second);<br class="">
-  if (!SP)<br class="">
+  if (!SP || !SP->isDefinition())<br class="">
     SP = getFunctionStub(GD);<br class="">
   FnBeginRegionCount.push_back(LexicalBlockStack.size());<br class="">
   LexicalBlockStack.emplace_back(SP);<br class="">
<br class="">
Added: cfe/trunk/test/CodeGenCXX/debug-info-inlined.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-inlined.cpp?rev=311601&view=auto" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-inlined.cpp?rev=311601&view=auto</a><br class="">
==============================================================================<br class="">
--- cfe/trunk/test/CodeGenCXX/debug-info-inlined.cpp (added)<br class="">
+++ cfe/trunk/test/CodeGenCXX/debug-info-inlined.cpp Wed Aug 23 14:24:12 2017<br class="">
@@ -0,0 +1,45 @@<br class="">
+// RUN: %clang_cc1 -emit-llvm -triple i686-pc-windows-msvc19.0.24213 -gcodeview -debug-info-kind=limited -std=c++14 %s -o - | FileCheck %s<br class="">
+// PR33997.<br class="">
+struct already_AddRefed {<br class="">
+  ~already_AddRefed();<br class="">
+};<br class="">
+struct RefPtr {<br class="">
+  operator int *();<br class="">
+};<br class="">
+struct ServoCssRulesStrong {<br class="">
+  already_AddRefed Consume();<br class="">
+};<br class="">
+struct GroupRule {<br class="">
+  GroupRule(already_AddRefed);<br class="">
+};<br class="">
+class ConditionRule : GroupRule {<br class="">
+  using GroupRule::GroupRule;<br class="">
+};<br class="">
+class CSSMediaRule : ConditionRule {<br class="">
+  using ConditionRule::ConditionRule;<br class="">
+};<br class="">
+class CSSMozDocumentRule : ConditionRule {<br class="">
+  using ConditionRule::ConditionRule;<br class="">
+};<br class="">
+class ServoDocumentRule : CSSMozDocumentRule {<br class="">
+  ServoDocumentRule(RefPtr);<br class="">
+};<br class="">
+class ServoMediaRule : CSSMediaRule {<br class="">
+  ServoMediaRule(RefPtr);<br class="">
+};<br class="">
+ServoCssRulesStrong Servo_MediaRule_GetRules(int *);<br class="">
+ServoCssRulesStrong Servo_DocumentRule_GetRules(int *);<br class="">
+ServoDocumentRule::ServoDocumentRule(RefPtr aRawRule)<br class="">
+    : CSSMozDocumentRule(Servo_DocumentRule_GetRules(aRawRule).Consume()) {}<br class="">
+<br class="">
+ServoMediaRule::ServoMediaRule(RefPtr aRawRule)<br class="">
+    : CSSMediaRule(Servo_MediaRule_GetRules(aRawRule).Consume()) {}<br class="">
+<br class="">
+// CHECK: define{{.*}}ServoMediaRule<br class="">
+// CHECK-NOT: {{ ret }}<br class="">
+// CHECK: store %class.ConditionRule* %<br class="">
+// CHECK-SAME: %class.ConditionRule** %<br class="">
+// CHECK-SAME: !dbg ![[INL:[0-9]+]]<br class="">
+<br class="">
+// CHECK: ![[INL]] = !DILocation(line: 16, scope: ![[SP:[0-9]+]], inlinedAt:<br class="">
+// CHECK: ![[SP]] = distinct !DISubprogram(name: "GroupRule", {{.*}}isDefinition: true<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
cfe-commits mailing list<br class="">
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank" class="">cfe-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br class="">
</blockquote></div></div>
</div></blockquote></div><br class=""></div></body></html>