]> granicus.if.org Git - llvm/commitdiff
Before sample pgo annotation, do not inline a function that has no debug info. (NFC)
authorDehao Chen <dehao@google.com>
Tue, 22 Nov 2016 22:50:01 +0000 (22:50 +0000)
committerDehao Chen <dehao@google.com>
Tue, 22 Nov 2016 22:50:01 +0000 (22:50 +0000)
If there is no debug info in the callee, inlining it will not help annotator. This avoids infinite loop as reported in PR/31119.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@287710 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Transforms/IPO/SampleProfile.cpp
test/Transforms/SampleProfile/Inputs/nodebug.prof [new file with mode: 0644]
test/Transforms/SampleProfile/early-inline.ll
test/Transforms/SampleProfile/nodebug.ll [new file with mode: 0644]

index 6e1818b2f5879c08a59eb9a6731e341fca0b3430..cf0e02e8eccd10b3eb189132f2e73447b851dcf0 100644 (file)
@@ -651,6 +651,8 @@ bool SampleProfileLoader::inlineHotFunctions(Function &F) {
       InvokeInst *II = dyn_cast<InvokeInst>(I);
       Function *CalledFunction =
           (CI == nullptr ? II->getCalledFunction() : CI->getCalledFunction());
+      if (!CalledFunction || !CalledFunction->getSubprogram())
+        continue;
       DebugLoc DLoc = I->getDebugLoc();
       uint64_t NumSamples = findCalleeFunctionSamples(*I)->getTotalSamples();
       if ((CI && InlineFunction(CI, IFI)) || (II && InlineFunction(II, IFI))) {
diff --git a/test/Transforms/SampleProfile/Inputs/nodebug.prof b/test/Transforms/SampleProfile/Inputs/nodebug.prof
new file mode 100644 (file)
index 0000000..4859603
--- /dev/null
@@ -0,0 +1,2 @@
+foo:100:10
+ 0: bar:10
index 6e55ab1eec744bcfce41b91c861b851961d553b9..780ff4751f40a6b9a29de1a20c2f6b4a0e180a0d 100644 (file)
@@ -28,7 +28,7 @@ define void @_Z3foov() #0 personality i8* bitcast (i32 (...)* @__gxx_personality
 }
 
 ; Function Attrs: nounwind uwtable
-define internal void @_ZL3barv() #1 {
+define internal void @_ZL3barv() !dbg !12 {
   ret void
 }
 
@@ -45,3 +45,4 @@ declare i32 @__gxx_personality_v0(...)
 !9 = !DILocation(line: 6, column: 3, scope: !6)
 !10 = !DILocation(line: 8, column: 5, scope: !11)
 !11 = distinct !DILexicalBlock(scope: !6, file: !1, line: 7, column: 7)
+!12 = distinct !DISubprogram(linkageName: "_ZL3barv", scope: !1, line: 20, scopeLine: 20, unit: !0)
diff --git a/test/Transforms/SampleProfile/nodebug.ll b/test/Transforms/SampleProfile/nodebug.ll
new file mode 100644 (file)
index 0000000..d1c53c1
--- /dev/null
@@ -0,0 +1,20 @@
+; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/nodebug.prof
+
+define void @foo() !dbg !3 {
+  call void @bar(), !dbg !4
+  ret void
+}
+
+define void @bar() {
+  call void @bar()
+  ret void
+}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1)
+!1 = !DIFile(filename: "t", directory: "/tmp/")
+!2 = !{i32 2, !"Debug Info Version", i32 3}
+!3 = distinct !DISubprogram(name: "a", scope: !1, file: !1, line: 10, unit: !0)
+!4 = !DILocation(line: 10, scope: !3)