Commit 72315f15 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r311601: 

------------------------------------------------------------------------
r311601 | adrian | 2017-08-23 14:24:12 -0700 (Wed, 23 Aug 2017) | 5 lines

Fix a bug in CGDebugInfo::EmitInlineFunctionStart causing DILocations to be
parented in function declarations.

Fixes PR33997.
https://bugs.llvm.org/show_bug.cgi?id=33997
------------------------------------------------------------------------

llvm-svn: 311671
parent 5a4a3770

clang/lib/CodeGen/CGDebugInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3260,7 +3260,7 @@ void CGDebugInfo::EmitInlineFunctionStart(CGBuilderTy &Builder, GlobalDecl GD) { 
  llvm::DISubprogram *SP = nullptr;

  if (FI != SPCache.end())

    SP = dyn_cast_or_null<llvm::DISubprogram>(FI->second);

  if (!SP)

  if (!SP || !SP->isDefinition())

    SP = getFunctionStub(GD);

  FnBeginRegionCount.push_back(LexicalBlockStack.size());

  LexicalBlockStack.emplace_back(SP);

clang/test/CodeGenCXX/debug-info-inlined.cpp

0 → 100644
+45 −0
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -emit-llvm -triple i686-pc-windows-msvc19.0.24213 -gcodeview -debug-info-kind=limited -std=c++14 %s -o - | FileCheck %s

// PR33997.

struct already_AddRefed {

  ~already_AddRefed();

};

struct RefPtr {

  operator int *();

};

struct ServoCssRulesStrong {

  already_AddRefed Consume();

};

struct GroupRule {

  GroupRule(already_AddRefed);

};

class ConditionRule : GroupRule {

  using GroupRule::GroupRule;

};

class CSSMediaRule : ConditionRule {

  using ConditionRule::ConditionRule;

};

class CSSMozDocumentRule : ConditionRule {

  using ConditionRule::ConditionRule;

};

class ServoDocumentRule : CSSMozDocumentRule {

  ServoDocumentRule(RefPtr);

};

class ServoMediaRule : CSSMediaRule {

  ServoMediaRule(RefPtr);

};

ServoCssRulesStrong Servo_MediaRule_GetRules(int *);

ServoCssRulesStrong Servo_DocumentRule_GetRules(int *);

ServoDocumentRule::ServoDocumentRule(RefPtr aRawRule)

    : CSSMozDocumentRule(Servo_DocumentRule_GetRules(aRawRule).Consume()) {}



ServoMediaRule::ServoMediaRule(RefPtr aRawRule)

    : CSSMediaRule(Servo_MediaRule_GetRules(aRawRule).Consume()) {}



// CHECK: define{{.*}}ServoMediaRule

// CHECK-NOT: {{ ret }}

// CHECK: store %class.ConditionRule* %

// CHECK-SAME: %class.ConditionRule** %

// CHECK-SAME: !dbg ![[INL:[0-9]+]]



// CHECK: ![[INL]] = !DILocation(line: 16, scope: ![[SP:[0-9]+]], inlinedAt:

// CHECK: ![[SP]] = distinct !DISubprogram(name: "GroupRule", {{.*}}isDefinition: true